Fix errors so system builds

flake.lock

@@ -53,11 +53,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712339458,
+        "lastModified": 1712434681,
-        "narHash": "sha256-j8pv3tL2EFLGuvFoO64dHWD8YzNvD77hRb4EEx5ADgE=",
+        "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "981b6617822dadc40246a6c70194d02dfc12e4c6",
+        "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
         "type": "github"
       },
       "original": {
@@ -71,17 +71,19 @@
         "hyprcursor": "hyprcursor",
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1712457111,
+        "lastModified": 1712635734,
-        "narHash": "sha256-hTRMWHl49SYfui2W3qCq790MHnX8JTBfYQcxgwjbQ0g=",
+        "narHash": "sha256-x4vfyFFVh8X2Y84gKkhUqeM92u/2hpkD8lx9RAscqFw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "f2a848cbcc41f29fb62ee67aef95136ae1a650da",
+        "rev": "d0d1ba5918206f16128e56988dd4db5d6d143338",
         "type": "github"
       },
       "original": {
@@ -142,27 +144,26 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712163089,
+        "lastModified": 1712439257,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
         "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1712310679,
+        "lastModified": 1712437997,
-        "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=",
+        "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72da83d9515b43550436891f538ff41d68eecc7f",
+        "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
         "type": "github"
       },
       "original": {
@@ -187,57 +188,28 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1712420723,
-        "narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9e7f26f82acb057498335362905fde6fea4ca50a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "aagl": "aagl",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1712458908,
+        "lastModified": 1712617241,
-        "narHash": "sha256-DMgBS+jNHDg8z3g9GkwqL8xTKXCRQ/0FGsAyrniVonc=",
+        "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6",
+        "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,15 +2,16 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "nixpkgs/nixos-23.11";
+
     hyprland.url = "github:hyprwm/Hyprland";
-    aagl = {
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:ezKEa/aagl-gtk-on-nix";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
-    };
     sops-nix.url = "github:Mic92/sops-nix";
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+    aagl.url = "github:ezKEa/aagl-gtk-on-nix";
+    aagl.inputs.nixpkgs.follows = "nixpkgs-stable";
   };
 
-  outputs = { self, nixpkgs, hyprland, aagl, sops-nix, ... }@inputs:
+  outputs = { self, nixpkgs, ... }@inputs:
   let
     defaultConfig = extraModules: nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };

nixosModules/apps/games/anime-launcher/default.nix

@@ -12,8 +12,9 @@
       "Enables honkai 3rd impact";
   };
 
+  imports =  [ inputs.aagl.nixosModules.default ];
+
   config = lib.mkIf config.aagl.enable {
-    imports =  [ inputs.aagl.nixosModules.default ];
     nix.settings = inputs.aagl.nixConfig;
 
     programs.honkers-railway-launcher.enable =

nixosModules/services/graphics/wayland_compositors/default.nix

@@ -1,12 +1,16 @@
 { inputs, config, pkgs, lib, ... }:
 
 {
+
   options = {
     hyprland.enable = lib.mkEnableOption "Enables hyprland";
   };
 
+  imports = [
+    inputs.hyprland.nixosModules.default
+  ];
+
   config = lib.mkIf config.hyprland.enable {
-    imports =  [ inputs.hyprland.nixosModules.default ];
     programs.hyprland.enable = true;
     nix.settings = {
       substituters = [ "https://hyprland.cachix.org" ];

nixosModules/services/networking/wireless/default.nix

@@ -5,7 +5,7 @@
     wireless.enable = lib.mkEnableOption "Enables wireless";
   };
 
-  config = lib.mkIf confi.wireless.enable {
+  config = lib.mkIf config.wireless.enable {
     networking.wireless = {
       enable = true;
       userControlled = {

nixosModules/services/pipewire/default.nix

@@ -13,9 +13,9 @@
       alsa.enable = false;
       alsa.support32Bit = false;
       pulse.enable = true;
-      environment.systemPackages = with pkgs; [
-        pulsemixer
-      ];
     };
+    environment.systemPackages = with pkgs; [
+      pulsemixer
+    ];
   };
 }

nixosModules/services/polkit/default.nix

@@ -10,5 +10,5 @@
     environment.systemPackages = with pkgs; [
       polkit-kde-agent
     ];
-  }
+  };
 }

nixosModules/services/sops-nix/default.nix

@@ -5,8 +5,9 @@ let rootPath = ./.; in
     sops-nix.enable = lib.mkEnableOption "Enables nix-sops for secret management";
   };
 
+  imports =  [ inputs.sops-nix.nixosModules.sops ];
+
   config = lib.mkIf config.sops-nix.enable {
-    imports =  [ inputs.sops-nix.nixosModules.sops ];
 
     sops = {
       defaultSopsFile = rootPath + "secrets.yaml";

nixosModules/services/system/default.nix

@@ -4,7 +4,7 @@
   options = {
     user.name = lib.mkOption { default = "pan"; };
     user.timezone = lib.mkOption { default = "America/Los_Angeles"; };
-    font.extraFonts = lib.mkOption { default = []; };
+    system.extraFonts = lib.mkOption { default = []; };
   };
 
   config = {