Begin Dendritic rewrite

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "machines/laptop"]
 	path = machines/laptop
 	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/laptop
-[submodule "machines/android"]
-	path = machines/android
-	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/android

flake-parts.nix

@@ -0,0 +1,7 @@
+{ inputs, ... }: {
+
+    imports = [
+        inputs.home-manager.flakeModules.home-manager
+        inputs.disko.flakeModules.default
+    ];
+}

flake.nix

@@ -21,6 +21,9 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
+        flake-parts.url = "github:hercules-ci/flake-parts";
+
+        import-tree.url = "github:vic/import-tree";
 
         firefox-addons = {
             url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
@@ -29,179 +32,22 @@
 
         nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
-        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
-
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
 
         nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
 
+        aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+
         self.submodules = true;
     };
 
-    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
+    outputs = { ... } @ inputs: 
-
+    inputs.flake-parts.lib.mkFlake { inherit inputs; }
-        profiles = let 
+    (inputs.import-tree [ 
-            dir = builtins.readDir ./profiles;
+        ./profiles 
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
+        ./homes 
-        in (builtins.listToAttrs 
+        ./machines 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... }: {
-                        imports = [
         ./system 
-                            ./profiles/${name}
+        ./templates/default.nix
-                        ];
+    ]);
-                    };
-                })) filtered)
-            );
-
-        homes = let 
-            dir = builtins.readDir ./homes;
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-        in (builtins.listToAttrs 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... } @ exputs: {
-                        imports = [ (import ./homes/${name}/home-manager (exputs // inputs)) ];
-                    };
-
-                })) filtered)
-            );
-        
-        iso = (nixpkgs.lib.nixosSystem {
-                system = "x86_64-linux";
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = self.homes.nathan;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    self.profiles.iso
-                ];
-            }).config.system.build.isoImage;
-
-        templates = {
-            nixos = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/nixos;
-
-            };
-
-            home-manager = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/home-manager;
-
-            };
-
-            nix-on-droid = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/nix-on-droid;
-
-            };
-
-            machines = let 
-                dir = builtins.readDir ./machines;
-                filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = {
-                            welcomeText = ''
-                                #Welcome to Olympus!
-
-                                ##Warning:
-                                This is a config for ${name}, an established machine!
-                                It may require significant alterations to be usable!
-                            '';
-
-                            description = ''
-                                Generate this where you want your config.
-                            '';
-
-                            path = ./machines/${name};
-                        };
-
-                    })) filtered)
-               );
-
-            homes = let 
-                dir = builtins.readDir ./homes;
-                filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = {
-                            welcomeText = ''
-                                #Welcome home, ${name}!
-                                Your config is right here.
-                            '';
-
-                            description = ''
-                                Generate this where you want your config.
-                            '';
-
-                            path = ./homes/${name};
-                        };
-
-                    })) filtered)
-               );
-
-            default = self.templates.nixos;
-        };
-
-
-        nixosConfigurations = let 
-                dir = builtins.readDir ./machines;
-                filtered = builtins.filter (x: dir.${x} == "directory" && x != "android") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = nixpkgs.lib.nixosSystem {
-                            specialArgs = inputs;
-
-                            modules = [
-                                { sysconfig.host = name; }
-                                ./machines/${name}
-                                self.profiles.${name}
-                            ];
-                        };
-
-                    })) filtered)
-               );
-    };
 }

homes/nathan/flake.nix

@@ -1,40 +0,0 @@
-{
-
-    description = "Home-Manager Configuration";
-
-    inputs = {
-
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-
-        home-manager = {
-            url = "github:nix-community/home-manager/release-25.11";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
-
-        olympus = {
-            url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Olympus";
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.home-manager.follows = "home-manager";
-        };
-    };
-
-    outputs = { self, nixpkgs, home-manager, olympus, ... } @ inputs: {
-
-        homeConfigurations = {
-            nathan = home-manager.lib.homeManagerConfiguration {
-                pkgs = import nixpkgs {
-                    system = builtins.currentSystem;
-                };
-
-                modules = [
-                    olympus.homes.nathan
-                    ./home.nix
-                ];
-
-                extraSpecialArgs = {
-                    inherit inputs;
-                };
-            };
-        };
-    };
-}

homes/nathan/home-manager/default.nix

@@ -1,11 +1,8 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {
 
-    imports = let 
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
-        dir = builtins.readDir ./.;
+
-    in (builtins.map (x: ./${x}) (builtins.filter 
+        imports = [
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    )) ++ [
             inputs.sops-nix.homeManagerModules.sops
         ];
 
@@ -47,9 +44,11 @@
                 hyprland.enable = lib.mkDefault config.homeconfig.graphical;
                 hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                 wal.enable = lib.mkDefault config.homeconfig.graphical;
-            hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;
+#hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                 rofi.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                 firefox.enable = lib.mkDefault config.homeconfig.graphical;
+
+                aurora.enable = lib.mkDefault config.homeconfig.hyprland.enable;
             };
 
             home.username = lib.mkDefault config.homeconfig.name;
@@ -85,7 +84,7 @@
                 defaultSopsFile = ./secrets.yaml;
                 defaultSopsFormat = "yaml";
 
-            #secrets."remoteBuildKey" = {};
+#secrets."remoteBuildKey" = {};
             };
 
             services.mpris-proxy.enable = true;
@@ -111,4 +110,5 @@
             };
 
         };
+    };
 }

homes/nathan/home-manager/dotfiles/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
 
         home.file = {
             ".config/hypr" = lib.mkIf config.homeconfig.hyprland.enable { source = ./hypr; recursive = true; };
@@ -9,4 +11,5 @@
             "Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
         };
 
+    };
 }

homes/nathan/home-manager/packages/default.nix

@@ -1,5 +1,7 @@
-{ config, lib, pkgs, inputs, ... }: let 
+{ inputs, ... }: {
-    system = "x86_64-linux";
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: let 
+        system = pkgs.stdenv.hostPlatform;
 
     pkgs-us = import inputs.nixpkgs-us {
         inherit system;
@@ -8,10 +10,6 @@
 
     in {
 
-    imports = [ 
-	  ./scripts
-	];
-
         options.homeconfig.minimal = with lib; options.mkOption {
             type = with types; bool;
             default = false;
@@ -117,4 +115,5 @@
          ];
         })
         ];
+    };
 }

homes/nathan/home-manager/packages/scripts/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: let
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: let
 
         system = "x86_64-linux";
 
@@ -21,7 +23,7 @@
              home.packages = [
              (pkgs.writeShellScriptBin "hyprrun" ''
               ${pkgs-us.runapp}/bin/runapp ''$@
-                #uwsm app -- ''$@
+#uwsm app -- ''$@
               '')
              ];
              })
@@ -37,7 +39,7 @@
         (lib.mkIf config.homeconfig.scripts.enable {
          home.packages = [
 
-            #scripts
+#scripts
 
          (pkgs.writeShellScriptBin "randWallpaper" ''
           file=''$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1)
@@ -125,11 +127,12 @@
                    sleep 3
                    hyprctl reload
                    hyprctl dispatch exec ${pkgs.pyprland}/bin/pypr toggle calendar
-                #tmux new-session -s hyprland 
+#tmux new-session -s hyprland 
                    '')
 
                    ];
         })
         ];
+    };
 }
 

homes/nathan/home-manager/programs/aurora/default.nix

@@ -0,0 +1,17 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        options.homeconfig.aurora.enable = with lib; mkOption {
+            type = with types; bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.aurora.enable {
+
+            programs.aurora = {
+                enable = true;
+            };
+        };
+    };
+}

homes/nathan/home-manager/programs/calcurse/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         options.homeconfig.calcurse.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -11,4 +13,5 @@
                     libnotify
             ];
         };
+    };
 }

homes/nathan/home-manager/programs/default.nix

@@ -1,12 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
 
+    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: {
 
         config = {
 
@@ -16,4 +10,5 @@
 
             home.sessionVariables.EDITOR = "nvim";
         };
+    };
 }

homes/nathan/home-manager/programs/firefox/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: {
 
         options.homeconfig.firefox.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -57,4 +59,5 @@
                 };
             };
         };
+    };
 }

homes/nathan/home-manager/programs/git/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
 
         options.homeconfig.git.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -44,4 +46,5 @@
                 };
             };
         };
+    };
 }

homes/nathan/home-manager/programs/hyprland/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         options.homeconfig.hyprland.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -48,4 +50,5 @@
 
             };
         };
+    };
 }

homes/nathan/home-manager/programs/hyprlock/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         options.homeconfig.hyprlock.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -49,4 +51,5 @@
                 };
             };
         };
+    };
 }

homes/nathan/home-manager/programs/hyprpanel/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
 
         options.homeconfig.hyprpanel.enable = with lib; mkOption {
             type = with types; bool;
@@ -11,4 +13,5 @@
                 enable = true;
             };
         };
+    };
 }

homes/nathan/home-manager/programs/nh/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, inputs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, inputs, ... }: {
 
         options.homeconfig.nh.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -10,7 +12,7 @@
             programs.nh = {
                 enable = true;
                 package = let pkgs-us = import inputs.nixpkgs-us { system = "x86_64-linux"; }; in pkgs-us.nh;
-            #flake = "${config.home.homeDirectory}/Projects/Olympus";
+#flake = "${config.home.homeDirectory}/Projects/Olympus";
 
                 clean = {
                     enable = true;
@@ -19,4 +21,5 @@
                 };
             };
         };
+    };
 }

homes/nathan/home-manager/programs/pywal/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, inputs, ... }: {
 
         options.homeconfig.wal.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -15,5 +17,6 @@
             ];
 
 
+        };
     };
 }

homes/nathan/home-manager/programs/quickshell/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
 
         options.homeconfig.quickshell.enable = with lib; mkOption {
             type = with types; bool;
@@ -23,4 +25,5 @@
                 activeConfig = "default";
             };
         };
+    };
 }

homes/nathan/home-manager/programs/rofi/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         options.homeconfig.rofi.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -16,5 +18,6 @@
                 theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
             };
         };
+    };
 }
 

homes/nathan/home-manager/programs/terminal/bash/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         home.packages = with pkgs; [ oh-my-posh ];
 
@@ -12,6 +14,7 @@
 
                 ksh = "kitten ssh";
 
+                v = "nvim";
                 vi = "nvim";
                 vim = "nvim";
 
@@ -28,4 +31,5 @@
                 eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
             '');
         };
+    };
 }

homes/nathan/home-manager/programs/terminal/bat/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         programs.bat = {
 
@@ -14,5 +16,6 @@
             ];
 
 
+        };
     };
 }

homes/nathan/home-manager/programs/terminal/default.nix

@@ -1,17 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./bash
-    ./eza
-    ./fzf
-    ./lf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-    ./ssh
-    ./ohmyposh
-    ./opencode
-  ];
-}

homes/nathan/home-manager/programs/terminal/eza/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         programs.eza = {
 
@@ -14,4 +16,5 @@
 
             icons = "auto";
         };
+    };
 }

homes/nathan/home-manager/programs/terminal/fzf/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         programs.fzf = {
 
@@ -7,9 +9,10 @@
             enableZshIntegration = true;
 
             tmux = {
-      #enableShellIntegration = true;
+#enableShellIntegration = true;
 
-      #shellIntegrationOptions = [];
+#shellIntegrationOptions = [];
+            };
         };
     };
 }

homes/nathan/home-manager/programs/terminal/kitty/default.nix

@@ -1,4 +1,6 @@
-{ config, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, ... }: {
 
         programs.kitty = {
 
@@ -11,23 +13,24 @@
 
             extraConfig = ''
 
-confirm_os_window_close 0
+                confirm_os_window_close 0
 
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
+                include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
 
-disable_ligatures never
+                disable_ligatures never
 
-dynamic_background_opacity yes
+                dynamic_background_opacity yes
 
-tab_bar_edge top
+                tab_bar_edge top
 
-map ctrl+shift+t new_tab
+                map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
+                map ctrl+shift+w close_tab
 
-map ctrl+tab next_tab
+                map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
+                map ctrl+shift+tab previous_tab
 
                 '';
         };
+    };
 }
 

homes/nathan/home-manager/programs/terminal/lf/default.nix

@@ -1,7 +1,10 @@
 { ... }: {
+
+    flake.homeModules.nathan = { ... }: {
         config = {
             programs.lf = {
                 enable = true;
             };
         };
+    };
 }

homes/nathan/home-manager/programs/terminal/ohmyposh/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         home.packages = with pkgs; [
             oh-my-posh
@@ -22,11 +24,11 @@
         home.file.".config/wal/templates/ohmyposh.toml".text = ''
 #:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
 
-version = 2
+            version = 2
-final_space = true
+            final_space = true
-console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
+            console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
 
-[[blocks]]
+            [[blocks]]
             type = 'prompt'
             alignment = 'left'
             newline = true
@@ -58,7 +60,7 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             [blocks.segments.properties]
             style = 'full'
 
-[[blocks]]
+            [[blocks]]
             type = 'prompt'
             overflow = 'hidden'
             alignment = 'right'
@@ -85,7 +87,7 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             background = 'p:c1'
             foreground = 'p:c12'
 
-[[blocks]]
+            [[blocks]]
             type = 'prompt'
             alignment = 'left'
             newline = true
@@ -100,7 +102,7 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             ]
             template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
 
-[transient_prompt] 
+            [transient_prompt] 
             foreground_templates = [
                 "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
                 "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
@@ -108,29 +110,30 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             background = 'transparent'
             template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
 
-[secondary_prompt]
+            [secondary_prompt]
             background = 'transparent'
             forground = 'p:c14'
             template = "❭❭ "
 
 
-[palette]
+            [palette]
 
-c0 = "{color0}"
+            c0 = "{color0}"
-c1 = "{color1}"
+            c1 = "{color1}"
-c2 = "{color2}"
+            c2 = "{color2}"
-c3 = "{color3}"
+            c3 = "{color3}"
-c4 = "{color4}"
+            c4 = "{color4}"
-c5 = "{color5}"
+            c5 = "{color5}"
-c6 = "{color6}"
+            c6 = "{color6}"
-c7 = "{color7}"
+            c7 = "{color7}"
-c8 = "{color8}"
+            c8 = "{color8}"
-c9 = "{color9}"
+            c9 = "{color9}"
-c10 = "{color10}"
+            c10 = "{color10}"
-c11 = "{color11}"
+            c11 = "{color11}"
-c12 = "{color12}"
+            c12 = "{color12}"
-c13 = "{color13}"
+            c13 = "{color13}"
-c14 = "{color14}"
+            c14 = "{color14}"
-c15 = "{color15}"
+            c15 = "{color15}"
         '';
+    };
 }

homes/nathan/home-manager/programs/terminal/opencode/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
 
         options.homeconfig.opencode.enable = with lib; mkOption {
             type = with types; bool;
@@ -48,4 +50,5 @@
                 };
             };
         };
+    };
 }

homes/nathan/home-manager/programs/terminal/ssh/default.nix

@@ -1,10 +1,12 @@
 { ... }: {
 
+    flake.homeModules.nathan = { ... }: {
+
         programs.ssh = {
 
             enable = true;
 
-    # defaults as of 25.11
+# defaults as of 25.11
             matchBlocks."*" = {
                 forwardAgent = false;
                 addKeysToAgent = "no";
@@ -20,5 +22,6 @@
             enableDefaultConfig = false;
 
 
+        };
     };
 }

homes/nathan/home-manager/programs/terminal/tmux/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         programs.tmux = {
 
@@ -18,6 +20,7 @@
 
         };
 
+    };
 }
 
 

homes/nathan/home-manager/programs/terminal/zoxide/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
 
         programs.zoxide = {
 
@@ -10,4 +12,5 @@
                 "--cmd cd"
             ];
         };
+    };
 }

homes/nathan/home-manager/programs/terminal/zsh/default.nix

@@ -1,4 +1,6 @@
-{ lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { lib, ... }: {
 
         programs.zsh = {
 
@@ -34,4 +36,5 @@
                 share = true;
             };
         };
+    };
 }

homes/nathan/home-manager/services/default.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-}

homes/nathan/home-manager/services/mpd/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         options = {
             homeconfig.mpd.enable = lib.options.mkOption {
@@ -38,4 +40,5 @@
             };
         };
 
+    };
 }

homes/nathan/home.nix

@@ -1,6 +1,8 @@
-{ lib, inputs, ... }:
+{ self, inputs, ... }: {
 
-{
+    flake.homeModules.nathan = { lib, ... }:
+
+    {
 
         config = {                    
             homeconfig = {
@@ -22,4 +24,15 @@
 
             programs.home-manager.enable = true;
         };
- }
+    };
+
+    flake.homeConfigurations.nathan = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = import inputs.nixpkgs {
+            system = builtins.currentSystem;
+        };
+
+        modules = [
+            self.homeModules.nathan
+        ];
+    };
+}

profiles/container/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, lib, inputs, ... }:
+{ ... }: {
 
-{
+    flake.nixosModules.container = { config, pkgs, lib, inputs, ... }:
+
+    {
         imports =
             [
 
@@ -154,4 +156,5 @@
             fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
 
         };
+    };
 }

profiles/homebox/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, lib, disko, sops-nix, home-manager, ... }:
+{ ... }: {
 
-{
+    flake.nixosModules.homebox = { config, pkgs, lib, disko, sops-nix, home-manager, ... }:
+
+    {
         imports =
             [
             disko.nixosModules.default
@@ -43,7 +45,7 @@
                     enable = true;
                     internalInterfaces = [ "ve-.+" ];
                     externalInterface = "wlp7s0"; # wifi
-                #externalInterface = "enp6s0"; # ethernet
+#externalInterface = "enp6s0"; # ethernet
                 };
             };
 
@@ -113,4 +115,5 @@
 
         };
 
+    };
 }

profiles/iso/default.nix

@@ -1,4 +1,6 @@
-{ lib, pkgs, inputs, modulesPath, ... }: {
+{ ... }: {
+
+    flake.nixosModules.iso = { lib, pkgs, inputs, modulesPath, ... }: {
 
         imports = with inputs; [
 
@@ -77,13 +79,13 @@
                     sddm.enable = true;
                     openssh.enable = true;
                     pipewire.enable = true;
-                #kdePlasma6.enable = true;
+#kdePlasma6.enable = true;
                     netbird.enable = true;
-                #ollama.enable = true;
+#ollama.enable = true;
                 };
 
                 programs = {
-                #steam.enable = true;
+#steam.enable = true;
                     hyprpanel.enable = true;
                     hyprland.enable = true;
                 };
@@ -102,5 +104,6 @@
             };
 
 
+        };
     };
 }

profiles/jesstop/default.nix

@@ -1,11 +1,13 @@
-{ config, pkgs, lib, inputs, ... }:
+{ ... }: {
 
-{
+    flake.nixosModules.jesstop = { config, pkgs, lib, inputs, ... }:
+
+    {
 
         imports = [
             ./hardware-configuration.nix
 
-        #inputs.home-manager.nixosModules.default
+#inputs.home-manager.nixosModules.default
 
                 inputs.sops-nix.nixosModules.sops
         ];
@@ -127,5 +129,6 @@
             fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
 
 
+        };
     };
 }

profiles/jesstop/hardware-configuration.nix

@@ -1,9 +1,8 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{ ... }: {
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
 
-{
+    flake.nixosModules.jesstop = { config, lib, pkgs, modulesPath, ... }:
+
+    {
         imports =
             [ (modulesPath + "/installer/scan/not-detected.nix")
             ];
@@ -26,14 +25,15 @@
 
         swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
+# (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
+# still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
         networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
         nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
         hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
 }

profiles/laptop/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, lib, home-manager, sops-nix, ... }:
+{ ... }: {
 
-{
+    flake.nixosModules.laptop = { config, pkgs, lib, home-manager, sops-nix, ... }:
+
+    {
 
         imports = [
             home-manager.nixosModules.default
@@ -112,4 +114,5 @@
 
         };
 
+    };
 }

profiles/live/default.nix

@@ -1,4 +1,6 @@
-{ pkgs, inputs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.live = { pkgs, inputs, ... }: {
 
         imports = with inputs; [
 
@@ -47,17 +49,17 @@
                 age.keyFile = "/var/lib/sops/age/keys.txt";
                 defaultSopsFile = ./secrets.yaml;
                 defaultSopsFormat = "yaml";
-            #secrets."nathan/pass".neededForUsers = true;
+#secrets."nathan/pass".neededForUsers = true;
             };
 
             sysconfig = {
-            #remoteBuildClient = true;
+#remoteBuildClient = true;
                 host = "live";
                 graphical = true;
                 users = {
                     nathan = {
                         extraGroups = [ "wheel" "networkmanager" ];
-                    #hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+#hashedPasswordFile = config.sops.secrets."nathan/pass".path;
                         shell = pkgs.zsh;
                         sshKeys = [
                             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
@@ -77,7 +79,7 @@
                                     calcurse.enable = true;
                                     rofi.enable = true;
                                     firefox.enable = true;
-                                #git.enable = true;
+#git.enable = true;
                                     nh.enable = true;
                                 };
                             } 
@@ -90,13 +92,13 @@
                     sddm.enable = true;
                     openssh.enable = true;
                     pipewire.enable = true;
-                #kdePlasma6.enable = true;
+#kdePlasma6.enable = true;
                     netbird.enable = true;
-                #ollama.enable = true;
+#ollama.enable = true;
                 };
 
                 programs = {
-                #steam.enable = true;
+#steam.enable = true;
                     hyprpanel.enable = true;
                     hyprland.enable = true;
                 };
@@ -118,4 +120,5 @@
 
             fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
         };
+    };
 }

profiles/live/disko.nix

@@ -1,7 +1,9 @@
-{
+{ ... }: {
+
+    flake.diskoConfigurations.live = {
         device1 ? throw "Set this to your disk device, e.g. /dev/sda",
         ...
-}: {
+    }: {
         disko.devices = {
             disk = {
                 main = {
@@ -63,4 +65,5 @@
                 };
             };    
         };
+    }
 }

profiles/pi4/default.nix

@@ -1,4 +1,6 @@
-{ config, pkgs, inputs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.pi4 = { config, pkgs, inputs, ... }: {
 
         imports = [
             ./hardware-configuration.nix
@@ -54,7 +56,7 @@
 
                 services = {
                     openssh.enable = true;
-                #pipewire.enable = true;
+#pipewire.enable = true;
                     netbird.enable = true;
                 };
             };
@@ -132,4 +134,5 @@
 
             system.stateVersion = "25.05";
         };
+    };
 }

profiles/pi4/disko.nix

@@ -1,7 +1,9 @@
-{
+{ ... }: {
+
+    flake.diskoConfigurations.pi4 = {
         device1 ? throw "Set this to your disk device, e.g. /dev/sda",
         ...
-}: {
+    }: {
         disko.devices = {
             disk = {
                 main = {
@@ -63,4 +65,5 @@
                 };
             };    
         };
+    };
 }

profiles/pi4/hardware-configuration.nix

@@ -1,9 +1,8 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{ ... }: {
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
 
-{
+    flake.nixosModules.pi4 = { config, lib, pkgs, modulesPath, ... }:
+
+    {
         imports =
             [ (modulesPath + "/installer/scan/not-detected.nix")
             ];
@@ -15,13 +14,14 @@
 
         swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
+# (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
+# still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
         networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
+# networking.interfaces.end0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
+# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
         nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+    };
 }

system/default.nix

@@ -1,11 +1,6 @@
-{ config, lib, pkgs, nixpkgs, ... }: {
+{ ... }: {
 
-    imports = let 
+    flake.nixosModules.default = { config, lib, pkgs, nixpkgs, ... }: {
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
 
         options.sysconfig = with lib; {
             host = mkOption {
@@ -112,4 +107,6 @@
                 };
             };
         };
-}
+    };
+};
+

system/etc/default.nix

@@ -1,6 +1,10 @@
 { ... }: {
     
+
+    flake.nixosModules.default = { ... }: {
+
         config = {
 
         };
+    };
 }

system/packages/default.nix

@@ -1,7 +1,11 @@
-{ pkgs, disko, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.default = { pkgs, ... }: {
 
         environment.systemPackages = with pkgs; [
             sops
-        disko.packages.${pkgs.stdenv.hostPlatform.system}.disko-install 
+            inputs.disko.packages.${pkgs.stdenv.hostPlatform.system}.disko-install 
         ];
+    };
 }
+

system/programs/default.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = [
-        ./hyprland
-	    ./hyprpanel
-        ./steam
-    ];
-}
-

system/programs/hyprland/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, hyprland, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, hyprland, ... }: {
 
         options.sysconfig.programs.hyprland.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -25,4 +27,6 @@
                 portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
             };
         };
+    };
 }
+

system/programs/hyprpanel/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.programs.hyprpanel.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -27,4 +29,6 @@
                     wf-recorder
             ];
         };
+    };
 }
+

system/programs/steam/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.programs.steam.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -11,4 +13,6 @@
                 enable = true;
             };
         };
+    };
 }
+

system/services/avahi/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options = {
             sysconfig.services.avahi.enable = lib.options.mkOption {
@@ -20,4 +22,6 @@
 
             };   
         };
+    };
 }
+

system/services/default.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-}

system/services/dynamicDNS/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.dynamicDNS.enable = with lib; mkOption {
 
@@ -37,4 +39,6 @@
                 script = '''';
             };
         };
+    };
 }
+

system/services/kdePlasma6/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.kdePlasma6.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -28,4 +30,6 @@
                     wl-clipboard # Command-line copy/paste utilities for Wayland
             ];
         };
+    };
 }
+

system/services/netbird/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, nixpkgs-us, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {
 
         options.sysconfig = {
 
@@ -23,4 +25,6 @@
                 package =   pkgs-us.netbird;
             };
         };
+    };
 }
+

system/services/novnc/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.novnc.enable = lib.mkOption {
             type = lib.types.bool;
@@ -27,4 +29,6 @@
 
             networking.firewall.allowedTCPPorts = [ 80 ];
         };
+    };
 }
+

system/services/ollama/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, nixpkgs-us, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {
 
         options = {
             sysconfig.services.ollama.enable = lib.options.mkOption {
@@ -22,4 +24,6 @@
                 in pkgs-us.ollama-cuda;
             };
         };
+    };
 }
+

system/services/openssh/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options = {
             sysconfig.services.openssh.enable = lib.options.mkOption {
@@ -19,4 +21,6 @@
                 };
             };
         };
+    };
 }
+

system/services/pipewire/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options = {
             sysconfig.services.pipewire.enable = lib.options.mkOption {
@@ -10,7 +12,7 @@
         config = lib.mkIf config.sysconfig.services.pipewire.enable {
 
 # Enable sound with pipewire.
-        #sound.enable = true;
+#sound.enable = true;
 
             security.rtkit.enable = true;
             services.pipewire = {
@@ -48,4 +50,5 @@
         };
 
 
+    };
 }

system/services/sddm/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.sddm.enable = lib.mkOption {
             type = lib.types.bool;
@@ -31,4 +33,5 @@
                 ];
             };
         };
+    };
 }

system/services/wyoming/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.services.wyoming = {
             enable = lib.options.mkOption {
@@ -63,4 +65,5 @@
             };
 
         };
+    };
 }

system/users/default.nix

@@ -1,11 +1,6 @@
-{ config, lib, pkgs, ... } @ inputs: {
+{ ... }: {
 
-    imports = let 
+    flake.nixosModules.default = { config, lib, pkgs, ... } @ inputs: {
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
 
         options.sysconfig = with lib; {
 
@@ -141,4 +136,5 @@
 
             };
         };
+    };
 }

system/users/nathan/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         config = lib.mkIf (
                 config.sysconfig.users ? nathan && config.sysconfig.users.nathan.usePresets
@@ -10,7 +12,7 @@
                 shell = lib.mkDefault pkgs.zsh;
                 name = lib.mkDefault "nathan";
                 isNormalUser = lib.mkDefault true;
-            #hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
+#hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
                 extraGroups = [ "networkmanager" "docker" "libvirtd" ];
                 openssh.authorizedKeys.keys = with config.sysconfig.users.nathan; lib.mkIf config.sysconfig.services.openssh.enable (
                         ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) ssh.hosts)
@@ -21,4 +23,5 @@
 
             };
         };
+    };
 }

system/virtualization/containers/code-server/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.containers.code-server.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -38,4 +40,5 @@
                 };
             };
         };
+    };
 }

system/virtualization/containers/default.nix

@@ -1,32 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-
-    /*imports = [
-        ./gitlab
-        ./gitea
-        ./traefik
-        ./nginx
-        ./jellyfin
-        ./pihole
-        ./nextcloud
-        ./ntfy
-        ./homeassistant
-        ./rustdesk
-        ./netbird
-        ./keycloak
-        ./ollama
-        ./openwebui
-        ./n8n
-        ./wyoming
-        ./code-server
-        ./novnc
-        ./minecraft
-        #./sandbox
-    ];*/
-}

system/virtualization/containers/gitea/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.containers.gitea.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -32,6 +34,7 @@
                 extraFlags = [
                     "--load-credential=dbpass:${config.sops.secrets."gitea/dbpass".path}"
                 ];
+                
                 config = {
 
                     systemd.services.secrets_setup = {
@@ -86,6 +89,7 @@
                         };
 
                     };
+
                     services.openssh = {
                         enable = true;
                         openFirewall = true;
@@ -103,4 +107,5 @@
                 };
             };
         };
+    };
 }

system/virtualization/containers/gitlab/default.nix

@@ -1,172 +0,0 @@
-{ config, lib, ... }: {
-
-    options.sysconfig.containers.gitlab.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.sysconfig.containers.gitlab.enable {
-
-        sops.secrets = {
-            "gitlab/db_pass" = {};
-            "gitlab/root_pass" = {};
-            "gitlab/secrets/secret" = {};
-            "gitlab/secrets/otp" = {};
-            "gitlab/secrets/db" = {};
-            "gitlab/secrets/jws" = {};
-            "gitlab/oidc/id" = {};
-            "gitlab/oidc/secret" = {};
-        };
-
-        services.openssh.ports = [
-            2222
-        ];
-
-        networking.firewall.allowedTCPPorts = [
-            22
-            2222
-        ];
-
-        containers.gitlab = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.16";
-
-            forwardPorts = [
-                {
-                    containerPort = 22;
-                    hostPort = 22;
-                }
-            ];
-
-            bindMounts = {
-                "/etc/gitlab/data" = {
-                    hostPath = "/ssd1/Gitlab/data";
-                    isReadOnly = false;
-                };
-            };
-
-            extraFlags = [
-                "--load-credential=dbpass:${config.sops.secrets."gitlab/db_pass".path}"
-                "--load-credential=rootpass:${config.sops.secrets."gitlab/root_pass".path}"
-                "--load-credential=secret:${config.sops.secrets."gitlab/secrets/secret".path}"
-                "--load-credential=otp:${config.sops.secrets."gitlab/secrets/otp".path}"
-                "--load-credential=db:${config.sops.secrets."gitlab/secrets/db".path}"
-                "--load-credential=jws:${config.sops.secrets."gitlab/secrets/jws".path}"
-                "--load-credential=oidc_id:${config.sops.secrets."gitlab/oidc/id".path}"
-                "--load-credential=oidc_secret:${config.sops.secrets."gitlab/oidc/secret".path}"
-            ];
-            config = {
-
-                systemd.services.secrets_setup = {
-                    wantedBy = [ "gitlab.service" ];
-
-                    serviceConfig = {
-                        LoadCredential = [
-                            "dbpass"
-                            "rootpass"
-                            "secret"
-                            "db"
-                            "otp"
-                            "jws"
-                            "oidc_id"
-                            "oidc_secret"
-                        ];
-                    };
-
-                    script = ''
-                        cat ''${CREDENTIALS_DIRECTORY}/dbpass > /etc/gitlab/dbpass
-                        cat ''${CREDENTIALS_DIRECTORY}/rootpass > /etc/gitlab/rootpass
-                        cat ''${CREDENTIALS_DIRECTORY}/secret > /etc/gitlab/secret
-                        cat ''${CREDENTIALS_DIRECTORY}/db > /etc/gitlab/db
-                        cat ''${CREDENTIALS_DIRECTORY}/otp > /etc/gitlab/otp
-                        cat ''${CREDENTIALS_DIRECTORY}/jws > /etc/gitlab/jws
-                        cat ''${CREDENTIALS_DIRECTORY}/oidc_id > /etc/gitlab/oidc-id
-                        cat ''${CREDENTIALS_DIRECTORY}/oidc_secret > /etc/gitlab/oidc-secret
-
-                        chown gitlab:gitlab /etc/gitlab/*
-                    '';
-                };
-                
-                services.gitlab = {
-                    enable = true;
-                    #https = true;
-                    #port = 443;
-                    host = "gitlab.blunkall.us";
-                    databasePasswordFile = "/etc/gitlab/dbpass";
-                    initialRootPasswordFile = "/etc/gitlab/rootpass";
-
-                    statePath = "/etc/gitlab/data";
-
-                    secrets = {
-                        secretFile = "/etc/gitlab/secret";
-                        otpFile = "/etc/gitlab/otp";
-                        dbFile = "/etc/gitlab/db";
-                        jwsFile = "/etc/gitlab/jws";
-                    };
-
-                    extraConfig = {
-                        gitlab = {
-                            default_project_features = {
-                                builds = false;
-                            };
-                        };
-                        omniauth = {
-                            enabled = true;
-                            auto_sign_in_with_provider = "openid_connect";
-                            allow_single_sign_on = [ "openid_connect" ];
-                            sync_email_from_provider = "openid_connect";
-                            sync_profile_from_provider = [ "openid_connect" ];
-                            sync_profile_attributes = [ "email" ];
-                            auto_link_saml_user = true;
-                            auto_link_user = [ "openid_connect" ];
-                            block_auto_created_users = false;
-                            providers = [
-                                {
-                                    name = "openid_connect";
-                                    label = "Authentik SSO";
-                                    args = {
-                                        name = "openid_connect";
-                                        scope = [ "openid" "profile" "email" ];
-                                        response_type = "code";
-                                        issuer = "https://auth.blunkall.us/application/o/gitlab/";
-                                        discovery = true;
-                                        client_auth_method = "query";
-                                        uid_field = "preferred_username";
-                                        send_scope_to_token_endpoint = true;
-                                        pkce = true;
-                                        client_options = {
-                                            identifier = { _secret = "/etc/gitlab/oidc-id"; };
-                                            secret = { _secret = "/etc/gitlab/oidc-secret"; };
-                                            redirect_uri = "https://gitlab.blunkall.us/users/auth/openid_connect/callback";
-                                        };
-                                    };
-                                }
-                            ];
-                        };
-                    };
-                };
-                services.nginx = {
-                    enable = true;
-                    recommendedProxySettings = true;
-                    virtualHosts = {
-                        "gitlab.blunkall.us" = {
-                            locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
-                        };
-                    };
-                };
-
-                services.openssh.enable = true;
-
-                systemd.services.gitlab-backup.environment.BACKUP = "dump";
-
-
-                networking.firewall.allowedTCPPorts = [ 22 80 ];
-
-                system.stateVersion = "24.05";
-            };
-        };
-    };
-}

system/virtualization/containers/minecraft/default.nix

@@ -1,108 +0,0 @@
-{ config, lib, pkgs, nix-minecraft, ... }: {
-
-    options.sysconfig = {
-        containers.minecraft.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.sysconfig.containers.minecraft.enable {
-
-        networking = {
-            firewall = {
-                allowedTCPPorts = [ 25565 ];
-                allowedUDPPorts = [ 25565 ];
-            };
-        };
-                
-        nixpkgs.overlays = [ nix-minecraft.overlay ];
-
-        containers.minecraft = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.29";
-
-            forwardPorts = [
-                {
-                    containerPort = 25565;
-                    hostPort = 25565;
-                    protocol = "tcp";
-                }
-                {
-                    containerPort = 25565;
-                    hostPort = 25565;
-                    protocol = "udp";
-                }
-            ];
-
-
-            config = {
-
-                imports = [
-                    nix-minecraft.nixosModules.minecraft-servers
-                ];
-
-                environment.systemPackages = with pkgs; [ tmux ];
-
-                services.minecraft-servers = {
-
-                    enable = true;
-                    eula = true;
-                    openFirewall = true;
-                    dataDir = "/var/lib/mcservers";
-
-                    managementSystem.systemd-socket.enable = true; #temp
-
-                    servers = {
-
-                        vanilla = {
-                            enable = true;
-                            package = pkgs.fabricServers.fabric-1_21_8;
-                            serverProperties = {
-                                server-port = 25565;
-                                gamemode = "survival";
-                                difficulty = 2;
-                                white-list = true;
-                                motd = "Didn't see that coming huh?";
-                            }; 
-                            whitelist = {
-                                "MeasureTwice66" = "a4032062-293d-484d-a790-9f52475836bb";
-                                "651sonic" = "936a3fb0-4548-4557-975b-7794e97a3afc";
-                                "Griffin12_" = "6a1f56d9-f712-4723-a031-e5437a389bb3";
-                            };
-                            autoStart = true;
-                        };
-
-                        modded = {
-                            enable = false;
-#package = pkgs.fabricServers.fabric-1_21_1.override { loaderVersion = "0.16.14"; };
-                            package = pkgs.fabricServers.fabric-1_21_1;
-                            jvmOpts = [ "-Xms8000M" "-Xmx12000M" ];
-                            serverProperties = {
-                                server-port = 25566;
-                                gamemode = "survival";
-                                white-list = true;
-                                allow-flight = true;
-                                motd = "Ex-plo-sion!!!";
-                            };
-                            whitelist = {
-                                "MeasureTwice66" = "a4032062-293d-484d-a790-9f52475836bb";
-                                "651sonic" = "936a3fb0-4548-4557-975b-7794e97a3afc";
-                                "Griffin12_" = "6a1f56d9-f712-4723-a031-e5437a389bb3";
-                            };
-                            autoStart = true;
-                            symlinks = {
-                                "mods" = ./mods;
-                            };
-                        };
-                    };
-                };
-
-                system.stateVersion = "25.05";
-            };
-        };
-    };
-}

system/virtualization/containers/nginx/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.containers."esotericbytes.com".enable = lib.mkOption {
             type = lib.types.bool;
@@ -40,4 +42,5 @@
                 };
             };
         };
+    };
 }

system/virtualization/containers/novnc/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.containers.novnc.enable = lib.mkOption {
             type = lib.types.bool;
@@ -49,4 +51,5 @@
                 };
             };
         };
+    };
 }

system/virtualization/containers/ntfy/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.containers.ntfy.enable = lib.mkOption {
             type = lib.types.bool;
@@ -40,4 +42,5 @@
                 };
             };
         };
+    };
 }

system/virtualization/containers/rustdesk/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.containers.rustdesk.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -17,7 +19,7 @@
                 privateNetwork = true;
                 hostAddress = "192.168.100.10";
                 localAddress = "192.168.100.27";
-/*            forwardPorts = [
+                /*            forwardPorts = [
                               {
                               containerPort = 21115;
                               hostPort = 21115;
@@ -69,7 +71,7 @@
 
                         signal = {
                             enable = true;
-                        #relayHosts = [ "esotericbytes.com" ];
+#relayHosts = [ "esotericbytes.com" ];
                             relayHosts = [ "192.168.100.27" ];
                             extraArgs = [
                                 "-k"
@@ -82,4 +84,5 @@
                 };
             };
         };
+    };
 }

system/virtualization/containers/sandbox/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, self, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, self, ... }: {
 
         options.sysconfig.containers.sandbox.enable = lib.mkOption {
             type = lib.types.bool;
@@ -74,6 +76,7 @@
                 };
 
 
+            };
         };
     };
 }

system/virtualization/containers/wyoming/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.containers.wyoming = {
             enable = lib.options.mkOption {
@@ -101,7 +103,7 @@
 
                             threshold = 0.5;
                             customModelsDirectories = [
-                            #./wake_words
+#./wake_words
                             ];
                         };
 
@@ -118,7 +120,7 @@
                         satellite = lib.mkIf config.sysconfig.containers.wyoming.satellite {
                             enable = true;
                             uri = "tcp://0.0.0.0:11431";
-                        #user = "nathan";
+#user = "nathan";
                             vad.enable = false;
                         };
                     };
@@ -128,4 +130,5 @@
             };
 
         };
+    };
 }

system/virtualization/default.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-}

system/virtualization/docker/authentik/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
 
     hostPort = 9005;
 
@@ -6,7 +8,7 @@
 
     name = "authentik";
 
-in {
+    in {
 
         options.sysconfig.docker.authentik.enable = with lib; mkOption {
             type = with types; bool;
@@ -108,7 +110,7 @@ in {
                 ];
                 ports = [
                     "${builtins.toString hostPort}:9000/tcp"
-                #"9443:9443/tcp"
+#"9443:9443/tcp"
                 ];
                 cmd = [ "server" ];
                 dependsOn = [
@@ -234,4 +236,5 @@ in {
                 wantedBy = [ "multi-user.target" ];
             };
         };
+    };
 }

system/virtualization/docker/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.docker = {
             enable = with lib; mkOption {
@@ -12,13 +14,6 @@
             };
         };
 
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-
         config = lib.mkIf config.sysconfig.docker.enable {
 
             networking.nat.internalInterfaces = [ "docker0" "docker-main" ];
@@ -58,4 +53,6 @@
                 wantedBy = [ "multi-user.target" ];
             };
         };
+    };
 }
+

system/virtualization/docker/gitea/default.nix

@@ -1,10 +1,12 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
 
     subdomain = "gitea";
 
     name = "gitea";
 
-in {
+    in {
 
         options.sysconfig.docker."${name}".enable = with lib; mkOption {
             type = with types; bool;
@@ -17,8 +19,8 @@ in {
             virtualisation.oci-containers.containers."${name}" = {
                 image = "docker.gitea.com/gitea:1.25.4";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -61,8 +63,8 @@ in {
             virtualisation.oci-containers.containers."${name}-db" = {
                 image = "docker.io/library/postgres:14";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${name}-db";
 
@@ -148,4 +150,5 @@ in {
             };
 
         };
+    };
 }

system/virtualization/docker/home-assistant/default.nix

@@ -1,10 +1,12 @@
-{ config, lib, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: let
 
     subdomain = "hass";
 
     name = "home-assistant";
 
-in {
+    in {
 
         options.sysconfig.docker.home-assistant.enable = with lib; mkOption {
             type = with types; bool;
@@ -18,8 +20,8 @@ in {
             virtualisation.oci-containers.containers.home-assistant = {
                 image = "ghcr.io/home-assistant/home-assistant:stable";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -34,7 +36,7 @@ in {
                     "traefik.http.routers.${name}.service" = "${name}";
                     "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
 
-                #"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
+#"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
                     "traefik.http.services.${name}.loadbalancer.server.port" = "8123";
                 };
 
@@ -55,4 +57,5 @@ in {
                 ];
             };
         };
+    };
 }

system/virtualization/docker/jellyfin/default.nix

@@ -1,10 +1,12 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
 
     subdomain = "watch";
 
     name = "jellyfin";
 
-in {
+    in {
 
         options.sysconfig.docker.jellyfin.enable = with lib; mkOption {
             type = with types; bool;
@@ -18,8 +20,8 @@ in {
             virtualisation.oci-containers.containers.jellyfin = {
                 image = "jellyfin/jellyfin:10.11.6";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -114,4 +116,5 @@ in {
             };
 
         };
+    };
 }

system/virtualization/docker/n8n/default.nix

@@ -1,10 +1,12 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
 
     subdomain = "n8n";
 
     name = "n8n";
 
-in {
+    in {
 
         options.sysconfig.docker."${name}".enable = with lib; mkOption {
             type = with types; bool;
@@ -17,8 +19,8 @@ in {
             virtualisation.oci-containers.containers."${name}" = {
                 image = "docker.n8n.io/n8nio/n8n";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -99,4 +101,5 @@ in {
             };
 
         };
+    };
 }

system/virtualization/docker/netbird/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.docker.netbird.enable = with lib; mkOption {
             type = with types; bool;
@@ -226,4 +228,5 @@
                 wantedBy = [ "multi-user.target" ];
             };
         };
+    };
 }

system/virtualization/docker/nextcloud/default.nix

@@ -1,10 +1,12 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
 
     subdomain = "cloud";
 
     name = "nextcloud";
 
-in {
+    in {
 
         options.sysconfig.docker.nextcloud.enable = with lib; mkOption {
             type = with types; bool;
@@ -18,8 +20,8 @@ in {
 
                 serviceName = "docker-nextcloud";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -52,7 +54,7 @@ in {
                     "traefik.http.middlewares.nextcloud-chain.chain.middlewares" = "https-redirect,nextcloud-secure-headers";
 
 
-                #"traefik.http.services.${name}.loadbalancer.server.port" = "11000";
+#"traefik.http.services.${name}.loadbalancer.server.port" = "11000";
                     "traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.101.1:11000";
                 };
 
@@ -112,4 +114,5 @@ in {
             };
 
         };
+    };
 }

system/virtualization/docker/ollama/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
 
     hostPort = 11434;
 
@@ -6,7 +8,7 @@
 
     name = "ollama";
 
-in {
+    in {
 
         options.sysconfig.docker.ollama.enable = with lib; mkOption {
             type = with types; bool;
@@ -32,8 +34,8 @@ in {
             virtualisation.oci-containers.containers.ollama = {
                 image = "ollama/ollama:latest";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -56,7 +58,7 @@ in {
                     "traefik.http.routers.${name}.service" = "${name}";
                     "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
 
-                #"traefik.http.services.ollama.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
+#"traefik.http.services.ollama.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
                     "traefik.http.services.${name}.loadbalancer.server.port" = "11434";
                 };
 
@@ -70,4 +72,5 @@ in {
                 };
             };
         };
+    };
 }

system/virtualization/docker/openwebui/default.nix

@@ -1,10 +1,12 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
 
     subdomain = "ai";
 
     name = "openwebui";
 
-in {
+    in {
 
         options.sysconfig.docker.openwebui.enable = with lib; mkOption {
             type = with types; bool;
@@ -16,8 +18,8 @@ in {
             virtualisation.oci-containers.containers.openwebui = {
                 image = "ghcr.io/open-webui/open-webui:v0.7.2";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -93,4 +95,5 @@ in {
             };
 
         };
+    };
 }

system/virtualization/docker/pihole/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: let
 
     hostPort = 9001;
 
@@ -6,7 +8,7 @@
 
     name = "pihole";
 
-in {
+    in {
 
         options.sysconfig.docker.pihole.enable = with lib; mkOption {
             type = with types; bool;
@@ -39,8 +41,8 @@ in {
             virtualisation.oci-containers.containers.pihole = {
                 image = "pihole/pihole:latest";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -55,7 +57,7 @@ in {
                     "traefik.http.routers.${name}.service" = "${name}";
                     "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
 
-                #"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
+#"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
                     "traefik.http.services.${name}.loadbalancer.server.port" = "80";
                 };
 
@@ -79,4 +81,5 @@ in {
                 };
             };
         };
+    };
 }

system/virtualization/docker/portainer/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: let
 
     hostPort = 9000;
 
@@ -6,7 +8,7 @@
 
     name = "portainer";
 
-in {
+    in {
 
         options.sysconfig.docker.portainer.enable = with lib; mkOption {
             type = with types; bool;
@@ -24,8 +26,8 @@ in {
             virtualisation.oci-containers.containers.portainer = {
                 image = "portainer/portainer-ce:latest";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -40,7 +42,7 @@ in {
                     "traefik.http.routers.${name}.service" = "${name}";
                     "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
 
-                #"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
+#"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
                     "traefik.http.services.${name}.loadbalancer.server.port" = "9000";
                 };
 
@@ -59,4 +61,5 @@ in {
                 ];
             };
         };
+    };
 }

system/virtualization/docker/searxng/default.nix

@@ -1,10 +1,12 @@
-{ config, lib, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: let
 
     subdomain = "searxng";
 
     name = "searxng";
 
-in {
+    in {
 
         options.sysconfig.docker.searxng.enable = with lib; mkOption {
             type = with types; bool;
@@ -18,8 +20,8 @@ in {
             virtualisation.oci-containers.containers.searxng = {
                 image = "searxng/searxng:latest";
 
-            # unstable, waiting for 26.05
+# unstable, waiting for 26.05
-            #pull = "newer";
+#pull = "newer";
 
                 hostname = "${subdomain}.esotericbytes.com";
 
@@ -34,7 +36,7 @@ in {
                     "traefik.http.routers.${name}.service" = "${name}";
                     "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
 
-                #"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
+#"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
                     "traefik.http.services.${name}.loadbalancer.server.port" = "8080";
                 };
 
@@ -56,4 +58,5 @@ in {
                 };
             };
         };
+    };
 }

system/virtualization/docker/traefik/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.docker.traefik.enable = with lib; mkOption {
             type = with types; bool;
@@ -105,4 +107,5 @@
                 wantedBy = [ "multi-user.target" ];
             };
         };
+    };
 }

system/virtualization/virtual-machines/default.nix

@@ -1,17 +1,12 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.virtual-machines.enable = with lib; mkOption {
             type = with types; bool;
             default = false;
         };
 
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-
         config = lib.mkIf config.sysconfig.virtual-machines.enable {
             programs.virt-manager.enable = true;
 
@@ -28,4 +23,5 @@
                 virt-viewer
             ];
         };
+    };
 }

system/virtualization/virtual-machines/home-assistant/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig.virtual-machines.home-assistant = {
             enable = lib.options.mkOption {
@@ -10,4 +12,6 @@
         config = lib.mkIf config.sysconfig.virtual-machines.home-assistant.enable {
 
         };
+    };
 }
+

templates/default.nix

@@ -0,0 +1,46 @@
+{ ... }: {
+
+    flake.templates = {
+        nixos = {
+            welcomeText = ''
+                #Welcome to Olympus!
+                Have Fun!
+            '';
+
+            description = ''
+                Generate this where you want your config.
+            '';
+
+            path = ./nixos;
+
+        };
+
+        home-manager = {
+            welcomeText = ''
+                #Welcome to Olympus!
+                Have Fun!
+            '';
+
+            description = ''
+                Generate this where you want your config.
+            '';
+
+            path = ./home-manager;
+
+        };
+
+        nix-on-droid = {
+            welcomeText = ''
+                #Welcome to Olympus!
+                Have Fun!
+            '';
+
+            description = ''
+                Generate this where you want your config.
+            '';
+
+            path = ./nix-on-droid;
+
+        };
+    };
+}