Merge branch 'main' into feature/lix

add lix to artemision
fix lix linting error
2025-07-04 12:10:39 -04:00 · 2025-07-04 11:29:11 -04:00 · 2025-07-04 11:29:11 -04:00
14 changed files with 248 additions and 150 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1752979451,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "lastModified": 1748408240,
+        "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": 1754512310,
-        "narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=",
+        "lastModified": 1751618693,
+        "narHash": "sha256-bAKNekZcZd4QnBO/RUxjQAgaz67bYwFXWfQENA45Scg=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2",
+        "rev": "0c5b037915083a27a260b063b127b31443827bae",
        "type": "gitlab"
      },
      "original": {
@@ -124,11 +124,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1754487366,
-        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
+        "lastModified": 1751413152,
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
        "type": "github"
      },
      "original": {
@@ -145,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751413152,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
        "type": "github"
      },
      "original": {
@@ -178,6 +178,21 @@
        "type": "github"
      }
    },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
    "fromYaml": {
      "flake": false,
      "locked": {
@@ -194,6 +209,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 +256,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 +302,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754842705,
-        "narHash": "sha256-2vvncPLsBWV6dRM5LfGHMGYZ+vzqRDqSPBzxPAS0R/A=",
+        "lastModified": 1751589297,
+        "narHash": "sha256-3q35cq6BPuwIRL3IoVKYPc72r3OleeuRyf4YAPjEqzA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "91586008a23c01cc32894ee187dca8c0a7bd20a4",
+        "rev": "83f978812c37511ef2ffaf75ffa72160483f738a",
        "type": "github"
      },
      "original": {
@@ -282,11 +345,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753252360,
-        "narHash": "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI=",
+        "lastModified": 1750372088,
+        "narHash": "sha256-LPwgPRBTfnA76rHUr7KYvwq2pNt5IfxymNAZUJFvn/M=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "6839b23345b71db17cd408373de4f5605bf589b8",
+        "rev": "189f32f56285aae9646bf1292976392beba5a2e2",
        "type": "github"
      },
      "original": {
@@ -295,6 +358,46 @@
        "type": "github"
      }
    },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737234286,
+        "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=",
+        "rev": "079528098f5998ba13c88821a2eca1005c1695de",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "flakey-profile": "flakey-profile",
+        "lix": "lix",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741892773,
+        "narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=",
+        "ref": "stable",
+        "rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911",
+        "revCount": 130,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      },
+      "original": {
+        "ref": "stable",
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      }
+    },
    "nix": {
      "flake": false,
      "locked": {
@@ -335,11 +438,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754800038,
-        "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=",
+        "lastModified": 1751170039,
+        "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142",
+        "rev": "9c932ae632d6b5150515e5749b198c175d8565db",
        "type": "github"
      },
      "original": {
@@ -400,11 +503,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751903740,
-        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
+        "lastModified": 1747663185,
+        "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
+        "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc",
        "type": "github"
      },
      "original": {
@@ -415,11 +518,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1754564048,
-        "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=",
+        "lastModified": 1751432711,
+        "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113",
+        "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
        "type": "github"
      },
      "original": {
@@ -438,11 +541,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754505861,
-        "narHash": "sha256-rOP/Bx8LpTNgErFDAVOEXtTs4JDZ/AygU4GhP2i2qQY=",
+        "lastModified": 1751469444,
+        "narHash": "sha256-L5vPflQCt7WWzL66cA0ZbITfg+vzrSf6Ak5m4s6vDds=",
        "owner": "SuperSandro2000",
        "repo": "nixos-modules",
-        "rev": "2bc7f6f260ac4d48cf3c47cd16064313df91b100",
+        "rev": "ed24075c9b4d1cedac253f31aaa2d4729d4fdf53",
        "type": "github"
      },
      "original": {
@@ -453,11 +556,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1754844034,
-        "narHash": "sha256-6GXGiYfS49NKDf3k8mg2LvDbTzrbggTxgOaqsuQLX54=",
+        "lastModified": 1751619433,
+        "narHash": "sha256-5aZFBHQNQzrfCisewtYBDNbiKcHbxPYChiP4dkEcSXQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "dd2b1cf212c6ea04ae9e0b7b65acdfe6957d65c3",
+        "rev": "a2867cc3f8acc944cb19fe0b73c840e9fa1ba589",
        "type": "github"
      },
      "original": {
@@ -469,11 +572,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1753579242,
-        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
+        "lastModified": 1751159883,
+        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
+        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
        "type": "github"
      },
      "original": {
@@ -507,14 +610,15 @@
        "nixpkgs": [
          "stylix",
          "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1751906969,
-        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
+        "lastModified": 1748730660,
+        "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
+        "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
        "type": "github"
      },
      "original": {
@@ -534,11 +638,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754416808,
-        "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=",
+        "lastModified": 1750779888,
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
        "type": "github"
      },
      "original": {
@@ -556,6 +660,7 @@
        "home-manager": "home-manager",
        "hydra": "hydra",
        "hyprland-contrib": "hyprland-contrib",
+        "lix-module": "lix-module",
        "nix-index-database": "nix-index-database",
        "nixos-cosmic": "nixos-cosmic",
        "nixos-generators": "nixos-generators",
@@ -578,11 +683,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754794262,
-        "narHash": "sha256-5SEz135CaJ0LfHILi+CzWMXQmcvD2QeIf4FKwXAxtxA=",
+        "lastModified": 1751596734,
+        "narHash": "sha256-1tQOwmn3jEUQjH0WDJyklC+hR7Bj+iqx6ChtRX2QiPA=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "d754da7c068c6e122f84d84c3e6bcd353ee48635",
+        "rev": "e28ba067a9368286a8bc88b68dc2ca92181a09f0",
        "type": "github"
      },
      "original": {
@@ -598,11 +703,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754328224,
-        "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
+        "lastModified": 1751606940,
+        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
+        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
        "type": "github"
      },
      "original": {
@@ -618,8 +723,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 +744,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1754851076,
-        "narHash": "sha256-k3+/24lN6E9BFRhryHocm7314t0Wtku0hgIdEWi15XI=",
+        "lastModified": 1751602277,
+        "narHash": "sha256-mlJeMDyj+B9QYNw/f9YdlBzvq6mcQ3dx5qjfepzV70I=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "afcfed6fd2a51615cd63aa7fa7608d670e7b61e5",
+        "rev": "3c73dee2dbdf242a16a6e929f3e574dd0694d85a",
        "type": "github"
      },
      "original": {
@@ -711,11 +823,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1750770351,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "lastModified": 1748180480,
+        "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
        "type": "github"
      },
      "original": {
@@ -727,11 +839,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1751159871,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "lastModified": 1748740859,
+        "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
        "type": "github"
      },
      "original": {
@@ -743,11 +855,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1751158968,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "lastModified": 1725758778,
+        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
        "type": "github"
      },
      "original": {
@@ -756,6 +868,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": [
--- a/flake.nix
+++ b/flake.nix
@@ -66,13 +66,13 @@
      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";
-    #  };
-    #};
+    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";
@@ -127,6 +127,8 @@
    stylix = {
      url = "github:danth/stylix";
      inputs = {
+        flake-compat.follows = "flake-compat";
+        home-manager.follows = "home-manager";
        nixpkgs.follows = "nixpkgs";
      };
    };
@@ -173,29 +175,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";
--- a/hydra/jobs.nix
+++ b/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";
--- a/lib/systems.nix
+++ b/lib/systems.nix
@@ -169,20 +169,20 @@ rec {
          system
          ;
      };
-      modules = [
-        inputs.nixos-modules.nixosModule
-        inputs.nix-index-database.nixosModules.nix-index
-        (genHostName hostname)
-        (configPath + "/hardware.nix")
-        (configPath + "/configuration.nix")
-      ]
-      ++ modules
-      ++ (lib.adev.fileList (src + "/modules"))
-      ++ 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 =
+        [
+          inputs.nixos-modules.nixosModule
+          (genHostName hostname)
+          (configPath + "/hardware.nix")
+          (configPath + "/configuration.nix")
+        ]
+        ++ modules
+        ++ (lib.adev.fileList (src + "/modules"))
+        ++ 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;
    };

  # a convenience function for automatically generating NixOS systems by reading a directory via constructSystem
--- a/modules/autopull.nix
+++ b/modules/autopull.nix
@@ -59,12 +59,11 @@ in
      repos = lib.filterAttrs (_: { enable, ... }: enable) cfg.repo;
    in
    lib.mkIf cfg.enable {
-      environment.systemPackages = [
-        pkgs.git
-      ]
-      ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
-        pkgs.openssh
-      ];
+      environment.systemPackages =
+        [ pkgs.git ]
+        ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
+          pkgs.openssh
+        ];

      systemd.services = lib.mapAttrs' (
        _:
--- a/modules/boot.nix
+++ b/modules/boot.nix
@@ -35,11 +35,10 @@ in
  config.boot = lib.mkIf cfg.default {
    supportedFilesystems = [ cfg.filesystem ];
    tmp.useTmpfs = true;
-    kernelParams = [
-      "nordrand"
-    ]
-    ++ lib.optional (cfg.cpuType == "amd") "kvm-amd"
-    ++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
+    kernelParams =
+      [ "nordrand" ]
+      ++ lib.optional (cfg.cpuType == "amd") "kvm-amd"
+      ++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
    initrd = {
      kernelModules = lib.mkIf cfg.amdGPU [ "amdgpu" ];
      network = lib.mkIf cfg.fullDiskEncryption {
--- a/modules/nix.nix
+++ b/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;
--- a/systems/artemision/programs.nix
+++ b/systems/artemision/programs.nix
@@ -53,6 +53,7 @@
    # nbt explorer?
    ncdu
    nemo-with-extensions
+    neofetch
    neovim
    nix-init
    nix-output-monitor
--- a/systems/palatine-hill/configuration.nix
+++ b/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
      ];
    };
  };
--- a/systems/palatine-hill/docker/act-runner.nix
+++ b/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"
--- a/systems/palatine-hill/docker/restic.nix
+++ b/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 = [
--- a/systems/selinunte/programs.nix
+++ b/systems/selinunte/programs.nix
@@ -52,6 +52,7 @@
    # nbt explorer?
    ncdu
    nemo-with-extensions
+    neofetch
    neovim
    nix-init
    nix-output-monitor
--- a/users/alice/home.nix
+++ b/users/alice/home.nix
@@ -7,17 +7,18 @@
 }:

 {
-  imports = [
-    ./home/zsh.nix
-    ./home/git.nix
-  ]
-  ++ lib.optionals (!machineConfig.server) [
-    ./home/gammastep.nix
-    ./home/doom
-    ./home/hypr
-    ./home/waybar.nix
-    ./non-server.nix
-  ];
+  imports =
+    [
+      ./home/zsh.nix
+      ./home/git.nix
+    ]
+    ++ lib.optionals (!machineConfig.server) [
+      ./home/gammastep.nix
+      ./home/doom
+      ./home/hypr
+      ./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;
--- a/users/alice/home/zsh.nix
+++ b/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";
    };
  };
 }
Author	SHA1	Message	Date
ahuston-0	aaec8f594a	Merge branch 'main' into feature/lix Some checks failed Check Nix flake / Perform Nix flake checks (pull_request) Failing after 13m56s Details Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 9m28s Details	2025-07-04 12:10:39 -04:00
ahuston-0	40065f6198	add lix to artemision Some checks failed Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 9m33s Details Check Nix flake / Perform Nix flake checks (pull_request) Failing after 14m4s Details	2025-07-04 11:29:11 -04:00
ahuston-0	8198a5be3b	fix lix linting error	2025-07-04 11:29:11 -04:00