sops n stuff

flake.nix

@@ -3,26 +3,35 @@
 
   inputs = {
     # nixpgs
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-unstable = {
+      url = "github:NixOS/nixpkgs/nixos-unstable";
+    };
 
     # nixpkgs-unstable-small
-    # nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs-unstable-small = {
+      url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    };
 
     # nixpgs
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs-stable = {
+      url = "github:NixOS/nixpkgs/nixos-24.11";
+    };
 
     # Authentik
     authentik-nix = {
       url = "github:nix-community/authentik-nix";
-      # url = "github:fpletz/authentik-nix/24.11"; # for some reason  this is broken in stable and unstable
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };
 
     # Chaotic-nix
-    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
+    chaotic = {
+      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
+    };
 
     # Impermenance
-    impermanence.url = "github:nix-community/impermanence";
+    impermanence = {
+      url = "github:nix-community/impermanence";
+    };
 
     # Home Manager
     home-manager = {
@@ -56,14 +65,16 @@
     };
 
     #Apple
-    nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
-    # nixos-apple-silicon.url = "github:mjallen18/nixos-apple-silicon";
-    # nixos-apple-silicon.url = "git+file:///home/matt/nixos-apple-silicon";
-    nix-darwin.url = "github:LnL7/nix-darwin";
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
 
-    manyfold.url = "github:mjallen18/manyfold-nixos";
-
-    jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
+    # Joviain for steamdeck
+    jovian = {
+      url = "github:Jovian-Experiments/Jovian-NixOS";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
 
     steam-rom-manager = {
       url = "github:mjallen18/nix-steam-rom-manager";
@@ -71,17 +82,17 @@
       inputs.home-manager.follows = "home-manager";
     };
 
-    # cosmic = {
-    #   url = "github:lilyinstarlight/nixos-cosmic";
-    #   inputs.nixpkgs.follows = "nixpkgs-unstable";
-    # };
+    cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
   };
 
   outputs =
     {
       self,
       nixpkgs-unstable,
-      # nixpkgs-unstable-small,
+      nixpkgs-unstable-small,
       nixpkgs-stable,
       chaotic,
       lanzaboote,
@@ -90,12 +101,10 @@
       home-manager-stable,
       nixos-hardware,
       nix-darwin,
-      nixos-apple-silicon,
-      # cosmic,
+      cosmic,
       authentik-nix,
       sops-nix,
       crowdsec,
-      manyfold,
       jovian,
       steam-rom-manager,
     }@inputs:
@@ -167,7 +176,7 @@
             {
               home-manager.useGlobalPkgs = false;
               home-manager.useUserPackages = true;
-              home-manager.users.admin  =
+              home-manager.users.admin =
                 { ... }:
                 {
                   imports = [
@@ -206,21 +215,6 @@
           ];
         };
 
-        # mac nix
-        "mac-nixos" = nixpkgs-unstable.lib.nixosSystem {
-          system = "aarch64-linux";
-          modules = [
-            nixos-apple-silicon.nixosModules.apple-silicon-support
-            ./hosts/mac-nixos/configuration.nix
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.matt = import ./hosts/mac-nixos/home.nix;
-            }
-          ];
-        };
-
         # Pi4
         "pi4" = nixpkgs-unstable.lib.nixosSystem {
           system = "aarch64-linux";