From 2783860e4ec26caa82af5966773659270caa6664 Mon Sep 17 00:00:00 2001 From: andromeda Date: Sun, 19 Apr 2026 12:15:31 +0200 Subject: [PATCH] update inputs --- flake.lock | 131 +++++++++++++----------------- flake.nix | 3 +- modules/nixos/machines/lenovo.nix | 88 ++++++++++++++------ users/andromeda/home.nix | 7 -- 4 files changed, 119 insertions(+), 110 deletions(-) diff --git a/flake.lock b/flake.lock index f311aca..9885eb3 100644 --- a/flake.lock +++ b/flake.lock @@ -199,11 +199,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1775176642, + "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "179704030c5286c729b5b0522037d1d51341022c", "type": "github" }, "original": { @@ -294,11 +294,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "580633fa3fe5fc0379905986543fd7495481913d", "type": "github" }, "original": { @@ -374,20 +374,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -418,11 +416,11 @@ ] }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1776562531, + "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4", "type": "github" }, "original": { @@ -533,11 +531,11 @@ "nix-zulip": { "flake": false, "locked": { - "lastModified": 1772926346, - "narHash": "sha256-fk8lfYmpXtBLzpJb9f97fYzKXcNflA5CYdYEJD1SDoY=", + "lastModified": 1775149560, + "narHash": "sha256-UoF4z9JL0J5hh3d33ToZKY8ve1R3+3X7bPMVXxN2oMw=", "ref": "refs/heads/main", - "rev": "995e67ff510f413bd0d21af2137159c283223985", - "revCount": 80, + "rev": "0ee7f76d6d40f550e10041932aa73ea03b9915cd", + "revCount": 90, "type": "git", "url": "https://git.afnix.fr/nix-zulip/nix-zulip" }, @@ -556,11 +554,11 @@ ] }, "locked": { - "lastModified": 1774001769, - "narHash": "sha256-6y8yLrMecnFq21wFlUSxHF7OsabVCCj2p104HEUosvI=", + "lastModified": 1776557524, + "narHash": "sha256-mOIdjVcnB+IOdJu5FBvRJMD6gQSl7JZJopSiaW1bEdc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "05968d7978faaa501836d6d2eb7f6cffb4140829", + "rev": "fdb1be9b5064df55d5fe27247932aa0c01cd71d4", "type": "gitlab" }, "original": { @@ -587,11 +585,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -609,11 +607,11 @@ ] }, "locked": { - "lastModified": 1774121134, - "narHash": "sha256-2rY/WUuZEtQ7St3AcFw6dri4oYyBJvr/dnZdpOPe1oM=", + "lastModified": 1776587421, + "narHash": "sha256-rO2dca1U5xao5BMg+Os2HySVmQlq5hR49NNrGc9dEkg=", "owner": "nix-community", "repo": "NUR", - "rev": "4fe0420f495cdcd730969de67f75f44d2a5bb71f", + "rev": "11f5d7471f1999a8130e953209765a19f2fb74e5", "type": "github" }, "original": { @@ -634,11 +632,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1775228139, + "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "type": "github" }, "original": { @@ -659,11 +657,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1774109759, - "narHash": "sha256-Ksvw+R+kwCr+liA4h+TtQaYSW/0Jl+NDMThU5TBsJIY=", + "lastModified": 1776539146, + "narHash": "sha256-zuaO3Gi+HUf4Udv6wiCsK29SKh/Q6kwacpTn8gIwyZY=", "owner": "notashelf", "repo": "nvf", - "rev": "4f1074084eb86e8d8a32e19e78f3cf2adba0213e", + "rev": "2809f4d43071e124f316ecf6dd0c68302f1078af", "type": "github" }, "original": { @@ -679,17 +677,18 @@ ] }, "locked": { - "lastModified": 1774120611, - "narHash": "sha256-QZ09cfZnPiF62BgNqVTxEbFtnBjYaBVuhZNdos9ggnE=", - "owner": "celenityy", - "repo": "Phoenix", - "rev": "df5a6d30c792c0b17017510b35db93e94fb9e6a1", - "type": "github" + "lastModified": 1776592848, + "narHash": "sha256-xpoDCBLPNViU9kxDr8f2z1MuPLvrmCkrJxymUuanv88=", + "ref": "refs/heads/pages", + "rev": "1c69c28a9b6184529c0f756a386c6fbfde35a150", + "revCount": 2812, + "type": "git", + "url": "https://codeberg.org/andromeda-fp/Phoenix" }, "original": { - "owner": "celenityy", - "repo": "Phoenix", - "type": "github" + "rev": "1c69c28a9b6184529c0f756a386c6fbfde35a150", + "type": "git", + "url": "https://codeberg.org/andromeda-fp/Phoenix" } }, "root": { @@ -755,18 +754,17 @@ ], "nur": "nur_2", "systems": "systems_3", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773792048, - "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", + "lastModified": 1776170745, + "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", "owner": "nix-community", "repo": "stylix", - "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", + "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", "type": "github" }, "original": { @@ -820,23 +818,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -856,11 +837,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1772661346, + "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "13b5b0c299982bb361039601e2d72587d6846294", "type": "github" }, "original": { @@ -872,11 +853,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1772934010, + "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "type": "github" }, "original": { @@ -888,11 +869,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1772909925, + "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index acdcc8f..edc6775 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; phoenix = { - url = "github:celenityy/Phoenix"; + # TODO when pull #270 gets merged use celenity again + url = "git+https://codeberg.org/andromeda-fp/Phoenix?rev=1c69c28a9b6184529c0f756a386c6fbfde35a150"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { diff --git a/modules/nixos/machines/lenovo.nix b/modules/nixos/machines/lenovo.nix index 86255b1..537c5e5 100644 --- a/modules/nixos/machines/lenovo.nix +++ b/modules/nixos/machines/lenovo.nix @@ -17,36 +17,70 @@ options = ["subvol=root"]; }; - boot.initrd.postResumeCommands = lib.mkAfter '' - mkdir /btrfs_tmp - mount ${config.fileSystems."/".device} /btrfs_tmp - if [[ -e /btrfs_tmp/root ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:$M:%S") - mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - fi + boot.initrd.systemd = { + services.impermanent-btrfs = { + description = "saves old root and makes new one"; + unitConfig.DefaultDependencies = false; + serviceConfig = { + Type = "oneshot"; + StandardOutput = "journal+console"; + StandardError = "journal+console"; + }; + requiredBy = [ + "initrd.target" + ]; + before = [ + "sysroot.mount" + ]; + requires = [ + "initrd-root-device.target" + ]; + after = [ + "initrd-root-device.target" + "local-fs-pre.target" + ]; + script = '' + mkdir /btrfs_tmp + mount ${config.fileSystems."/".device} /btrfs_tmp + if [[ -e /btrfs_tmp/root ]]; then + mkdir -p /btrfs_tmp/old_roots + timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:$M:%S") + mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + fi - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - delete_subvolume_recursively "/btrfs_tmp/$i" - done - btrfs subvolume delete "$1" - } + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + delete_subvolume_recursively "/btrfs_tmp/$i" + done + btrfs subvolume delete "$1" + } - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do - delete_subvolume_recursively "$i" - done + for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + delete_subvolume_recursively "$i" + done - btrfs subvolume create /btrfs_tmp/root - mkdir /btrfs_tmp/root/persist - mkdir /btrfs_tmp/root/etc - mount ${config.fileSystems."/persist".device} /btrfs_tmp/root/persist -o subvol=persist - cp /btrfs_tmp/root/persist/etc/ssh /btrfs_tmp/root/etc/ssh -r - umount /btrfs_tmp/root/persist - rm -r /btrfs_tmp/root/persist - umount /btrfs_tmp - ''; + btrfs subvolume create /btrfs_tmp/root + mkdir /btrfs_tmp/root/persist + mkdir /btrfs_tmp/root/etc + mount ${config.fileSystems."/persist".device} /btrfs_tmp/root/persist -o subvol=persist + cp /btrfs_tmp/root/persist/etc/ssh /btrfs_tmp/root/etc/ssh -r + umount /btrfs_tmp/root/persist + rm -r /btrfs_tmp/root/persist + umount /btrfs_tmp + ''; + }; + extraBin = { + "mkdir" = "${pkgs.coreutils}/bin/mkdir"; + "date" = "${pkgs.coreutils}/bin/date"; + "stat" = "${pkgs.coreutils}/bin/stat"; + "mv" = "${pkgs.coreutils}/bin/mv"; + "cp" = "${pkgs.coreutils}/bin/cp"; + "rm" = "${pkgs.coreutils}/bin/rm"; + "btrfs" = "${pkgs.btrfs-progs}/bin/btrfs"; + # find, mount, umount already there + }; + }; fileSystems."/nix" = { device = "/dev/disk/by-uuid/0e586651-36f4-42b0-99b3-3f0704a894d6"; diff --git a/users/andromeda/home.nix b/users/andromeda/home.nix index d706248..4227446 100644 --- a/users/andromeda/home.nix +++ b/users/andromeda/home.nix @@ -112,13 +112,6 @@ in { pkgs.nur.repos.rycee.firefox-addons.tridactyl ]; }; - search = { - default = "DuckDuckGo (HTML)"; - privateDefault = "DuckDuckGo (HTML)"; - order = [ - "DuckDuckGo (HTML)" - ]; - }; settings = { "extensions.autoDisableScopes" = 0; };