add arr

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

flake.lock

@@ -37,11 +37,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1752979451,
+        "lastModified": 1736852337,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1756008219,
+        "lastModified": 1748730131,
-        "narHash": "sha256-r5n8O8luhLd/Oz+O2FBWG9lZwtn+qRYzI1idi+zpflk=",
+        "narHash": "sha256-QHKZlwzw80hoJkNGXQePIg4u109lqcodALkont2WJAc=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "b89c9248de0b09addc7a310e0339521bdca2db82",
+        "rev": "aa7bfc2ec4763b57386fcd50242c390a596b9bb0",
         "type": "gitlab"
       },
       "original": {
@@ -92,11 +92,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1748383148,
+        "lastModified": 1744642301,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1754487366,
+        "lastModified": 1743550720,
-        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751413152,
+        "lastModified": 1733312601,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -194,6 +194,32 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "stylix",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -215,19 +241,41 @@
         "type": "github"
       }
     },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1748186689,
+        "lastModified": 1744584021,
-        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
+        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
+        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "48.2",
+        "ref": "48.1",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -239,11 +287,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756022458,
+        "lastModified": 1748737919,
-        "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
+        "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
+        "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
         "type": "github"
       },
       "original": {
@@ -282,11 +330,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755680610,
+        "lastModified": 1747572947,
-        "narHash": "sha256-g7/g5o0spemkZCzPa8I21RgCmN0Kv41B5z9Z5HQWraY=",
+        "narHash": "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "04721247f417256ca96acf28cdfe946cf1006263",
+        "rev": "910dad4c5755c1735d30da10c96d9086aa2a608d",
         "type": "github"
       },
       "original": {
@@ -335,11 +383,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756008611,
+        "lastModified": 1748751003,
-        "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=",
+        "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "52dec1cb33a614accb9e01307e17816be974d24d",
+        "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43",
         "type": "github"
       },
       "original": {
@@ -379,11 +427,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751591814,
+        "lastModified": 1748776124,
-        "narHash": "sha256-A4lgvuj4v+Pr8MniXz1FBG0DXOygi8tTECR+j53FMhM=",
+        "narHash": "sha256-vs2cMCHX9wnWJutXhQyWkWOpMF/Xbw0ZAUAFGsKLifA=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "fef2d0c78c4e4d6c600a88795af193131ff51bdc",
+        "rev": "e989a41092f6f0375e7afb789bc97cb30d01fdb8",
         "type": "github"
       },
       "original": {
@@ -400,11 +448,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751903740,
+        "lastModified": 1747663185,
-        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
+        "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
+        "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc",
         "type": "github"
       },
       "original": {
@@ -415,11 +463,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1755330281,
+        "lastModified": 1748634340,
-        "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
+        "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
+        "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
         "type": "github"
       },
       "original": {
@@ -438,11 +486,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755975430,
+        "lastModified": 1748287559,
-        "narHash": "sha256-yrnDLjYh0Ff1/o+3Wd4htrKTzwd0Q3ig/FyB0WaVJo0=",
+        "narHash": "sha256-dvUE9HGwzEXyv6G7LuZFQCmRYFuXLJBO4+crCTxe5zs=",
         "owner": "SuperSandro2000",
         "repo": "nixos-modules",
-        "rev": "c3a53d3f810be234d66fe0fcddbadb469ef14e12",
+        "rev": "9ae063877f8c5d42c39b739ae1d00f9657ad17f4",
         "type": "github"
       },
       "original": {
@@ -453,11 +501,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1756050191,
+        "lastModified": 1748762463,
-        "narHash": "sha256-lMtTT4rv5On7D0P4Z+k7UkvbAKKuVGRbJi/VJeRCQwI=",
+        "narHash": "sha256-rb8vudY2u0SgdWh83SAhM5QZT91ZOnvjOLGTO4pdGTc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "759dcc6981cd4aa222d36069f78fe7064d563305",
+        "rev": "0d0bc640d371e9e8c9914c42951b3d6522bc5dda",
         "type": "github"
       },
       "original": {
@@ -469,11 +517,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1753579242,
+        "lastModified": 1743296961,
-        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
+        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
+        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
         "type": "github"
       },
       "original": {
@@ -484,11 +532,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1751274312,
+        "lastModified": 1748421225,
-        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
+        "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
         "type": "github"
       },
       "original": {
@@ -507,14 +555,15 @@
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1751906969,
+        "lastModified": 1746056780,
-        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
+        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
+        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
         "type": "github"
       },
       "original": {
@@ -534,11 +583,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755960406,
+        "lastModified": 1747372754,
-        "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
         "type": "github"
       },
       "original": {
@@ -578,11 +627,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756003222,
+        "lastModified": 1748746145,
-        "narHash": "sha256-lmEMhIIbjt8Wp1EYbNqCojuU9ygyDFv8Tu0X1k8qIMc=",
+        "narHash": "sha256-bwkCAK9pOyI2Ww4Q4oO1Ynv7O9aZPrsIAMMASmhVGp4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "88ceedecde53e809b4bf8b5fd10d181889d9bac7",
+        "rev": "12a0d94a2f2b06714f747ab97b2fa546f46b460c",
         "type": "github"
       },
       "original": {
@@ -598,11 +647,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754988908,
+        "lastModified": 1747603214,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
         "type": "github"
       },
       "original": {
@@ -618,8 +667,15 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "flake-parts": "flake-parts_2",
+        "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -632,11 +688,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1755997543,
+        "lastModified": 1748717073,
-        "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=",
+        "narHash": "sha256-Yxo8A7BgNpRXTrB359LyfQ0NjJuiaLIS6sTTUCulEX0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8",
+        "rev": "64b9f2c2df31bb87bdd2360a2feb58c817b4d16c",
         "type": "github"
       },
       "original": {
@@ -711,11 +767,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1750770351,
+        "lastModified": 1744974599,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
         "type": "github"
       },
       "original": {
@@ -727,11 +783,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1751159871,
+        "lastModified": 1745111349,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
         "type": "github"
       },
       "original": {
@@ -743,11 +799,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1751158968,
+        "lastModified": 1725758778,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
         "type": "github"
       },
       "original": {
@@ -756,6 +812,28 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "wired-notify": {
       "inputs": {
         "flake-parts": [

flake.nix

@@ -66,14 +66,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    #lix-module = {
-    #  url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable";
-    #  inputs = {
-    #    nixpkgs.follows = "nixpkgs";
-    #    flake-utils.follows = "flake-utils";
-    #  };
-    #};
-
     nix-index-database = {
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -127,6 +119,8 @@
     stylix = {
       url = "github:danth/stylix";
       inputs = {
+        flake-compat.follows = "flake-compat";
+        home-manager.follows = "home-manager";
         nixpkgs.follows = "nixpkgs";
       };
     };
@@ -173,29 +167,6 @@
       formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
 
       nixosConfigurations = genSystems inputs outputs src (src + "/systems");
-      homeConfigurations = {
-        "alice" = inputs.home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs { system = "x86_64-linux"; };
-          modules = [
-            inputs.stylix.homeModules.stylix
-            inputs.sops-nix.homeManagerModules.sops
-            inputs.nix-index-database.homeModules.nix-index
-            {
-              nixpkgs.config = {
-                allowUnfree = true;
-                allowUnfreePredicate = _: true;
-              };
-            }
-            ./users/alice/home.nix
-          ];
-          extraSpecialArgs = {
-            inherit inputs outputs;
-            machineConfig = {
-              server = false;
-            };
-          };
-        };
-      };
       images = {
         install-iso = getImages nixosConfigurations "install-iso";
         iso = getImages nixosConfigurations "iso";

hydra/jobs.nix

@@ -10,9 +10,6 @@ let
   getCfg = _: cfg: cfg.config.system.build.toplevel;
   hostToAgg = _: cfg: cfg;
 
-  getHome = _: cfg: cfg.config.home.activationPackage;
-  homeToAgg = _: cfg: cfg;
-
   # get per-system check derivation (with optional postfix)
   mapSystems =
     {
@@ -25,16 +22,11 @@ rec {
   inherit (outputs) formatter devShells checks;
 
   host = lib.mapAttrs getCfg outputs.nixosConfigurations;
-  home = lib.mapAttrs getHome outputs.homeConfigurations; # homeConfigurations.alice.config.home.activationPackage
 
   hosts = pkgs.releaseTools.aggregate {
     name = "hosts";
     constituents = lib.mapAttrsToList hostToAgg host;
   };
-  homes = pkgs.releaseTools.aggregate {
-    name = "homes";
-    constituents = lib.mapAttrsToList homeToAgg home;
-  };
 
   devChecks = pkgs.releaseTools.aggregate {
     name = "devChecks";

lib/systems.nix

@@ -156,7 +156,6 @@ rec {
       modules ? [ ],
       server ? true,
       sops ? true,
-      lix ? false,
       system ? "x86_64-linux",
     }@args:
     lib.nixosSystem {
@@ -169,20 +168,19 @@ rec {
           system
           ;
       };
-      modules = [
+      modules =
-        inputs.nixos-modules.nixosModule
+        [
-        inputs.nix-index-database.nixosModules.nix-index
+          inputs.nixos-modules.nixosModule
-        (genHostName hostname)
+          (genHostName hostname)
-        (configPath + "/hardware.nix")
+          (configPath + "/hardware.nix")
-        (configPath + "/configuration.nix")
+          (configPath + "/configuration.nix")
-      ]
+        ]
-      ++ modules
+        ++ modules
-      ++ (lib.adev.fileList (src + "/modules"))
+        ++ (lib.adev.fileList (src + "/modules"))
-      ++ genWrapper sops genSops args
+        ++ genWrapper sops genSops args
-      ++ genWrapper home genHome args
+        ++ genWrapper home genHome args
-      ++ genWrapper true genUsers args
+        ++ genWrapper true genUsers args
-      #++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args
+        ++ genWrapper (system != "x86_64-linux") genNonX86 args;
-      ++ genWrapper (system != "x86_64-linux") genNonX86 args;
     };
 
   # a convenience function for automatically generating NixOS systems by reading a directory via constructSystem

modules/autopull.nix

@@ -59,12 +59,11 @@ in
       repos = lib.filterAttrs (_: { enable, ... }: enable) cfg.repo;
     in
     lib.mkIf cfg.enable {
-      environment.systemPackages = [
+      environment.systemPackages =
-        pkgs.git
+        [ pkgs.git ]
-      ]
+        ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
-      ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
+          pkgs.openssh
-        pkgs.openssh
+        ];
-      ];
 
       systemd.services = lib.mapAttrs' (
         _:

modules/boot.nix

@@ -35,11 +35,10 @@ in
   config.boot = lib.mkIf cfg.default {
     supportedFilesystems = [ cfg.filesystem ];
     tmp.useTmpfs = true;
-    kernelParams = [
+    kernelParams =
-      "nordrand"
+      [ "nordrand" ]
-    ]
+      ++ lib.optional (cfg.cpuType == "amd") "kvm-amd"
-    ++ lib.optional (cfg.cpuType == "amd") "kvm-amd"
+      ++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
-    ++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
     initrd = {
       kernelModules = lib.mkIf cfg.amdGPU [ "amdgpu" ];
       network = lib.mkIf cfg.fullDiskEncryption {

modules/nix.nix

@@ -7,9 +7,6 @@
       experimental-features = [
         "nix-command"
         "flakes"
-        "blake3-hashes"
-        "git-hashing"
-        "verified-fetches"
       ];
       keep-outputs = true;
       builders-use-substitutes = true;

systems/artemision/default.nix

@@ -3,7 +3,6 @@
   system = "x86_64-linux";
   home = true;
   sops = true;
-  lix = true;
   server = false;
   users = [ "alice" ];
   modules = [

systems/artemision/programs.nix

@@ -53,6 +53,7 @@
     # nbt explorer?
     ncdu
     nemo-with-extensions
+    neofetch
     neovim
     nix-init
     nix-output-monitor

systems/palatine-hill/attic/default.nix

@@ -10,6 +10,10 @@
     attic-client
   ];
 
+  systemd.services.atticd.environment = {
+    RUST_LOG = "INFO";
+  };
+
   services = {
     atticd = {
       enable = true;
@@ -67,9 +71,6 @@
   # configured default webstore for this on root user separately
   systemd = {
     services = {
-      atticd.environment = {
-        RUST_LOG = "INFO";
-      };
       attic-watch-store = {
         wantedBy = [ "multi-user.target" ];
         after = [

systems/palatine-hill/configuration.nix

@@ -53,7 +53,7 @@
         vaapiVdpau
         libvdpau-va-gl
         intel-compute-runtime
-        vpl-gpu-rt # replaces intel-media-sdk
+        intel-media-sdk
       ];
     };
   };

systems/palatine-hill/docker/act-runner.nix

@@ -11,7 +11,7 @@ in
 {
   virtualisation.oci-containers.containers = {
     act-stable-latest-main = {
-      image = "gitea/act_runner:nightly";
+      image = "gitea/act_runner:latest";
       pull = "always";
       extraOptions = [
         "--stop-signal=SIGINT"
@@ -35,7 +35,7 @@ in
     };
 
     act-stable-latest-1 = {
-      image = "gitea/act_runner:nightly";
+      image = "gitea/act_runner:latest";
       pull = "always";
       extraOptions = [
         "--stop-signal=SIGINT"
@@ -58,7 +58,7 @@ in
     };
 
     act-stable-latest-2 = {
-      image = "gitea/act_runner:nightly";
+      image = "gitea/act_runner:latest";
       pull = "always";
       extraOptions = [
         "--stop-signal=SIGINT"

systems/palatine-hill/docker/nextcloud.nix

@@ -9,8 +9,7 @@ let
   nextcloud-base = {
     # image comes from running docker compose build in nextcloud-docker/.examples/full/apache
     image = "nextcloud-nextcloud";
-    # pull = "always";
+    pull = "always";
-    # do NOT enable pull here, this image is generated based on a custom docker image
     hostname = "nextcloud";
     volumes = [
       "${nextcloud_path}/nc_data:/var/www/html:z"

systems/palatine-hill/docker/restic.nix

@@ -10,7 +10,7 @@ in
       image = "restic/rest-server:latest";
       volumes = [ "${restic_path}:/data" ];
       environment = {
-        OPTIONS = "--prometheus --private-repos --htpasswd-file /data/.htpasswd";
+        OPTIONS = "--prometheus --htpasswd-file /data/.htpasswd";
       };
       ports = [ "8010:8000" ];
       extraOptions = [

systems/selinunte/programs.nix

@@ -52,6 +52,7 @@
     # nbt explorer?
     ncdu
     nemo-with-extensions
+    neofetch
     neovim
     nix-init
     nix-output-monitor

users/alice/default.nix

@@ -14,7 +14,5 @@ import ../default.nix {
     ;
   publicKeys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7oJjIYNRCRrUlhdGJgst6bzqubbKH0gjZYulQ1eVcZ alice@artemision"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWG3cIBju6vzX6s8JlmGNJOiWY7pQ19bHvcqDADtWzv snowi@DESKTOP-EVIR8IH"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMfC0IXl9sGx+9FjuYZT2OUfffGjciJIHWqZdEU1d3n alice@parthenon-7588"
   ];
 }

users/alice/home.nix

@@ -7,17 +7,18 @@
 }:
 
 {
-  imports = [
+  imports =
-    ./home/zsh.nix
+    [
-    ./home/git.nix
+      ./home/zsh.nix
-  ]
+      ./home/git.nix
-  ++ lib.optionals (!machineConfig.server) [
+    ]
-    ./home/gammastep.nix
+    ++ lib.optionals (!machineConfig.server) [
-    ./home/doom
+      ./home/gammastep.nix
-    ./home/hypr
+      ./home/doom
-    ./home/waybar.nix
+      ./home/hypr
-    ./non-server.nix
+      ./home/waybar.nix
-  ];
+      ./non-server.nix
+    ];
 
   home = {
     # # Adds the 'hello' command to your environment. It prints a friendly
@@ -54,6 +55,7 @@
       file
       sqlite
       ncdu
+      neofetch
       onefetch
       hyfetch
       smartmontools
@@ -74,7 +76,6 @@
       nix-prefetch
       nix-tree
       nh
-      home-manager
 
       # doom emacs dependencies
       fd
@@ -147,9 +148,6 @@
         };
       };
     };
-    fastfetch = {
-      enable = true;
-    };
   };
 
   services.ssh-agent.enable = true;

users/alice/home/zsh.nix

@@ -72,7 +72,7 @@
       "sgc" = "sudo git -C /root/dotfiles";
       ## SSH
       "ssh-init" =
-        "ssh-add -t 2h  ~/.ssh/id_rsa_tails ~/.ssh/id_ed25519_tails  ~/.ssh/id_rsa_palatine ~/.ssh/id_ed25519_palatine ~/.ssh/id_ed25519_rota ~/.ssh/id_ed25519_gh ~/.ssh/id_ed25519";
+        "ssh-add -t 2h  ~/.ssh/id_rsa_tails ~/.ssh/id_ed25519_tails  ~/.ssh/id_rsa_palatine ~/.ssh/id_ed25519_palatine ~/.ssh/id_ed25519_rota ~/.ssh/id_ed25519_gh";
 
       ## Backups
       "borgmatic-backup-quick" =
@@ -118,8 +118,6 @@
       "octave" = "prime-run octave --gui";
       "pc-firefox" = "proxychains firefox -P qbit -no-remote -P 127.0.0.1:9050";
       "hx" = "helix";
-      "dungeondraft-arch" = "/opt/Dungeondraft/Dungeondraft.x86_64";
-      "wonderdraft-arch" = "/opt/wonderdraft/Wonderdraft.x86_64";
     };
   };
 }

users/alice/non-server.nix

@@ -28,7 +28,9 @@
         CtrlEnterSend.enabled = true;
         CustomIdle = {
           enabled = true;
-          remainInIdle = false;
+          settings = {
+            remainInIdle = false;
+          };
         };
         FriendsSince.enabled = true;
         GameActivityToggle.enabled = true;
@@ -38,7 +40,7 @@
         QuickReply.enabled = true;
         ReplaceGoogleSearch = {
           enabled = true;
-          customEngineName = "DuckDuckGo";
+          settings.customEngineName = "DuckDuckGo";
         };
         ReviewDB.enabled = true;
         ShowConnections.enabled = true;

utils/eval-to-drv.sh

@@ -16,4 +16,4 @@ script_path=$(dirname "$(readlink -f $0)")
 parent_path=$(dirname "$script_path")
 out_path="$parent_path/$1.json"
 
-nix run git+https://nayeonie.com/ahuston-0/flake-update-diff --fallback -- --evaluate --allow-import-from-derivation --json "$out_path" "$parent_path"
+nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --evaluate --allow-import-from-derivation --json "$out_path" "$parent_path"