Merge pull request 'update flake lock, disable extra stylix inputs, fix homemodule for nix index database' (#131) from update_flake_lock_action into main

Reviewed-on: #131
2025-08-01 00:58:33 -04:00
parent 5a54f8e153 b829225998
commit ef9cff8e52
10 changed files with 92 additions and 94 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -19,39 +19,39 @@ creation_rules:
    - path_regex: users/alice/secrets.*\.yaml$
      key_groups:
        - pgp:
-            - *admin_alice 
+            - *admin_alice
          age:
-            - *palatine-hill 
-            - *artemision 
-            - *artemision-home 
+            - *palatine-hill
+            - *artemision
+            - *artemision-home
    - path_regex: systems/palatine-hill/secrets.*\.yaml$
      key_groups:
        - pgp:
-            - *admin_alice 
+            - *admin_alice
          age:
-            - *palatine-hill 
+            - *palatine-hill
    - path_regex: systems/artemision/secrets.*\.yaml$
      key_groups:
        - pgp:
-            - *admin_alice 
+            - *admin_alice
          age:
-            - *artemision 
+            - *artemision
    - path_regex: systems/selinunte/secrets.*\.yaml$
      key_groups:
        - pgp:
-            - *admin_alice 
+            - *admin_alice
          age:
-            - *artemision 
-            - *selinunte 
+            - *artemision
+            - *selinunte
    - path_regex: systems/palatine-hill/docker/wg/.*\.conf$
      key_groups:
        - pgp:
-            - *admin_alice 
+            - *admin_alice
          age:
-            - *palatine-hill 
+            - *palatine-hill
    - path_regex: systems/palatine-hill/docker/openvpn/.*\.ovpn$
      key_groups:
        - pgp:
-            - *admin_alice 
+            - *admin_alice
          age:
-            - *palatine-hill 
+            - *palatine-hill
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1748408240,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "lastModified": 1752979451,
+        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
        "type": "github"
      },
      "original": {
@@ -75,11 +75,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1752206617,
-        "narHash": "sha256-/Pu0pBOI3hsg3eIK6AsQ6kwvONqE2b1b/zOz06ePJKE=",
+        "lastModified": 1753761817,
+        "narHash": "sha256-FE908x/ihUlr5yn1f+PTMyOjcwotGUodzn7Ej6zZf5U=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "680d0ba892443d95ad1afdc523686573111e6c1a",
+        "rev": "b657cfddb78408e9b53b4a8aaeaac71fc7ea182e",
        "type": "gitlab"
      },
      "original": {
@@ -124,11 +124,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1751413152,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "lastModified": 1753121425,
+        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
        "type": "github"
      },
      "original": {
@@ -239,11 +239,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752202894,
-        "narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=",
+        "lastModified": 1753983724,
+        "narHash": "sha256-2vlAOJv4lBrE+P1uOGhZ1symyjXTRdn/mz0tZ6faQcg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fab659b346c0d4252208434c3c4b3983a4b38fec",
+        "rev": "7035020a507ed616e2b20c61491ae3eaa8e5462c",
        "type": "github"
      },
      "original": {
@@ -282,11 +282,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752069516,
-        "narHash": "sha256-dyzDJvt8IVgHJVmpnw1mueHHSLYnChW1XMkwz9WUBZ8=",
+        "lastModified": 1753252360,
+        "narHash": "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "34d0c01910552b873a07c96921ef70e32bf369a2",
+        "rev": "6839b23345b71db17cd408373de4f5605bf589b8",
        "type": "github"
      },
      "original": {
@@ -335,11 +335,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751774635,
-        "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
+        "lastModified": 1753589988,
+        "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "85686025ba6d18df31cc651a91d5adef63378978",
+        "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf",
        "type": "github"
      },
      "original": {
@@ -415,11 +415,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1752048960,
-        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
+        "lastModified": 1753122741,
+        "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
+        "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
        "type": "github"
      },
      "original": {
@@ -438,11 +438,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752190421,
-        "narHash": "sha256-IXOsH31wgX1DXW1H1WMTBBMqz5Qhw2je6ObmzGK7z+w=",
+        "lastModified": 1753565224,
+        "narHash": "sha256-xycwDrS8FLIMxXVOgVWL5BpdcjifW1Oyd4tNdwmHsOU=",
        "owner": "SuperSandro2000",
        "repo": "nixos-modules",
-        "rev": "17972ee0700a8e647e3fe74aa15315b5ccad4f06",
+        "rev": "23dce122ef5ae6e949991547d40b27cb83290a7a",
        "type": "github"
      },
      "original": {
@@ -453,11 +453,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1752206449,
-        "narHash": "sha256-NVAbC/s4CupABWGXF8M9mDiVw/n0YCftxwc1KatVjDk=",
+        "lastModified": 1753991760,
+        "narHash": "sha256-J0DcjBUF5MX7CV3TRCGGYsw0eQrlx8RcC90HVJIYjG0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1bd4d0d4a678d48b63eb18f457d74df2fcee6c69",
+        "rev": "61bc81f4f56844cddfebd9c88cbac6dd07694b2f",
        "type": "github"
      },
      "original": {
@@ -578,11 +578,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752201818,
-        "narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=",
+        "lastModified": 1754016903,
+        "narHash": "sha256-mRB5OOx7H5kFwW8Qtc/7dO3qHsBQtZ/eYQEj93/Noo8=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d",
+        "rev": "ddd488184f01603b712ddbb6dc9fe0b8447eb7fc",
        "type": "github"
      },
      "original": {
@@ -598,11 +598,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751606940,
-        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
+        "lastModified": 1752544651,
+        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
+        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
        "type": "github"
      },
      "original": {
@@ -632,11 +632,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1752231632,
-        "narHash": "sha256-ZuFQ62qagCV5GHSbwnpLk92HxKlNjG7w4wbkT1OrhUA=",
+        "lastModified": 1753978157,
+        "narHash": "sha256-sVy8hb71VawSOIsLv/hMGzpvbbWszdP9aSKI5Drbt6Q=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "0150050d6eed373b04fd85e08bd2ae7b5cc8d3b2",
+        "rev": "ded4f29a023e0f14506ec16b0e32d129e56341cc",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -127,8 +127,6 @@
    stylix = {
      url = "github:danth/stylix";
      inputs = {
-        flake-compat.follows = "flake-compat";
-        home-manager.follows = "home-manager";
        nixpkgs.follows = "nixpkgs";
      };
    };
@@ -181,7 +179,7 @@
          modules = [
            inputs.stylix.homeModules.stylix
            inputs.sops-nix.homeManagerModules.sops
-            inputs.nix-index-database.hmModules.nix-index
+            inputs.nix-index-database.homeModules.nix-index
            {
              nixpkgs.config = {
                allowUnfree = true;
--- a/lib/systems.nix
+++ b/lib/systems.nix
@@ -169,21 +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
+        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;
    };

  # a convenience function for automatically generating NixOS systems by reading a directory via constructSystem
--- a/modules/autopull.nix
+++ b/modules/autopull.nix
@@ -59,11 +59,12 @@ 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,10 +35,11 @@ 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/systems/artemision/programs.nix
+++ b/systems/artemision/programs.nix
@@ -53,7 +53,6 @@
    # 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
-        intel-media-sdk
+        vpl-gpu-rt # replaces intel-media-sdk
      ];
    };
  };
--- a/systems/selinunte/programs.nix
+++ b/systems/selinunte/programs.nix
@@ -52,7 +52,6 @@
    # nbt explorer?
    ncdu
    nemo-with-extensions
-    neofetch
    neovim
    nix-init
    nix-output-monitor
--- a/users/alice/home.nix
+++ b/users/alice/home.nix
@@ -7,18 +7,17 @@
 }:

 {
-  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
@@ -55,7 +54,6 @@
      file
      sqlite
      ncdu
-      neofetch
      onefetch
      hyfetch
      smartmontools
@@ -149,6 +147,9 @@
        };
      };
    };
+    fastfetch = {
+      enable = true;
+    };
  };

  services.ssh-agent.enable = true;