Merge branch 'main' into feature/add-parthenon

flake.lock

@@ -5,11 +5,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1755819240,
+        "lastModified": 1746562888,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
         "type": "github"
       },
       "original": {
@@ -37,11 +37,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1752979451,
+        "lastModified": 1748408240,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1758513812,
+        "lastModified": 1751515409,
-        "narHash": "sha256-eDIF1x+9kKhyE4VXakgTNCyrooZOdzi+MMKRTEgDg24=",
+        "narHash": "sha256-yu+/TxHkuZ8GHKwpKTv1BpfbYD1wH1CyPsOmY72chTg=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "c5e5f5c943728ca2631e11bd52c4eaf7278833bd",
+        "rev": "2e0dcafe8c48470e036908f34a2a1413f75bd804",
         "type": "gitlab"
       },
       "original": {
@@ -92,11 +92,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1756083905,
+        "lastModified": 1748383148,
-        "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=",
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1751413152,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1743550720,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "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": 1747372754,
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -215,6 +241,28 @@
         "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": {
@@ -239,11 +287,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758541024,
+        "lastModified": 1751513147,
-        "narHash": "sha256-cSXhpy4g28WN6TESPCu3ASI9JIZotereDUg7qfWwunU=",
+        "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9b6e609a6e41ee5ca4a46465bdc0475fe2212fc8",
+        "rev": "426b405d979d893832549b95f23c13537c65d244",
         "type": "github"
       },
       "original": {
@@ -261,11 +309,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757876091,
+        "lastModified": 1748756240,
-        "narHash": "sha256-ICd12Bk72gU7BUS5rKklHziUm25Oc9PSuv+5HC6pPTc=",
+        "narHash": "sha256-hiplweg3818WiWqnTCEXW0xKhzLUmJaAK2SPJXSkOEU=",
         "ref": "add-gitea-pulls",
-        "rev": "b1b3440041e9e18d8e49a2bbc336b8c57dae0792",
+        "rev": "ae8c1554cb8aec9772cb25ec5c7a3b7a1cf11f34",
-        "revCount": 4439,
+        "revCount": 4379,
         "type": "git",
         "url": "https://nayeonie.com/ahuston-0/hydra"
       },
@@ -282,11 +330,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758531979,
+        "lastModified": 1750372088,
-        "narHash": "sha256-iRv5afKzuu6SkwztqMwZ33161CzBJsyeRHp0uviN9TI=",
+        "narHash": "sha256-LPwgPRBTfnA76rHUr7KYvwq2pNt5IfxymNAZUJFvn/M=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "de79078fd59140067e53cd00ebdf17f96ce27846",
+        "rev": "189f32f56285aae9646bf1292976392beba5a2e2",
         "type": "github"
       },
       "original": {
@@ -298,11 +346,11 @@
     "nix": {
       "flake": false,
       "locked": {
-        "lastModified": 1750777360,
+        "lastModified": 1748154947,
-        "narHash": "sha256-nDWFxwhT+fQNgi4rrr55EKjpxDyVKSl1KaNmSXtYj40=",
+        "narHash": "sha256-rCpANMHFIlafta6J/G0ILRd+WNSnzv/lzi40Y8f1AR8=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "7bb200199705eddd53cb34660a76567c6f1295d9",
+        "rev": "d761dad79c79af17aa476a29749bd9d69747548f",
         "type": "github"
       },
       "original": {
@@ -315,11 +363,11 @@
     "nix-eval-jobs": {
       "flake": false,
       "locked": {
-        "lastModified": 1748680938,
+        "lastModified": 1748211873,
-        "narHash": "sha256-TQk6pEMD0mFw7jZXpg7+2qNKGbAluMQgc55OMgEO8bM=",
+        "narHash": "sha256-AJ22q6yWc1hPkqssXMxQqD6QUeJ6hbx52xWHhKsmuP0=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "974a4af3d4a8fd242d8d0e2608da4be87a62b83f",
+        "rev": "d9262e535e35454daebcebd434bdb9c1486bb998",
         "type": "github"
       },
       "original": {
@@ -335,11 +383,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758427679,
+        "lastModified": 1751170039,
-        "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=",
+        "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85",
+        "rev": "9c932ae632d6b5150515e5749b198c175d8565db",
         "type": "github"
       },
       "original": {
@@ -379,11 +427,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751591814,
+        "lastModified": 1751281697,
-        "narHash": "sha256-A4lgvuj4v+Pr8MniXz1FBG0DXOygi8tTECR+j53FMhM=",
+        "narHash": "sha256-abHhTXGEGYhCKOc9vQbqHFG7dxwJ6AudIy1h4MUsjm0=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "fef2d0c78c4e4d6c600a88795af193131ff51bdc",
+        "rev": "78b86e37713a1111d9e37c62b242d60be3013bd1",
         "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": 1757943327,
+        "lastModified": 1751432711,
-        "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
+        "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
+        "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
         "type": "github"
       },
       "original": {
@@ -438,11 +486,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758491230,
+        "lastModified": 1751469444,
-        "narHash": "sha256-hel/ZQo5HGn5pwavnsDcCcEuGeTQX5VH+kfCdJXO/7o=",
+        "narHash": "sha256-L5vPflQCt7WWzL66cA0ZbITfg+vzrSf6Ak5m4s6vDds=",
         "owner": "SuperSandro2000",
         "repo": "nixos-modules",
-        "rev": "596c16bbfa9fcc3e16b15bf941ffa19dc8bdfdab",
+        "rev": "ed24075c9b4d1cedac253f31aaa2d4729d4fdf53",
         "type": "github"
       },
       "original": {
@@ -453,11 +501,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758530117,
+        "lastModified": 1751529439,
-        "narHash": "sha256-69hEZdAvU2SzEqXw5NGsdWXCko3EodvDW9S6yQutszw=",
+        "narHash": "sha256-fn4qiux6lOX2MEB5VU/KFUhjc4HuQON2SexwJnC1ibc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3afcbc59d86482b9410d84c871067f9380bcb7be",
+        "rev": "f596e2141c241f5cca21188543cd4dcda32f2c3c",
         "type": "github"
       },
       "original": {
@@ -469,11 +517,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1754788789,
+        "lastModified": 1751159883,
-        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
         "type": "github"
       },
       "original": {
@@ -507,14 +555,15 @@
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1756961635,
+        "lastModified": 1748730660,
-        "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=",
+        "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370",
+        "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
         "type": "github"
       },
       "original": {
@@ -534,11 +583,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1750779888,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
         "type": "github"
       },
       "original": {
@@ -578,11 +627,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758508617,
+        "lastModified": 1751510438,
-        "narHash": "sha256-kx2uELmVnAbiekj/YFfWR26OXqXedImkhe2ocnbumTA=",
+        "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d2bac276ac7e669a1f09c48614538a37e3eb6d0f",
+        "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b",
         "type": "github"
       },
       "original": {
@@ -598,11 +647,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758425756,
+        "lastModified": 1750119275,
-        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
         "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": 1757956156,
+        "lastModified": 1751498047,
-        "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=",
+        "narHash": "sha256-2T/VKbqqp4KTz3szFl58AaI+LBg9ctLjnP1IQA8sPg8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb",
+        "rev": "d21cfb364a78ad72935625e79b8c5d497f0b7616",
         "type": "github"
       },
       "original": {
@@ -711,11 +767,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1754779259,
+        "lastModified": 1748180480,
-        "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=",
+        "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502",
+        "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
         "type": "github"
       },
       "original": {
@@ -727,11 +783,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1754788770,
+        "lastModified": 1748740859,
-        "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=",
+        "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "fb2175accef8935f6955503ec9dd3c973eec385c",
+        "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
         "type": "github"
       },
       "original": {
@@ -743,11 +799,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1755613540,
+        "lastModified": 1725758778,
-        "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=",
+        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0",
+        "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,9 +168,9 @@ rec {
           system
           ;
       };
-      modules = [
+      modules =
+        [
           inputs.nixos-modules.nixosModule
-        inputs.nix-index-database.nixosModules.nix-index
           (genHostName hostname)
           (configPath + "/hardware.nix")
           (configPath + "/configuration.nix")
@@ -181,7 +180,6 @@ rec {
         ++ genWrapper sops genSops args
         ++ genWrapper home genHome args
         ++ genWrapper true genUsers args
-      #++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args
         ++ genWrapper (system != "x86_64-linux") genNonX86 args;
     };
 

modules/autopull.nix

@@ -59,9 +59,8 @@ 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)) [
           pkgs.openssh
         ];

modules/boot.nix

@@ -35,9 +35,8 @@ 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.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
     initrd = {

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/configuration.nix

@@ -42,8 +42,7 @@
   services = {
     flatpak.enable = true;
     calibre-web = {
-      # temp disable this
+      enable = true;
-      enable = false;
       listen = {
         ip = "127.0.0.1";
       };

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
@@ -75,7 +76,7 @@
     restic
     ripgrep
     rpi-imager
-    rofi
+    rofi-wayland
     samba
     signal-desktop
     # signal in tray?

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/act_config.yaml

@@ -38,19 +38,19 @@ runner:
         - "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
         - "ubuntu-22.04:docker://gitea/runner-images:ubuntu-22.04"
         - "ubuntu-20.04:docker://gitea/runner-images:ubuntu-20.04"
-cache:
+        #cache:
     # Enable cache server to use actions/cache.
-    enabled: true
+    #enabled: true
     # The directory to store the cache data.
     # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
     #dir: ""
     # The host of the cache server.
     # It's not for the address to listen, but the address to connect from job containers.
     # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
-    host: "192.168.76.2"
+    #host: ""
     # The port of the cache server.
     # 0 means to use a random available port.
-    port: 8088
+    #port: 0
     # The external cache server URL. Valid only when enable is true.
     # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
     # The URL should generally end with "/".

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
@@ -74,7 +75,7 @@
     restic
     ripgrep
     rpi-imager
-    rofi
+    rofi-wayland
     samba
     signal-desktop
     # signal in tray?

users/alice/home.nix

@@ -7,7 +7,8 @@
 }:
 
 {
-  imports = [
+  imports =
+    [
       ./home/zsh.nix
       ./home/git.nix
     ]
@@ -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;
@@ -178,7 +176,7 @@
 
   nix.gc = {
     automatic = true;
-    dates = "weekly";
+    frequency = "weekly";
     options = "--delete-older-than 30d";
   };
 

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

@@ -105,8 +105,5 @@
     obsidian
     libreoffice-qt-fresh
     wlr-randr
-
-    # media tools
-    #deepin.deepin-music
   ];
 }