ssh for laptop

This reverts commit c6a21aee85.

.sops.yaml

@@ -1,22 +1,11 @@
 keys:
   - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
   - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
+  - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
 creation_rules:
-  - path_regex: homebox/secrets.yaml$
-    key_groups:
-    - age:
-      - *homebox
-  - path_regex: laptop/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: nathan/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-      - *homebox
-  - path_regex: system-config/secrets.yaml$
+  - path_regex: system/secrets.yaml$
     key_groups:
     - age:
       - *laptop
       - *homebox
+      - *android

flake.nix

@@ -2,38 +2,15 @@
     description = "Nixos config flake";
      
     inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-        #nixpkgs.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-24.11";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
 
         nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
-        #nixpkgs-us.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/nixpkgs?ref=nixos-unstable";
 
         home-manager = {
-            url = "github:nix-community/home-manager/release-25.05";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
+            url = "github:nix-community/home-manager/release-25.11";
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        home-manager-us = {
-            url = "github:nix-community/home-manager/master";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.11";
-            inputs.nixpkgs.follows = "nixpkgs-us";
-        };
-
-        nixpkgs-droid.url = "github:nixos/nixpkgs/nixos-24.05";
-        
-        home-manager-droid = {
-            url = "github:nix-community/home-manager/release-24.05";
-            #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.05";
-            inputs.nixpkgs.follows = "nixpkgs-droid";
-        };
-
-        nix-on-droid = {
-            url = "github:nix-community/nix-on-droid/release-24.05";
-            inputs.nixpkgs.follows = "nixpkgs-droid";
-            inputs.home-manager.follows = "home-manager-droid";
-        };
-
         disko = {
             url = "github:nix-community/disko";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -44,152 +21,25 @@
             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";
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-
-        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
-
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-        #hyprland.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/hyprland?submodules=1";
 
-        nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai";
-        #nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai";
+        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
+        #nixvim.url = "git+file:///home/nathan/Projects/Moirai";
 
-        themecord = {
-            url = "github:danihek/themecord";
-            inputs.nixpkgs.follows = "nixpkgs";
+        aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+        #aurora.url = "git+file:///home/nathan/Projects/Aurora";
     };
 
-    };
-
-    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
-
-        nixosConfigurations = {
-        
-            homebox = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/homebox
-                    ./system-config
-                ];
-            };
-
-            laptop = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = import ./home-manager/users/nathan;
-                        home-manager-config = import ./home-manager;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/laptop
-                    ./system-config
-                ];
-            };
-
-            jesstop = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/jesstop
-                    ./system-config
-                ];
-            };
-
-            pi4 = {
-                system = "aarch64-linux";
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/pi4
-                    ./system-config
-                ];
-            };
-
-            live = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/live
-                    ./system-config
-                ];
-            };
-
-            container = nixpkgs.lib.nixosSystem {
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan-home-manager = import ./home-manager/nathan;
-                    }; 
-                };
-                modules = [
-                    ./system-config/configuration/sandbox-nathan
-                    ./system-config
-                ];
-            };
-        };
-
-        nixOnDroidConfigurations.default = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-            pkgs = import nixpkgs { 
-                system = "aarch64-linux"; 
-                overlays = [ inputs.nix-on-droid.overlays.default ];
-            };
-
-            modules = [
-                ./system-config/configuration/android 
-            ];
-
-            extraSpecialArgs = {
-                inputs = inputs // {
-                    nathan = import ./home-manager/nathan;
-                };
-            };
-
-            home-manager-path = home-manager.outPath;
-
-        };
-
-
-        homeConfigurations = {
-            nathan = home-manager.lib.homeManagerConfiguration {
-                pkgs = import nixpkgs {
-                    system = builtins.currentSystem;
-                };
-
-                modules = [
-                    ./home-manager
-                    {
-                        homeconfig = {
-                            username = "nathan";
-                            graphical = false;
-                            minimal = false;
-                        };
-                    }
-                ];
-
-                extraSpecialArgs = {
-                    inherit inputs;
-                };
-            };
-        };
-    };
+    outputs = { ... } @ inputs: 
+    inputs.flake-parts.lib.mkFlake { inherit inputs; }
+    (inputs.import-tree [ ./modules ]);
 }

home-manager/default.nix

@@ -1,38 +0,0 @@
-{ config, lib, ... }: {
-
-    imports = [
-        ./programs
-        ./services
-    ];
-
-    options.homeconfig = with lib; {
-        host = mkOption {
-            type = with types; nullOr str;
-            default = null;
-        };
-        
-        name = mkOption {
-            type = with types; nullOr str;
-            default = null;
-        };
-        
-        graphical = mkOption {
-            type = with types; bool;
-            default = true;
-        };
-
-        standalone.enable = mkOption {
-            type = with types; bool;
-            default = false;
-        };
-    };
-
-    config = {
-
-        home.username = lib.mkDefault config.homeconfig.name;
-
-        home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
-        
-        programs.home-manager.enable = config.homeconfig.standalone.enable;
-    };
-}

home-manager/programs/calcurse/default.nix

@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.calcurse.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.calcurse.enable {
-        home.packages = with pkgs; [
-            calcurse
-            libnotify
-        ];
-    };
-}

home-manager/programs/default.nix

@@ -1,24 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./git
-        ./nh
-        ./hyprland
-        ./hyprpanel
-	    ./terminal
-        ./rofi
-        ./pywal
-        ./swaylock
-        ./calcurse
-        ./firefox
-    ];
-
-    config = {
-
-        home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
-            inputs.nixvim.packages.${pkgs.system}.default
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}

home-manager/programs/firefox/default.nix

@@ -1,59 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.firefox.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.firefox.enable {
-
-        home.sessionVariables.BROWSER = "${config.programs.firefox.package}/bin/firefox";
-
-        home.packages = lib.mkIf config.homeconfig.wal.enable [ 
-            pkgs.pywalfox-native
-        ];
-
-        home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = let
-            pywalfox-wrapper = pkgs.writeShellScriptBin "pywalfox-wrapper" ''
-                ${pkgs.pywalfox-native}/bin/pywalfox start
-            '';
-        in lib.replaceStrings [ "<path>" ] [
-            "${pywalfox-wrapper}/bin/pywalfox-wrapper"
-        ] (lib.readFile "${pkgs.pywalfox-native}/lib/python3.12/site-packages/pywalfox/assets/manifest.json");
-
-
-        programs.firefox = {
-
-            enable = true;
-            package = pkgs.firefox;
-
-            profiles.nathan = {
-                search = {
-                    default = "ddg";
-                    privateDefault = "ddg";
-                };
-                bookmarks = {
-                    force = true;
-                    settings = [
-                        {
-                            name = "toolbar";
-                            toolbar = true;
-                            bookmarks = [
-                                {
-                                    name = "NixOS Search - Packages";
-                                    url = "https://search.nixos.org/packages";
-                                }
-                            ];
-                        }
-                    ];
-                };
-
-                extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
-                    ublock-origin
-                    keepassxc-browser
-                    pywalfox
-                ];
-            };
-        };
-    };
-}

home-manager/programs/git/default.nix

@@ -1,44 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.git.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.git.enable {
-
-        sops = {
-            secrets = {
-                "git/username" = {};
-                "git/email" = {};
-            };
-
-            templates.gitconfig.content = ''
-                [user]
-                    name = "${config.sops.placeholder."git/username"}"
-                    email = "${config.sops.placeholder."git/email"}"
-            '';
-        };
-        
-        programs.git = {
-            enable = true;
-
-            includes = [
-                { path = "${config.sops.templates.gitconfig.path}"; }
-            ];
-            
-            extraConfig = {
-                init = {
-                    defaultBranch = "master";
-                };
-                url = {
-                    "ssh://gitea@gitea.blunkall.us/" = {
-                        insteadOf = [
-                            "blunkall:"
-                        ];
-                    };
-                };
-            };
-        };
-    };
-}

home-manager/programs/hyprland/default.nix

@@ -1,47 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprland.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprland.enable {
-
-        home.sessionVariables.NIX_OZONE_WL = "1";
-
-        programs.kitty.enable = lib.mkDefault true;
-
-        home.packages = with pkgs; [
-            pyprland
-        ];
-
-        wayland.windowManager.hyprland = {
-
-            enable = true;
-
-            systemd = {
-                enable = true;
-                variables = [ "--all" ];
-            };
-
-            extraConfig = let 
-                monitor = if config.homeconfig.host == "laptop" then ''
-                    monitor=eDP-1,1920x1080@300,0x0,1
-                '' else if config.homeconfig.host == "homebox" then ''
-                    monitor=HDMI-A-2,1920x1080@60,0x0,1
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=hyprctl output create headless HEADLESS-2
-                    exec-once=hyprctl keyword monitor HDMI-A-2,disable
-                    exec-once=${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 -o HEADLESS-2
-                '' else if config.homeconfig.host == "container" then ''
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=hyprctl output create headless HEADLESS-2
-                    exec-once=${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 -o HEADLESS-2
-                '' else '''';
-            in monitor + ''
-                source = /home/nathan/.config/hypr/main.conf
-            '';
-
-        };
-    };
-}

home-manager/programs/hyprpanel/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.hyprpanel.enable = with lib; mkOption {
-        type = with types; bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprpanel.enable {
-        
-        programs.hyprpanel = {
-            enable = true;
-
-        };
-    };
-}

home-manager/programs/nh/default.nix

@@ -1,21 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.nh.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.nh.enable {
-        
-        programs.nh = {
-            enable = true;
-            flake = "${config.home.homeDirectory}/Projects/Olympus";
-
-            clean = {
-                enable = true;
-                dates = "weekly";
-                extraArgs = "--keep 5 --keep-since 5d";
-            };
-        };
-    };
-}

home-manager/programs/pywal/default.nix

@@ -1,19 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wal.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.wal.enable {
-
-        home.packages = with pkgs; [
-            inputs.nixvim.packages.${pkgs.system}.pywal
-
-            pywal16
-		    imagemagick
-        ];
-
-        
-    };
-}

home-manager/programs/rofi/default.nix

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }: {
-    
-    options.homeconfig.rofi.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.rofi.enable {
-        programs.rofi = {
-
-            enable = true;
-            package = pkgs.rofi-wayland;
-
-            cycle = true;
-
-            theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
-        };
-    };
-}
-

home-manager/programs/swaylock/default.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.swaylock.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.swaylock.enable {
-
-        home.packages = with pkgs; [ swaylock-effects ];
-    };
-}

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

@@ -1,31 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    home.packages = with pkgs; [ oh-my-posh ];
-
-    programs.bash = {
-        enable = true;
-        enableCompletion = true;
-
-        shellAliases = {
-            ls = "eza";
-            ll = "ls -l";
-
-            ksh = "kitten ssh";
-
-            vi = "nvim";
-            vim = "nvim";
-
-        };
-
-        bashrcExtra = ''
-            source ${pkgs.blesh}/share/blesh/ble.sh
-        '';
-
-        initExtra = if config.homeconfig.wal.enable then (lib.mkBefore ''
-            cat ${config.home.homeDirectory}/.cache/wal/sequences
-            eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
-        '') else (lib.mkBefore ''
-            eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
-        '');
-    };
-}

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

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.bat = {
-
-    enable = true;
-
-    extraPackages = with pkgs.bat-extras; [
-      batman
-      batpipe
-      batgrep
-      batdiff
-      batwatch
-      prettybat
-    ];
-
-
-  };
-}

home-manager/programs/terminal/default.nix

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

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

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.eza = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    extraOptions = [
-      "--color=auto"
-    ];
-
-    git = true;
-
-    icons = "auto";
-  };
-}

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

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.fzf = {
-  
-    enable = true;
-
-    enableZshIntegration = true;
-
-    tmux = {
-      #enableShellIntegration = true;
-
-      #shellIntegrationOptions = [];
-    };
-  };
-}

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

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-      
-  programs.kitty = {
-    
-    enable = true;
-
-    font = {
-      name = "FiraCode Nerd Font";
-      size = 12;
-    };
-
-    extraConfig = ''
-
-confirm_os_window_close 0
-
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
-
-disable_ligatures never
-
-dynamic_background_opacity yes
-
-tab_bar_edge top
-
-map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
-
-map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
-
-    '';
-  };
-}
-

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

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.tmux = {
-    
-    enable = true;
-    
-    clock24 = true;
-    
-    mouse = true;
-    
-    baseIndex = 1;
-    
-    keyMode = "vi";
-    
-    prefix = "C-b";
-    
-    shell = "${pkgs.zsh}/bin/zsh";
-  
-  };
-
-}
-
-

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

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zoxide = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    options = [
-      "--cmd cd"
-    ];
-  };
-}

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

@@ -1,158 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    oh-my-posh
-  ];
-  
-  programs.zsh = {
-    
-    enable = true;
-    
-    enableCompletion = true;
-    
-    autosuggestion.enable = true;
-    
-    syntaxHighlighting.enable = true;
-    
-    shellAliases = {
-      ls = "eza";
-      ll = "ls -l";
-
-      ksh = "kitten ssh";
-
-      vi = "nvim";
-      vim = "nvim";
-
-    };
-
-    history = {
-      size = 5000;
-      ignoreAllDups = true;
-      ignoreSpace = true;
-      share = true;
-    };
-
-    initContent = if config.homeconfig.wal.enable then (lib.mkBefore ''
-      cat ${config.home.homeDirectory}/.cache/wal/sequences
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
-    '') else (lib.mkBefore ''
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/zsh/ohmyposh.toml)"
-    '');
-
-  };
-
-  home.file.".config/wal/templates/ohmyposh.toml".text = ''
-#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
-
-version = 2
-final_space = true
-console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
-
-[[blocks]]
-  type = 'prompt'
-  alignment = 'left'
-  newline = true
-
-  [[blocks.segments]]
-    type = 'os'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c1'
-    foreground = 'p:c12'
-    template = ' {{{{ .Icon }}}} '
-
-  [[blocks.segments]]
-    type = 'session'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c2'
-    foreground = 'p:c14'
-    template = '{{{{ .UserName }}}}@{{{{ .HostName }}}}'
-
-  [[blocks.segments]]
-    type = 'path'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c4'
-    foreground = 'p:c13'
-    template = '{{{{ .Path }}}}'
-
-    [blocks.segments.properties]
-      style = 'full'
-
-[[blocks]]
-  type = 'prompt'
-  overflow = 'hidden'
-  alignment = 'right'
-
-  [[blocks.segments]]
-    type = 'executiontime'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c4'
-    foreground = 'p:c13'
-    template = '{{{{ .FormattedMs }}}}'
-
-  [[blocks.segments]]
-    type = 'time'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c2'
-    foreground = 'p:c14'
-
-  [[blocks.segments]]
-    type = 'shell'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c1'
-    foreground = 'p:c12'
-
-[[blocks]]
-  type = 'prompt'
-  alignment = 'left'
-  newline = true
-
-  [[blocks.segments]]
-    type = 'text'
-    style = 'plain'
-    background = 'transparent'
-    foreground_templates = [
-      "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
-      "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
-    ]
-    template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
-
-[transient_prompt] 
-  foreground_templates = [
-    "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
-    "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
-  ]
-  background = 'transparent'
-  template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
-
-[secondary_prompt]
-  background = 'transparent'
-  forground = 'p:c14'
-  template = "❭❭ "
-
-
-[palette]
-
-c0 = "{color0}"
-c1 = "{color1}"
-c2 = "{color2}"
-c3 = "{color3}"
-c4 = "{color4}"
-c5 = "{color5}"
-c6 = "{color6}"
-c7 = "{color7}"
-c8 = "{color8}"
-c9 = "{color9}"
-c10 = "{color10}"
-c11 = "{color11}"
-c12 = "{color12}"
-c13 = "{color13}"
-c14 = "{color14}"
-c15 = "{color15}"
-  '';
-}

home-manager/services/custom/default.nix

@@ -1 +0,0 @@
-{}: {}

home-manager/services/default.nix

@@ -1,6 +0,0 @@
-{ ... }: {
-    imports = [
-        ./mpd
-        ./wayvnc
-    ];
-}

home-manager/services/mpd/default.nix

@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeconfig.mpd.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.homeconfig.mpd.enable {
-        services.mpd = {
-            enable = true;
-            network.startWhenNeeded = true;
-            network.port = 6600;
-            network.listenAddress = "127.0.0.1";
-            musicDirectory = "/home/nathan/Music";
-            extraConfig = ''
-                audio_output {
-                    type "pipewire"
-                    name "Audio1"
-                }
-                audio_output {
-                    type "fifo"
-                    name "visualizer"
-                    path "/tmp/mpd.fifo"
-                    format "44100:16:1"
-                }
-            '';
-        };
-
-        services.mpdris2 = { 
-            enable = true;
-            mpd.host = "127.0.0.1";
-            mpd.port = 6600;
-            package = pkgs.mpdris2;
-            mpd.musicDirectory = "/home/nathan/Music";
-            notifications = true;
-        };
-    };
-
-}

home-manager/services/wayvnc/default.nix

@@ -1,36 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wayvnc.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    disabledModules = [
-    ];
-
-    imports = [
-        (import "${inputs.home-manager-us}/modules/services/wayvnc.nix" { 
-            inherit config; 
-            inherit lib; 
-            pkgs = (import inputs.nixpkgs-us { system = "x86_64-linux"; });
-        })
-    ];
-
-    config = lib.mkIf config.homeconfig.wayvnc.enable {
-        home.packages = with pkgs; [
-            novnc
-        ];
-
-        services.wayvnc = {
-            enable = true;
-
-            autoStart = true;
-
-            settings = {
-                address = "0.0.0.0";
-
-                port = 5900;
-            };
-        };
-    };
-}

home-manager/users/nathan/default.nix

@@ -1,67 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-#        ./programs
-#        ./services
-        ./packages
-        ./dotfiles
-	];
-
-    config = {
-
-        homeconfig = {
-            mpd.enable = lib.mkDefault true;
-            calcurse.enable = lib.mkDefault true;
-            git.enable = lib.mkDefault true;
-            nh.enable = lib.mkDefault true;
-        };
-
-        home.stateVersion = "23.11";
-
-        home.pointerCursor = lib.mkIf config.homeconfig.graphical {
-            gtk.enable = true;
-            package = pkgs.bibata-cursors;
-            name = "Bibata-Modern-Classic";
-            size = 16;
-        };
-
-        gtk = lib.mkIf config.homeconfig.graphical {
-            enable = true;
-            theme.name = "Tokyonight-Dark";
-            theme.package = pkgs.tokyonight-gtk-theme;
-            iconTheme.package = pkgs.rose-pine-icon-theme;
-            iconTheme.name = "rose-pine-moon";
-        };
-
-        sops = {
-            age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
-            defaultSopsFile = ./secrets.yaml;
-            defaultSopsFormat = "yaml";
-        };
-/*
-        nix = {
-            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-            settings = {
-                experimental-features = [ "nix-command" "flakes" ];
-                builders = ''
-                    ssh://remote-builder@blunkall.us
-                '';
-                builders-use-substituters = true;
-            };
-        };
-
-        programs.ssh.matchBlocks = {
-            "builder" = {
-                hostname = "blunkall.us";
-                user = "remote-builder";
-                identityFile = config.sops.secrets."".path;
-                port = 2222;
-            };
-        };
-*/
-        services.mpris-proxy.enable = true;
-
-        programs.ssh.enable = true;
-
-    };
-}

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

@@ -1,12 +0,0 @@
-{ config, lib, ... }: {
-
-	home.file = {
-		".config/ags" = { source = ./ags; recursive = true; };
-		".config/hypr" = { source = ./hypr; recursive = true; };
-		".config/swaylock" = { source = ./swaylock; recursive = true; };
-		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
-		".config/ohmyposh" = { source = ./ohmyposh; recursive = true; };
-		"Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; };
-	};
-
-}

home-manager/users/nathan/dotfiles/hypr/otf.conf

@@ -1 +0,0 @@
-

home-manager/users/nathan/dotfiles/hypr/pyprland.toml

@@ -1,22 +0,0 @@
-    [pyprland]
-	plugins = [
-          "scratchpads"
-	]
-
-	[scratchpads.nvim]
-	animation = "fromTop"
-	command = "kitty --class scratchpad-nvim -e nvim ~/Projects"
-	lazy = false
-	class = "scratchpad-nvim"
-	margin = 100
-	multi = true
-	excludes = "*"
-
-	[scratchpads.free]
-	animation = "fromBottom"
-	command = "kitty --class scratchpad -e tmux"
-	class = "scratchpad"
-	lazy = false
-	margin = 100
-	multi = true
-	excludes = "*"

home-manager/users/nathan/dotfiles/wal/templates/colors-hypr.conf

@@ -1,18 +0,0 @@
-$foregroundCol = 0xff{foreground.strip}
-$backgroundCol = 0xff{background.strip}
-$color0 = 0xff{color0.strip}
-$color1 = 0xff{color1.strip}
-$color2 = 0xff{color2.strip}
-$color3 = 0xff{color3.strip}
-$color4 = 0xff{color4.strip}
-$color5 = 0xff{color5.strip}
-$color6 = 0xff{color6.strip}
-$color7 = 0xff{color7.strip}
-$color8 = 0xff{color8.strip}
-$color9 = 0xff{color9.strip}
-$color10 = 0xff{color10.strip}
-$color11 = 0xff{color11.strip}
-$color12 = 0xff{color12.strip}
-$color13 = 0xff{color13.strip}
-$color14 = 0xff{color14.strip}
-$color15 = 0xff{color15.strip}

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

@@ -1,99 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: let 
-    system = "x86_64-linux";
-
-    pkgs-us = import inputs.nixpkgs-us {
-      inherit system;
-    };
-
-    in {
-
-    imports = [ 
-	  ./scripts
-	];
-
-    options.homeconfig.minimal = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = {
-
-        nixpkgs.config = lib.mkIf (!config.homeconfig.minimal) {
-            allowUnfree = true;
-        };
-
-        home.packages = with pkgs; ([
-            killall
-            btop
-            zip    
-            unzip
-            rsync
-            curl
-            wget
-        ] ++ (if config.homeconfig.graphical then [
-            grim
-            slurp
-            xfce.thunar
-            wl-clipboard
-            blueberry
-            lxqt.lxqt-policykit
-        ] else []) ++ (if !config.homeconfig.minimal then [
-            cava 
-            android-tools
-            neovim-remote
-            gcc
-            zulu
-
-            (python312.withPackages (ps: with ps; [
-                gpustat
-                numpy
-                matplotlib
-                scipy
-                pandas
-                pyaudio
-                pyusb
-                debugpy
-                requests
-            ]))
-
-            fastfetch
-            ncmpcpp
-            playerctl
-            mpc-cli
-            ffmpeg
-
-        ] else []) ++ (if !config.homeconfig.minimal && config.homeconfig.graphical then [
-            handbrake
-            quickemu
-            bottles
-            
-            brightnessctl
-            libdbusmenu-gtk3
-            lmms
-
-#unfree {
-            geogebra
-            spotify
-            discord
-#}
-            pkgs-us.rustdesk-flutter
-            pkgs-us.mpv
-            vlc
-            pavucontrol
-            rpi-imager
-            tigervnc
-            keepassxc
-
-#3D modeling/printing
-            blender
-            freecad-wayland
-            cura-appimage
-
-#productivity
-            libreoffice
-
-#games
-            prismlauncher
-        ] else []));
-    };
-}

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

@@ -1,94 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeScripts.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = true;
-        };
-    };
-
-    config = lib.mkIf config.homeScripts.enable {
-        home.packages = [
-
-            #scripts
-	        (pkgs.writeShellScriptBin "_systemRebuild" ''
-	            ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/Olympus
-	            echo //////Enter to close//////
-	            read
-	        '')
-	        
-
-	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper /home/nathan/Pictures/Wallpaper/$file
-	        '')
-
-	        (pkgs.writeShellScriptBin "setWallpaper" ''
-	            img=''$(realpath ''${1:-~/.cache/bg})
-                ${pkgs.swww}/bin/swww img ''$img
-                changeColors ''$img ''$2
-	        '')
-
-	        (pkgs.writeShellScriptBin "changeColors" ''
-
-	            if [[ $(ls ~/.cache/ | grep bga) != bga ]]; then
-	            echo 100 > ~/.cache/bga
-	            fi
-
-	            alpha=''${2:-`cat ~/.cache/bga`}
-
-	            img=''$(realpath ''${1:-~/.cache/bg})
-	    
-	            if [[ $alpha -lt 0 ]]; then
-	            $alpha=0
-	            fi
-	    
-	            if [[ $alpha -gt 100 ]]; then
-	            $alpha=100
-	            fi
-            
-	            wal -i $img -a $alpha --cols16 -n
-	    
-	            echo $alpha > ~/.cache/bga
-	    
-	            rm ~/.cache/bg
-	            ln -s $img ~/.cache/bg
-            
-	            sleep 0.4
-            
-	            pywalfox update &
-            
-	            [[ $(pidof cava) != "" ]] && pkill -USR1 cava &
-	    
-	            for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send '<cmd>colorscheme pywal<CR>'; done
-	    
-	            pkill -USR1 kitty
-	        '')
-
-	        (pkgs.writeShellScriptBin "onSystemStart" ''
-                ${pkgs.hyprpanel}/bin/hyprpanel &
-		        randWallpaper &
-	            pypr &
-	            lxqt-policykit-agent &
-                hyprctl setcursor Bibata-Modern-Classic 16 &
-                sleep 3
-		        hyprctl reload &
-                #tmux new-session -s hyprland 
-	        '')
-
-	        (pkgs.writeShellScriptBin "colorPrefix" ''
-                exec -a "$0" "$@" &
-	            sleep 0.4 && changeColors &
-	        '')
-
-        ] ++ (if config.homeconfig.standalone.enable then [
-
-            (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus
-	            echo //////Enter to close//////
-	            read
-	        '')
-        ] else []);
-    };
-}
-

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

@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.calcurse.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.calcurse.enable {
-        home.packages = with pkgs; [
-            calcurse
-            libnotify
-        ];
-    };
-}

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

@@ -1,24 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./ags
-        ./git
-        ./nh
-        ./hyprland
-	    ./terminal
-        ./rofi
-        ./pywal
-        ./swaylock
-        ./calcurse
-        ./firefox
-    ];
-
-    config = {
-
-        home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
-            inputs.nixvim.packages.${pkgs.system}.default
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}

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

@@ -1,59 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.firefox.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.firefox.enable {
-
-        home.sessionVariables.BROWSER = "${config.programs.firefox.package}/bin/firefox";
-
-        home.packages = lib.mkIf config.homeconfig.wal.enable [ 
-            pkgs.pywalfox-native
-        ];
-
-        home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = let
-            pywalfox-wrapper = pkgs.writeShellScriptBin "pywalfox-wrapper" ''
-                ${pkgs.pywalfox-native}/bin/pywalfox start
-            '';
-        in lib.replaceStrings [ "<path>" ] [
-            "${pywalfox-wrapper}/bin/pywalfox-wrapper"
-        ] (lib.readFile "${pkgs.pywalfox-native}/lib/python3.12/site-packages/pywalfox/assets/manifest.json");
-
-
-        programs.firefox = {
-
-            enable = true;
-            package = pkgs.firefox;
-
-            profiles.nathan = {
-                search = {
-                    default = "ddg";
-                    privateDefault = "ddg";
-                };
-                bookmarks = {
-                    force = true;
-                    settings = [
-                        {
-                            name = "toolbar";
-                            toolbar = true;
-                            bookmarks = [
-                                {
-                                    name = "NixOS Search - Packages";
-                                    url = "https://search.nixos.org/packages";
-                                }
-                            ];
-                        }
-                    ];
-                };
-
-                extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
-                    ublock-origin
-                    keepassxc-browser
-                    pywalfox
-                ];
-            };
-        };
-    };
-}

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

@@ -1,44 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.git.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.git.enable {
-
-        sops = {
-            secrets = {
-                "git/username" = {};
-                "git/email" = {};
-            };
-
-            templates.gitconfig.content = ''
-                [user]
-                    name = "${config.sops.placeholder."git/username"}"
-                    email = "${config.sops.placeholder."git/email"}"
-            '';
-        };
-        
-        programs.git = {
-            enable = true;
-
-            includes = [
-                { path = "${config.sops.templates.gitconfig.path}"; }
-            ];
-            
-            extraConfig = {
-                init = {
-                    defaultBranch = "master";
-                };
-                url = {
-                    "ssh://gitea@gitea.blunkall.us/" = {
-                        insteadOf = [
-                            "blunkall:"
-                        ];
-                    };
-                };
-            };
-        };
-    };
-}

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

@@ -1,43 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.hyprland.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprland.enable {
-
-        home.sessionVariables.NIX_OZONE_WL = "1";
-
-        programs.kitty.enable = lib.mkDefault true;
-
-        home.packages = with pkgs; [
-            pyprland
-        ];
-
-        wayland.windowManager.hyprland = {
-
-            enable = true;
-
-            systemd = {
-                enable = true;
-                variables = [ "--all" ];
-            };
-
-            extraConfig = let 
-                monitor = if config.homeconfig.host == "laptop" then ''
-                    monitor=eDP-1,1920x1080@60,0x0,1
-                '' else if config.homeconfig.host == "homebox" then ''
-                    monitor=HDMI-A-2,1920x1080@60,0x0,1
-                    monitor=HEADLESS-2,1920x1080@60,0x0,1
-                    exec-once=hyprctl output create headless HEADLESS-2
-                    exec-once=hyprctl keyword monitor HDMI-A-2,disable
-                    exec-once=${pkgs.wayvnc}/bin/wayvnc 0.0.0.0 -o HEADLESS-2
-                '' else '''';
-            in monitor + ''
-                source = /home/nathan/.config/hypr/main.conf
-            '';
-
-        };
-    };
-}

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

@@ -1,21 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.nh.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.nh.enable {
-        
-        programs.nh = {
-            enable = true;
-            flake = "${config.home.homeDirectory}/Projects/Olympus";
-
-            clean = {
-                enable = true;
-                dates = "weekly";
-                extraArgs = "--keep 5 --keep-since 5d";
-            };
-        };
-    };
-}

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

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wal.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.wal.enable {
-
-        home.packages = with pkgs; [
-            
-            inputs.nixvim.packages.${pkgs.system}.pywal
-
-            pywal16
-		    imagemagick
-        ];
-
-        
-    };
-}

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

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }: {
-    
-    options.homeconfig.rofi.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.rofi.enable {
-        programs.rofi = {
-
-            enable = true;
-            package = pkgs.rofi-wayland;
-
-            cycle = true;
-
-            theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
-        };
-    };
-}
-

home-manager/users/nathan/programs/swaylock/default.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.swaylock.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.swaylock.enable {
-
-        home.packages = with pkgs; [ swaylock-effects ];
-    };
-}

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

@@ -1,28 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    home.packages = with pkgs; [ oh-my-posh ];
-
-    programs.bash = {
-        enable = true;
-        enableCompletion = true;
-        blesh.enable = true;
-
-        shellAliases = {
-            ls = "eza";
-            ll = "ls -l";
-
-            ksh = "kitten ssh";
-
-            vi = "nvim";
-            vim = "nvim";
-
-        };
-
-        initContent = if config.homeconfig.wal.enable then (lib.mkBefore ''
-            cat ${config.home.homeDirectory}/.cache/wal/sequences
-            eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
-        '') else (lib.mkBefore ''
-            eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
-        '');
-    };
-}

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

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.bat = {
-
-    enable = true;
-
-    extraPackages = with pkgs.bat-extras; [
-      batman
-      batpipe
-      batgrep
-      batdiff
-      batwatch
-      prettybat
-    ];
-
-
-  };
-}

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

@@ -1,12 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./eza
-    ./fzf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-  ];
-}

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

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.eza = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    extraOptions = [
-      "--color=auto"
-    ];
-
-    git = true;
-
-    icons = "auto";
-  };
-}

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

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.fzf = {
-  
-    enable = true;
-
-    enableZshIntegration = true;
-
-    tmux = {
-      #enableShellIntegration = true;
-
-      #shellIntegrationOptions = [];
-    };
-  };
-}

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

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-      
-  programs.kitty = {
-    
-    enable = true;
-
-    font = {
-      name = "FiraCode Nerd Font";
-      size = 12;
-    };
-
-    extraConfig = ''
-
-confirm_os_window_close 0
-
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
-
-disable_ligatures never
-
-dynamic_background_opacity yes
-
-tab_bar_edge top
-
-map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
-
-map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
-
-    '';
-  };
-}
-

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

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.tmux = {
-    
-    enable = true;
-    
-    clock24 = true;
-    
-    mouse = true;
-    
-    baseIndex = 1;
-    
-    keyMode = "vi";
-    
-    prefix = "C-b";
-    
-    shell = "${pkgs.zsh}/bin/zsh";
-  
-  };
-
-}
-
-

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

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zoxide = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    options = [
-      "--cmd cd"
-    ];
-  };
-}

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

@@ -1,158 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    oh-my-posh
-  ];
-  
-  programs.zsh = {
-    
-    enable = true;
-    
-    enableCompletion = true;
-    
-    autosuggestion.enable = true;
-    
-    syntaxHighlighting.enable = true;
-    
-    shellAliases = {
-      ls = "eza";
-      ll = "ls -l";
-
-      ksh = "kitten ssh";
-
-      vi = "nvim";
-      vim = "nvim";
-
-    };
-
-    history = {
-      size = 5000;
-      ignoreAllDups = true;
-      ignoreSpace = true;
-      share = true;
-    };
-
-    initContent = if config.homeconfig.wal.enable then (lib.mkBefore ''
-      cat ${config.home.homeDirectory}/.cache/wal/sequences
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
-    '') else (lib.mkBefore ''
-      eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
-    '');
-
-  };
-
-  home.file.".config/wal/templates/ohmyposh.toml".text = ''
-#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
-
-version = 2
-final_space = true
-console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
-
-[[blocks]]
-  type = 'prompt'
-  alignment = 'left'
-  newline = true
-
-  [[blocks.segments]]
-    type = 'os'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c1'
-    foreground = 'p:c12'
-    template = ' {{{{ .Icon }}}} '
-
-  [[blocks.segments]]
-    type = 'session'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c2'
-    foreground = 'p:c14'
-    template = '{{{{ .UserName }}}}@{{{{ .HostName }}}}'
-
-  [[blocks.segments]]
-    type = 'path'
-    style = 'diamond'
-    trailing_diamond = ''
-    background = 'p:c4'
-    foreground = 'p:c13'
-    template = '{{{{ .Path }}}}'
-
-    [blocks.segments.properties]
-      style = 'full'
-
-[[blocks]]
-  type = 'prompt'
-  overflow = 'hidden'
-  alignment = 'right'
-
-  [[blocks.segments]]
-    type = 'executiontime'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c4'
-    foreground = 'p:c13'
-    template = '{{{{ .FormattedMs }}}}'
-
-  [[blocks.segments]]
-    type = 'time'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c2'
-    foreground = 'p:c14'
-
-  [[blocks.segments]]
-    type = 'shell'
-    style = 'diamond'
-    leading_diamond = ''
-    background = 'p:c1'
-    foreground = 'p:c12'
-
-[[blocks]]
-  type = 'prompt'
-  alignment = 'left'
-  newline = true
-
-  [[blocks.segments]]
-    type = 'text'
-    style = 'plain'
-    background = 'transparent'
-    foreground_templates = [
-      "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
-      "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
-    ]
-    template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
-
-[transient_prompt] 
-  foreground_templates = [
-    "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
-    "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
-  ]
-  background = 'transparent'
-  template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
-
-[secondary_prompt]
-  background = 'transparent'
-  forground = 'p:c14'
-  template = "❭❭ "
-
-
-[palette]
-
-c0 = "{color0}"
-c1 = "{color1}"
-c2 = "{color2}"
-c3 = "{color3}"
-c4 = "{color4}"
-c5 = "{color5}"
-c6 = "{color6}"
-c7 = "{color7}"
-c8 = "{color8}"
-c9 = "{color9}"
-c10 = "{color10}"
-c11 = "{color11}"
-c12 = "{color12}"
-c13 = "{color13}"
-c14 = "{color14}"
-c15 = "{color15}"
-  '';
-}

home-manager/users/nathan/secrets.yaml

@@ -1,27 +0,0 @@
-git:
-    username: ENC[AES256_GCM,data:418z4cCK,iv:tgPmynsW8fEJs6n+OGfm6IypOjNNhVdVaqFImeKXpC4=,tag:V5zI47vb9FnSO/OWurbJ+A==,type:str]
-    email: ENC[AES256_GCM,data:xp6HlIO1pTgvrXpGAOQwl0UvcnY4zrLrmw==,iv:LzGkluWeSe8MQqPXQMnNOv062UY+BkQE1fGjGqd/nCg=,tag:Y9nwo+Hjcg4ea2GxGKWApA==,type:str]
-sops:
-    age:
-        - recipient: age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3dER2bmZjYUhlNHpvVVNY
-            dlFYdU1KVzQ0WGhtUlRyRUtMdldqdC9nNm1JCjdJU3pqQ2x2NE52Qm15MUw4d2lv
-            MjM4V3lBQ1o5MWl2MDRrTlJLWFFHRjAKLS0tIHhpUld3NXh4RzdKajJWMzM2a3gy
-            VU4xSytSZHgzd3pocUdOZmFTTVg4OXMKPkk9mbu6POQNwy+6jAhgv3t/DAN1n+Jo
-            xK0s1Ni1FKPU4mvQUsIN2v6y3Nircfr15CfzThjpIBoLtBOyoRhXrw==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByM3lvcDM4Z0VJMGVBK1lU
-            Y0g1bTE2U3ZiN0E3NUJ0QVlQSUdlSDh6NjNNCmRVZjQ4VWJSM3g4S2Q1TnRWbjZG
-            TVVKUkJTWS9nUGN0Uy9LQ1V0YlpLeWsKLS0tIHRCWkxFTUhNQ21wYVBUL0k4d25h
-            RWNTdys0VnV1V0ZHL3R1N0NvdGFOTjAKQtM4wMzD9Lr9G9o1sp0Ud7LsxnTXzyV9
-            yQ5fxn5lmef7SAPAYVvkU7IH1uhtVyfH9SwsM+EnHdcQWO/lNQp+hg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-08-16T16:08:48Z"
-    mac: ENC[AES256_GCM,data:3/ztJNXhOIPqgQ47QxjM5KTeAJwXPpUuVtvI5/xJsMOOZhXYRt+uhL584F98rJiMHhnbsuGIZi+jGlYRiE6c+GJ9X7TKLj9yRqKvCMSCdWHGzY721GH5kMPcjD2YDYZ4tt+olIMePNJBPjC1XJgfhfOvs43o2HyDTCS95cEQzB4=,iv:qofZBAwxbTrc/hPyuSi8nxibJ0bGhoytZpUTZwwzbuI=,tag:z1SJXutJmlJ+j6RnV4u29Q==,type:str]
-    unencrypted_suffix: _unencrypted
-    version: 3.10.2

home-manager/users/nathan/services/custom/default.nix

@@ -1 +0,0 @@
-{}: {}

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

@@ -1,6 +0,0 @@
-{ ... }: {
-    imports = [
-        ./mpd
-        ./wayvnc
-    ];
-}

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

@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeconfig.mpd.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.homeconfig.mpd.enable {
-        services.mpd = {
-            enable = true;
-            network.startWhenNeeded = true;
-            network.port = 6600;
-            network.listenAddress = "127.0.0.1";
-            musicDirectory = "/home/nathan/Music";
-            extraConfig = ''
-                audio_output {
-                    type "pipewire"
-                    name "Audio1"
-                }
-                audio_output {
-                    type "fifo"
-                    name "visualizer"
-                    path "/tmp/mpd.fifo"
-                    format "44100:16:1"
-                }
-            '';
-        };
-
-        services.mpdris2 = { 
-            enable = true;
-            mpd.host = "127.0.0.1";
-            mpd.port = 6600;
-            package = pkgs.mpdris2;
-            mpd.musicDirectory = "/home/nathan/Music";
-            notifications = true;
-        };
-    };
-
-}

home-manager/users/nathan/services/wayvnc/default.nix

@@ -1,36 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wayvnc.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    disabledModules = [
-    ];
-
-    imports = [
-        (import "${inputs.home-manager-us}/modules/services/wayvnc.nix" { 
-            inherit config; 
-            inherit lib; 
-            pkgs = (import inputs.nixpkgs-us { system = "x86_64-linux"; });
-        })
-    ];
-
-    config = lib.mkIf config.homeconfig.wayvnc.enable {
-        home.packages = with pkgs; [
-            novnc
-        ];
-
-        services.wayvnc = {
-            enable = true;
-
-            autoStart = true;
-
-            settings = {
-                address = "0.0.0.0";
-
-                port = 5900;
-            };
-        };
-    };
-}

home-manager/users/nix-on-droid/default.nix

@@ -1,47 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-        ./programs
-        ./services
-        ./packages
-        ./dotfiles
-	];
-
-    options.homeconfig = {
-        host = lib.options.mkOption {
-            type = lib.types.str;
-            default = null;
-        };
-        
-        home-manager.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = {
-
-        home.stateVersion = "24.11";
-
-        home.username = "nix-on-droid";
-
-        home.homeDirectory = "/data/data/com.termux.nix/files/home";
-
-        nix = {
-            package = pkgs.nix;
-
-            nixPath = [
-                "nixpkgs=${inputs.nixpkgs}"
-            ];
-
-            settings = {
-                experimental-features = [ "nix-command" "flakes" ];
-            };
-        };
-
-        programs.ssh.enable = true;
-
-        programs.home-manager.enable = config.homeconfig.home-manager.enable;
-
-    };
-}

home-manager/users/nix-on-droid/dotfiles/default.nix

@@ -1,8 +0,0 @@
-{ config, lib, ... }: {
-
-	home.file = {
-		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
-		"Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; };
-	};
-
-}

home-manager/users/nix-on-droid/dotfiles/wal/templates/cava_config

@@ -1,279 +0,0 @@
-## Configuration file for CAVA.
-# Remove the ; to change parameters.
-
-
-[general]
-
-# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0
-; mode = normal
-
-# Accepts only non-negative values.
-; framerate = 60
-
-# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
-# new as of 0.6.0 autosens of low values (dynamic range)
-# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0
-; autosens = 1
-; overshoot = 20
-
-# Manual sensitivity in %. If autosens is enabled, this will only be the initial value.
-# 200 means double height. Accepts only non-negative values.
-; sensitivity = 100
-
-# The number of bars (0-512). 0 sets it to auto (fill up console).
-# Bars' width and space between bars in number of characters.
-; bars = 0
-; bar_width = 2
-; bar_spacing = 1
-# bar_height is only used for output in "noritake" format
-; bar_height = 32
-
-# For SDL width and space between bars is in pixels, defaults are:
-; bar_width = 20
-; bar_spacing = 5
-
-# sdl_glsl have these default values, they are only used to calulate max number of bars.
-; bar_width = 1
-; bar_spacing = 0
-
-
-# Lower and higher cutoff frequencies for lowest and highest bars
-# the bandwidth of the visualizer.
-# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
-# Cava will automatically increase the higher cutoff if a too low band is specified.
-; lower_cutoff_freq = 50
-; higher_cutoff_freq = 10000
-
-
-# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and
-# only check for input once per second. Cava will wake up once input is detected. 0 = disable.
-; sleep_timer = 0
-
-
-[input]
-
-# Audio capturing method. Possible methods are: 'fifo', 'portaudio', 'pipewire', 'alsa', 'pulse', 'sndio', 'oss', 'jack' or 'shmem'
-# Defaults to 'oss', 'pipewire', 'sndio', 'jack', 'pulse', 'alsa', 'portaudio' or 'fifo', in that order, dependent on what support cava was built with.
-# On Mac it defaults to 'portaudio' or 'fifo'
-# On windows this is automatic and no input settings are needed.
-#
-# All input methods uses the same config variable 'source'
-# to define where it should get the audio.
-#
-# For pulseaudio and pipewire 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
-# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
-#
-# For pipewire 'source' will be the object name or object.serial of the device to capture from.
-# Both input and output devices are supported.
-#
-# For alsa 'source' will be the capture device.
-# For fifo 'source' will be the path to fifo-file.
-# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address
-#
-# For sndio 'source' will be a raw recording audio descriptor or a monitoring sub-device, e.g. 'rsnd/2' or 'snd/1'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for sndio.
-#
-# For oss 'source' will be the path to a audio device, e.g. '/dev/dsp2'. Default: '/dev/dsp', i.e. the default audio device.
-# README.md contains further information on how to setup CAVA for OSS on FreeBSD.
-#
-# For jack 'source' will be the name of the JACK server to connect to, e.g. 'foobar'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for JACK.
-#
-; method = pulse
-; source = auto
-
-; method = pipewire
-; source = auto
-
-; method = alsa
-; source = hw:Loopback,1
-
-; method = fifo
-; source = /tmp/mpd.fifo
-
-; method = shmem
-; source = /squeezelite-AA:BB:CC:DD:EE:FF
-
-; method = portaudio
-; source = auto
-
-; method = sndio
-; source = default
-
-; method = oss
-; source = /dev/dsp
-
-; method = jack
-; source = default
-
-# The options 'sample_rate', 'sample_bits', 'channels' and 'autoconnect' can be configured for some input methods:
-#   sample_rate: fifo, pipewire, sndio, oss
-#   sample_bits: fifo, pipewire, sndio, oss
-#   channels:    sndio, oss, jack
-#   autoconnect: jack
-# Other methods ignore these settings.
-#
-# For 'sndio' and 'oss' they are only preferred values, i.e. if the values are not supported
-# by the chosen audio device, the device will use other supported values instead.
-# Example: 48000, 32 and 2, but the device only supports 44100, 16 and 1, then it
-# will use 44100, 16 and 1.
-#
-; sample_rate = 44100
-; sample_bits = 16
-; channels = 2
-; autoconnect = 2
-
-
-[output]
-
-# Output method. Can be 'ncurses', 'noncurses', 'raw', 'noritake', 'sdl'
-# or 'sdl_glsl'.
-# 'noncurses' (default) uses a buffer and cursor movements to only print
-# changes from frame to frame in the terminal. Uses less resources and is less
-# prone to tearing (vsync issues) than 'ncurses'.
-#
-# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data
-# stream of the bar heights that can be used to send to other applications.
-# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
-#
-# 'noritake' outputs a bitmap in the format expected by a Noritake VFD display
-#  in graphic mode. It only support the 3000 series graphical VFDs for now.
-#
-# 'sdl' uses the Simple DirectMedia Layer to render in a graphical context.
-# 'sdl_glsl' uses SDL to create an OpenGL context. Write your own shaders or
-# use one of the predefined ones.
-; method = noncurses
-
-# Orientation of the visualization. Can be 'bottom', 'top', 'left' or 'right'.
-# Default is 'bottom'. Other orientations are only supported on sdl and ncruses
-# output. Note: many fonts have weird glyphs for 'top' and 'right' characters,
-# which can make ncurses not look right.
-; orientation = bottom
-
-# Visual channels. Can be 'stereo' or 'mono'.
-# 'stereo' mirrors both channels with low frequencies in center.
-# 'mono' outputs left to right lowest to highest frequencies.
-# 'mono_option' set mono to either take input from 'left', 'right' or 'average'.
-# set 'reverse' to 1 to display frequencies the other way around.
-; channels = stereo
-; mono_option = average
-; reverse = 0
-
-# Raw output target. A fifo will be created if target does not exist.
-; raw_target = /dev/stdout
-
-# Raw data format. Can be 'binary' or 'ascii'.
-; data_format = binary
-
-# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
-; bit_format = 16bit
-
-# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
-; ascii_max_range = 1000
-
-# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
-# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
-; bar_delimiter = 59
-; frame_delimiter = 10
-
-# sdl window size and position. -1,-1 is centered.
-; sdl_width = 1000
-; sdl_height = 500
-; sdl_x = -1
-; sdl_y= -1
-; sdl_full_screen = 0
-
-# set label on bars on the x-axis. Can be 'frequency' or 'none'. Default: 'none'
-# 'frequency' displays the lower cut off frequency of the bar above.
-# Only supported on ncurses and noncurses output.
-; xaxis = none
-
-# enable alacritty synchronized updates. 1 = on, 0 = off
-# removes flickering in alacritty terminal emulator.
-# defaults to off since the behaviour in other terminal emulators is unknown
-; alacritty_sync = 0
-
-# Shaders for sdl_glsl, located in $HOME/.config/cava/shaders
-; vertex_shader = pass_through.vert
-; fragment_shader = bar_spectrum.frag
-
-; for glsl output mode, keep rendering even if no audio
-; continuous_rendering = 0
-
-# disable console blank (screen saver) in tty
-# (Not supported on FreeBSD)
-; disable_blanking = 0
-
-# show a flat bar at the bottom of the screen when idle, 1 = on, 0 = off
-; show_idle_bar_heads = 1
-
-# show waveform instead of frequency spectrum, 1 = on, 0 = off
-; waveform = 0
-
-[color]
-
-# Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow.
-# Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires
-# a terminal that can change color definitions such as Gnome-terminal or rxvt.
-# default is to keep current terminal color
-; background = default
-; foreground = default
-
-# SDL and sdl_glsl only support hex code colors, these are the default:
-; background = '#111111'
-; foreground = '#33ffff'
-
-
-# Gradient mode, only hex defined colors are supported,
-# background must also be defined in hex or remain commented out. 1 = on, 0 = off.
-# You can define as many as 8 different colors. They range from bottom to top of screen
- gradient = 1
- gradient_count = 8
- gradient_color_1 = '{color1}'
- gradient_color_2 = '{color2}'
- gradient_color_3 = '{color3}'
- gradient_color_4 = '{color4}'
- gradient_color_5 = '{color5}'
- gradient_color_6 = '{color6}'
- gradient_color_7 = '{color7}'
- gradient_color_8 = '{color8}'
-
-
-
-[smoothing]
-
-# Percentage value for integral smoothing. Takes values from 0 - 100.
-# Higher values means smoother, but less precise. 0 to disable.
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; integral = 77
-
-# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable.
-; monstercat = 0
-; waves = 0
-
-# Set gravity percentage for "drop off". Higher values means bars will drop faster.
-# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off".
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; gravity = 100
-
-
-# In bar height, bars that would have been lower that this will not be drawn.
-# DEPRECATED as of 0.8.0
-; ignore = 0
-
-# Noise reduction, int 0 - 100. default 77
-# the raw visualization is very noisy, this factor adjusts the integral and gravity filters to keep the signal smooth
-# 100 will be very slow and smooth, 0 will be fast but noisy.
-; noise_reduction = 77
-
-
-[eq]
-
-# This one is tricky. You can have as much keys as you want.
-# Remember to uncomment more than one key! More keys = more precision.
-# Look at readme.md on github for further explanations and examples.
-; 1 = 1 # bass
-; 2 = 1
-; 3 = 1 # midtone
-; 4 = 1
-; 5 = 1 # treble

home-manager/users/nix-on-droid/packages/default.nix

@@ -1,68 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: let 
-    system = "x86_64-linux";
-
-    pkgs-us = import inputs.nixpkgs-us {
-      inherit system;
-      config.allowUnfree = true;
-    };
-
-    in {
-
-    imports = [ 
-	  ./scripts
-	];
-
-    options.homeconfig.minimal = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkMerge [
-
-        {
-            home.packages = with pkgs; [
-                killall
-                zip    
-                unzip
-                gcc
-                zulu
-                rsync
-                git
-                openssh
-            ];
-        }
-        
-        (lib.mkIf (!config.homeconfig.minimal) {
-
-            nixpkgs.config = {
-                allowUnfree = true;
-            };
-
-            home.packages = with pkgs; let
-                pypkgs = ps: with ps; [
-                    numpy
-                    pandas
-                    torch
-                    torchvision
-                    torchaudio
-                    transformers
-                    datasets
-                    pyaudio
-                    faster-whisper
-                    pyusb
-                ];
-
-            in [
-
-                cava 
-                neovim-remote
-
-                (pkgs.python311.withPackages pypkgs)
-
-                neofetch
-            ];
-
-        })
-    ];
-
-}

home-manager/users/nix-on-droid/packages/scripts/default.nix

@@ -1,97 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options = {
-        homeScripts.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = true;
-        };
-    };
-
-    config = lib.mkIf config.homeScripts.enable {
-        home.packages = [
-
-            #scripts
-	        (pkgs.writeShellScriptBin "_systemRebuild" ''
-	            ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/System
-	            echo //////Enter to close//////
-	            read
-	        '')
-	        (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/System
-	            echo //////Enter to close//////
-	            read
-	        '')
-
-	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper /home/nathan/Pictures/Wallpaper/$file
-	        '')
-
-	        (pkgs.writeShellScriptBin "setWallpaper" ''
-	            img=''$(realpath ''${1:-~/.cache/bg})
-                p=''$(ps -e | grep mpvpaper | sed -n -e "s/ *//" -e "s/ /\n/" -e "1 P")
-                ${pkgs.mpvpaper}/bin/mpvpaper -f -o "loop" '*' $img && \
-                changeColors $img $2 && \
-                sleep 0.4 && \
-                kill $p
-	        '')
-
-	        (pkgs.writeShellScriptBin "changeColors" ''
-
-	            if [[ $(ls ~/.cache/ | grep bga) != bga ]]; then
-	            echo 100 > ~/.cache/bga
-	            fi
-
-	            alpha=''${2:-`cat ~/.cache/bga`}
-
-	            img=''$(realpath ''${1:-~/.cache/bg})
-	    
-	            if [[ $alpha -lt 0 ]]; then
-	            $alpha=0
-	            fi
-	    
-	            if [[ $alpha -gt 100 ]]; then
-	            $alpha=100
-	            fi
-            
-	            wal -i $img -a $alpha --cols16 -n
-	    
-	            echo $alpha > ~/.cache/bga
-	    
-	            rm ~/.cache/bg
-	            ln -s $img ~/.cache/bg
-            
-	            sleep 0.4
-            
-	            pywalfox update &
-            
-	            themecord > ~/.cache/_.txt && rm ~/.cache/_.txt
-            
-	            [[ $(pidof cava) != "" ]] && pkill -USR1 cava &
-	    
-	            for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send '<cmd>colorscheme pywal<CR>'; done
-	    
-	            pkill -USR1 kitty
-	        '')
-
-	        (pkgs.writeShellScriptBin "onSystemStart" ''
-		        randWallpaper &
-                ags &
-	            pypr &
-	            lxqt-policykit-agent &
-	           # nmcli device wifi connect EagleNet password '~?C#@ZiH' &
-                hyprctl setcursor Bibata-Modern-Classic 16 &
-                wayvnc &
-		        hyprctl reload &
-                novnc &
-	        '')
-
-	        (pkgs.writeShellScriptBin "colorPrefix" ''
-                exec -a "$0" "$@" &
-	            sleep 0.4 && changeColors &
-	        '')
-
-        ];
-    };
-}
-

home-manager/users/nix-on-droid/programs/calcurse/default.nix

@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.calcurse.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.calcurse.enable {
-        home.packages = with pkgs; [
-            calcurse
-            libnotify
-        ];
-    };
-}

home-manager/users/nix-on-droid/programs/default.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = [
-	    ./terminal
-        ./pywal
-        ./calcurse
-    ];
-
-    config = {
-
-        home.packages = [
-            inputs.nixvim.packages.${pkgs.system}.default
-        ];
-
-        home.sessionVariables.EDITOR = "nvim";
-    };
-}

home-manager/users/nix-on-droid/programs/pywal/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    options.homeconfig.wal.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.wal.enable {
-
-        home.packages = with pkgs; [
-            pywal16
-		    imagemagick
-        ];
-    };
-}

home-manager/users/nix-on-droid/programs/terminal/bat/default.nix

@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.bat = {
-
-    enable = true;
-
-    extraPackages = with pkgs.bat-extras; [
-      batman
-      batpipe
-      batgrep
-      batdiff
-      batwatch
-      prettybat
-    ];
-
-
-  };
-}

home-manager/users/nix-on-droid/programs/terminal/default.nix

@@ -1,12 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./eza
-    ./fzf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-  ];
-}

home-manager/users/nix-on-droid/programs/terminal/eza/default.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.eza = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    extraOptions = [
-      "--color=auto"
-    ];
-
-    git = true;
-
-    icons = "auto";
-  };
-}

home-manager/users/nix-on-droid/programs/terminal/fzf/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.fzf = {
-  
-    enable = true;
-
-    enableZshIntegration = true;
-
-    tmux = {
-      #enableShellIntegration = true;
-
-      #shellIntegrationOptions = [];
-    };
-  };
-}

home-manager/users/nix-on-droid/programs/terminal/kitty/default.nix

@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: {
-      
-  programs.kitty = {
-    
-    enable = true;
-
-    font = {
-      name = "FiraCode Nerd Font";
-      size = 12;
-    };
-
-    extraConfig = ''
-
-confirm_os_window_close 0
-
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
-
-disable_ligatures never
-
-dynamic_background_opacity yes
-
-tab_bar_edge top
-
-map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
-
-map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
-
-    '';
-  };
-}
-

home-manager/users/nix-on-droid/programs/terminal/tmux/default.nix

@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.tmux = {
-    
-    enable = true;
-    
-    clock24 = true;
-    
-    mouse = true;
-    
-    baseIndex = 1;
-    
-    keyMode = "vi";
-    
-    prefix = "C-b";
-    
-    shell = "${pkgs.zsh}/bin/zsh";
-  
-  };
-
-}
-
-

home-manager/users/nix-on-droid/programs/terminal/zoxide/default.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-  programs.zoxide = {
-
-    enable = true;
-
-    enableZshIntegration = true;
-
-    options = [
-      "--cmd cd"
-    ];
-  };
-}

home-manager/users/nix-on-droid/services/custom/default.nix

@@ -1 +0,0 @@
-{}: {}

home-manager/users/nix-on-droid/services/default.nix

@@ -1,4 +0,0 @@
-{ ... }: {
-    imports = [
-    ];
-}

modules/features/aurora-greeter.nix

@@ -0,0 +1,16 @@
+{ inputs, ... }: {
+
+    flake.nixosModules.aurora-greeter = { config, lib, pkgs, ... }: {
+
+        imports = [
+            inputs.aurora.nixosModules.default
+        ];
+
+        config = {
+
+            services.aurora-greeter = {
+                enable = true;
+            };
+        };
+    };
+}

modules/features/authentik.nix

@@ -0,0 +1,236 @@
+{ ... }: {
+
+    flake.nixosModules.authentik = { config, lib, pkgs, ... }: let
+
+    hostPort = 9005;
+
+    subdomain = "auth";
+
+    name = "authentik";
+
+    in {
+
+        config = {
+
+            networking.firewall.interfaces = {
+                "ve-traefik" = {
+                    allowedTCPPorts = [ hostPort ];
+                };
+            };
+
+            sops.secrets = {
+                "authentik/pass" = {};
+                "authentik/secret_key" = {};
+            };
+
+            sops.templates."authentik.env" = {
+                content = ''
+                    PG_PASS=${config.sops.placeholder."authentik/pass"}
+                SECRET_KEY=${config.sops.placeholder."authentik/secret_key"}
+                '';
+            };
+
+            virtualisation.oci-containers.containers."authentik-postgresql" = {
+                image = "docker.io/library/postgres:16-alpine";
+                environment = {
+                    "POSTGRES_DB" = "authentik";
+                    "POSTGRES_PASSWORD" = "\${PG_PASS}";
+                    "POSTGRES_USER" = "authentik";
+                };
+                environmentFiles = [ config.sops.templates."authentik.env".path ];
+                volumes = [
+                    "authentik_database:/var/lib/postgresql/data:rw"
+                ];
+                log-driver = "journald";
+                extraOptions = [
+                    "--health-cmd=pg_isready -d \${POSTGRES_DB} -U \${POSTGRES_USER}"
+                        "--health-interval=30s"
+                        "--health-retries=5"
+                        "--health-start-period=20s"
+                        "--health-timeout=5s"
+                        "--network-alias=postgresql"
+                        "--network=authentik_default"
+                ];
+            };
+            systemd.services."docker-authentik-postgresql" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-authentik_default.service"
+                        "docker-volume-authentik_database.service" 
+                ];
+                requires = [
+                    "docker-network-authentik_default.service"
+                        "docker-volume-authentik_database.service" 
+                ];
+                partOf = [
+                    "docker-compose-authentik-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-authentik-root.target"
+                ];
+            };
+            virtualisation.oci-containers.containers."authentik-server" = {
+                image = "ghcr.io/goauthentik/server:2025.12.2";
+                environment = {
+                    "AUTHENTIK_POSTGRESQL__HOST" = "postgresql";
+                    "AUTHENTIK_POSTGRESQL__NAME" = "authentik";
+                    "AUTHENTIK_POSTGRESQL__PASSWORD" = "\${PG_PASS}";
+                    "AUTHENTIK_POSTGRESQL__USER" = "authentik";
+                    "AUTHENTIK_SECRET_KEY" = "\${SECRET_KEY}";
+                };
+                environmentFiles = [ config.sops.templates."authentik.env".path ];
+                labels = {
+                    "traefik.enable" = "true";
+                    "traefik.http.routers.${name}.entrypoints" = "websecure,localsecure";
+                    "traefik.http.routers.${name}.rule" = "Host(`${subdomain}.esotericbytes.com`)";
+                    "traefik.http.routers.${name}.service" = "${name}";
+                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
+
+                    "traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.101.1:${builtins.toString hostPort}";
+
+
+                    "traefik.http.middlewares.authentik.forwardauth.address" = "https://auth.esotericbytes.com/outpost.goauthentik.io/auth/traefik";
+                    "traefik.http.middlewares.authentik.forwardauth.trustForwardHeader" = "true";
+                    "traefik.http.middlewares.authentik.forwardauth.authResponseHeaders" = "X-authentik-username,X-authentik-groups,X-authentik-entitlements,X-authentik-email,X-authentik-name,X-authentik-uid,X-authentik-jwt,X-authentik-meta-jwks,X-authentik-meta-outpost,X-authentik-meta-provider,X-authentik-meta-app,X-authentik-meta-version";
+
+                };
+                volumes = [
+                    "/etc/Authentik/custom-templates:/templates:rw"
+                        "/etc/Authentik/data:/data:rw"
+                ];
+                ports = [
+                    "${builtins.toString hostPort}:9000/tcp"
+#"9443:9443/tcp"
+                ];
+                cmd = [ "server" ];
+                dependsOn = [
+                    "authentik-postgresql"
+                ];
+                log-driver = "journald";
+                extraOptions = [
+                    "--network-alias=server"
+                        "--network-alias=authentik-server"
+                        "--network-alias=${name}"
+                        "--ip=192.168.101.6"
+                ];
+                networks = [
+                    "docker-main"
+                        "authentik_default"
+                ];
+            };
+            systemd.services."docker-authentik-server" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-authentik_default.service"
+                        "docker-network-setup.service" 
+                ];
+                requires = [
+                    "docker-network-authentik_default.service"
+                        "docker-network-setup.service" 
+                ];
+                partOf = [
+                    "docker-compose-authentik-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-authentik-root.target"
+                ];
+            };
+            virtualisation.oci-containers.containers."authentik-worker" = {
+                image = "ghcr.io/goauthentik/server:2025.12.2";
+                environment = {
+                    "AUTHENTIK_POSTGRESQL__HOST" = "postgresql";
+                    "AUTHENTIK_POSTGRESQL__NAME" = "authentik";
+                    "AUTHENTIK_POSTGRESQL__PASSWORD" = "\${PG_PASS}";
+                    "AUTHENTIK_POSTGRESQL__USER" = "authentik";
+                    "AUTHENTIK_SECRET_KEY" = "\${SECRET_KEY}";
+                };
+                environmentFiles = [ config.sops.templates."authentik.env".path ];
+                volumes = [
+                    "/etc/Authentik/certs:/certs:rw"
+                        "/etc/Authentik/custom-templates:/templates:rw"
+                        "/etc/Authentik/data:/data:rw"
+                        "/var/run/docker.sock:/var/run/docker.sock:rw"
+                ];
+                cmd = [ "worker" ];
+                dependsOn = [
+                    "authentik-postgresql"
+                ];
+                user = "root";
+                log-driver = "journald";
+                extraOptions = [
+                    "--network-alias=worker"
+                        "--network=authentik_default"
+                ];
+            };
+            systemd.services."docker-authentik-worker" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-authentik_default.service"
+                ];
+                requires = [
+                    "docker-network-authentik_default.service"
+                ];
+                partOf = [
+                    "docker-compose-authentik-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-authentik-root.target"
+                ];
+            };
+
+# Networks
+            systemd.services."docker-network-authentik_default" = {
+                path = [ pkgs.docker ];
+                serviceConfig = {
+                    Type = "oneshot";
+                    RemainAfterExit = true;
+                    ExecStop = "docker network rm -f authentik_default";
+                };
+                script = ''
+                    docker network inspect authentik_default || docker network create authentik_default
+                    '';
+                partOf = [ "docker-compose-authentik-root.target" ];
+                wantedBy = [ "docker-compose-authentik-root.target" ];
+            };
+
+# Volumes
+            systemd.services."docker-volume-authentik_database" = {
+                path = [ pkgs.docker ];
+                serviceConfig = {
+                    Type = "oneshot";
+                    RemainAfterExit = true;
+                };
+                script = ''
+                    docker volume inspect authentik_database || docker volume create authentik_database --driver=local
+                    '';
+                partOf = [ "docker-compose-authentik-root.target" ];
+                wantedBy = [ "docker-compose-authentik-root.target" ];
+            };
+
+# Root service
+# When started, this will automatically create all resources and start
+# the containers. When stopped, this will teardown all resources.
+            systemd.targets."docker-compose-authentik-root" = {
+                unitConfig = {
+                    Description = "Root target generated by compose2nix.";
+                };
+                wantedBy = [ "multi-user.target" ];
+            };
+        };
+    };
+}

modules/features/avahi.nix

@@ -0,0 +1,20 @@
+{ ... }: {
+
+    flake.nixosModules.avahi = { config, lib, ... }: {
+
+        config = {
+
+            services.avahi = {
+
+                enable = true;
+                ipv4 = true;
+                ipv6 = true;
+                openFirewall = true;
+                nssmdns4 = true;
+                wideArea = true;
+
+            };   
+        };
+    };
+}
+

modules/features/code-server.nix

@@ -0,0 +1,39 @@
+{ ... }: {
+
+    flake.nixosModules.code-server = { config, lib, ... }: {
+
+        config = {
+
+            containers.code-server = {
+
+                autoStart = true;
+                privateNetwork = true;
+                hostAddress = "192.168.100.10";
+                localAddress = "192.168.100.31";
+
+                config = {
+
+                    services.code-server = {
+                        enable = true;
+
+                        hashedPassword = "1$WFYzcW1TNmpYM1ZKU3lielNCaXAyRkF2K3FjPQ$bSeeV4bvL2uiDYKiQjBLJPAO13/gNjYVgw8YKFtTQDI";
+
+                        disableUpdateCheck = true;
+
+                        disableTelemetry = true;
+
+                        disableGettingStartedOverride = true;
+
+                        auth = "none";
+
+                        host = "0.0.0.0";
+                    };
+
+                    networking.firewall.allowedTCPPorts = [ 4444 ];
+
+                    system.stateVersion = "25.05";
+                };
+            };
+        };
+    };
+}

modules/features/default.nix

@@ -0,0 +1,96 @@
+{ inputs, ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+
+        imports = [
+            inputs.sops-nix.nixosModules.sops
+        ];
+
+        config = {
+
+            nix = {
+                nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+                channel.enable = false;
+                settings = {
+                    experimental-features = [ "nix-command" "flakes" ];
+                    builders-use-substitutes = (config.sops.secrets ? "remoteBuildKey");
+
+                    substituters = lib.mkIf config.programs.hyprland.enable ["https://hyprland.cachix.org"];
+                    trusted-substituters = lib.mkIf config.programs.hyprland.enable ["https://hyprland.cachix.org"];
+                    trusted-public-keys = lib.mkIf config.programs.hyprland.enable ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+                };
+
+                distributedBuilds = lib.mkDefault (config.sops.secrets ? "remoteBuildKey");
+                buildMachines = lib.mkIf (config.sops.secrets ? "remoteBuildKey") [
+                {
+                    hostName = "esotericbytes.com";
+                    sshUser = "remote-builder";
+                    sshKey = config.sops.secrets."remoteBuildKey".path;
+                    supportedFeatures = [
+                        "nixos-test"
+                            "benchmark"
+                            "big-parallel"
+                            "kvm"
+                    ];
+                    systems = [ "x86_64-linux" "aarch64-linux" ];
+                }
+                ];
+            };
+
+            users.users."remote-builder" = lib.mkIf (builtins.any
+                (x: (builtins.match "^remoteBuildClientKeys/.+" x) != null) 
+                (builtins.attrNames config.sops.secrets)
+            ) {
+                isNormalUser = true;
+                createHome = false;
+            };
+
+            sops.templates."remote-builder" = lib.mkIf (builtins.any
+                (x: (builtins.match "^remoteBuildClientKeys/.+" x) != null) 
+                (builtins.attrNames config.sops.secrets)
+            )  {
+                content = builtins.concatStringsSep ''''\n'' (builtins.map 
+                        (y: config.sops.placeholder.${y}) 
+                        (builtins.filter 
+                         (x: (builtins.match "^remoteBuildClientKeys/.+" x) != null) 
+                         (builtins.attrNames config.sops.secrets)
+                        )
+                        );
+                path = "/etc/ssh/authorized_keys.d/remote-builder";
+                owner = "remote-builder";
+            };
+
+            sops = {
+                age.keyFile = "/var/lib/sops/age/keys.txt";
+                defaultSopsFormat = "yaml";
+            };
+
+            programs.fuse.userAllowOther = true;
+
+            home-manager = {
+                backupFileExtension = "backup";
+                useUserPackages = true;
+                sharedModules = [];
+            };
+
+            time.timeZone = lib.mkDefault "America/Chicago";
+
+            i18n = lib.mkDefault {
+                defaultLocale = "en_US.UTF-8";
+
+                extraLocaleSettings = {
+                    LC_ADDRESS = "en_US.UTF-8";
+                    LC_IDENTIFICATION = "en_US.UTF-8";
+                    LC_MEASUREMENT = "en_US.UTF-8";
+                    LC_MONETARY = "en_US.UTF-8";
+                    LC_NAME = "en_US.UTF-8";
+                    LC_NUMERIC = "en_US.UTF-8";
+                    LC_PAPER = "en_US.UTF-8";
+                    LC_TELEPHONE = "en_US.UTF-8";
+                    LC_TIME = "en_US.UTF-8";
+                };
+            };
+        };
+    };
+}
+

modules/features/docker-mailserver.nix

@@ -0,0 +1 @@
+{}

modules/features/docker.nix

@@ -0,0 +1,49 @@
+{ ... }: {
+
+    flake.nixosModules.docker = { config, lib, pkgs, ... }: {
+
+        config = {
+
+            networking.nat.internalInterfaces = [ "docker0" "docker-main" ];
+
+            virtualisation = {
+                docker = {
+                    enable = true;
+                    storageDriver = "btrfs";
+                };
+
+                oci-containers = {
+                    backend = "docker";
+                };
+            };
+
+            hardware.nvidia-container-toolkit.enable = lib.mkDefault (builtins.any 
+                (x: x == "nvidia") 
+                config.services.xserver.videoDrivers
+            );
+
+            systemd.services."docker-network-setup" = {
+                path = [ pkgs.docker ];
+                serviceConfig = {
+                    Type = "oneshot";
+                    RemainAfterExit = true;
+                    ExecStop = "docker network rm -f docker-main";
+                };
+                script = ''
+                    docker network inspect docker-main ||
+                    docker network create -d bridge docker-main \
+                    --attachable --subnet 192.168.101.0/24 --ip-range 192.168.101.0/24 \
+                    --gateway 192.168.101.1 \
+                    -o "com.docker.network.bridge.name"="docker-main" \
+                    -o "com.docker.network.bridge.trusted_host_interfaces"="wt0:ve-netbird:ve-traefik"
+                    '';
+                wantedBy = [ "docker-net.target" ];
+            };
+
+            systemd.targets."docker-net" = {
+                wantedBy = [ "multi-user.target" ];
+            };
+        };
+    };
+}
+

modules/features/dynamicDNS.nix

@@ -0,0 +1,38 @@
+{ ... }: {
+
+    flake.nixosModules.dynamicDNS = { config, lib, pkgs, ... }: {
+
+        config = {
+
+            systemd.timers.dynamicDNS = {
+
+                wantedBy = [ "timers.target" ];
+
+                timerConfig = {
+
+                    OnBootSec = "5m";
+
+                    OnUnitActiveSec = "1h";
+
+                    Unit = "dynamicDNS.service";
+                };
+            };
+
+            systemd.services.dynamicDNS = {
+
+                name = "dynamicDNS.service";
+
+                serviceConfig = {
+
+                    Type = "oneshot";
+
+                    LoadCredential = [ "cloudflare-api-key" ];
+
+                };
+
+                script = '''';
+            };
+        };
+    };
+}
+

modules/features/gitea.nix

@@ -0,0 +1,258 @@
+{ ... }: {
+
+    flake.nixosModules.gitea = { config, lib, ... }: {
+
+        config = {
+
+            networking = {
+                nat.internalInterfaces = [ "ve-gitea" ];
+            };
+
+            sops.secrets = {
+                "gitea/dbpass" = {};
+            };
+
+            containers.gitea = {
+
+                autoStart = true;
+                privateNetwork = true;
+                hostAddress = "192.168.100.10";
+                localAddress = "192.168.100.20";
+
+                bindMounts = {
+                    "/etc/gitea/data" = {
+                        hostPath = "/ssd1/Gitea/data";
+                        isReadOnly = false;
+                    };
+                };
+
+                extraFlags = [
+                    "--load-credential=dbpass:${config.sops.secrets."gitea/dbpass".path}"
+                ];
+                
+                config = {
+
+                    systemd.services.secrets_setup = {
+                        wantedBy = [ "gitea.service" ];
+
+                        serviceConfig = {
+                            LoadCredential = [
+                                "dbpass"
+                            ];
+                        };
+
+                        script = ''
+                            cat ''${CREDENTIALS_DIRECTORY}/dbpass > /etc/gitea/dbpass
+                            chown gitea:gitea /etc/gitea/*
+                        '';
+                    };
+
+                    services.gitea = {
+                        enable = true;
+
+                        stateDir = "/etc/gitea/data";
+
+                        dump.enable = false;
+
+                        appName = "Gitea";
+
+                        settings = {
+                            server = {
+                                DOMAIN = "gitea.esotericbytes.com";
+                                HTTP_PORT = 3000;
+                                ROOT_URL = "https://gitea.esotericbytes.com/";
+                            };
+                            service = {
+                                DISABLE_REGISTRATION = false;
+                                ALLOW_ONLY_EXTERNAL_REGISTRATION = true;
+                                REQUIRE_SIGNIN_VIEW = false;
+                            };
+                            oauth2_client = {
+                                ENABLE_AUTO_REGISTRATION = true;
+                            };
+                            session.COOKIE_SECURE = true;
+
+                            cron = {
+                                ENABLED = true;
+                                RUN_AT_START = true;
+                            };
+
+                            repository = {
+                                DEFAULT_BRANCH = "master";
+                            };
+                        };
+
+                        database = {
+                            passwordFile = "/etc/gitea/dbpass";
+                            type = "postgres";
+                        };
+
+                    };
+
+                    services.openssh = {
+                        enable = true;
+                        openFirewall = true;
+                        settings = {
+                            PermitRootLogin = lib.mkForce "no";
+                            PasswordAuthentication = false;
+                            KbdInteractiveAuthentication = false;
+                        };
+                        ports = [ 2222 ];
+                    };
+
+                    networking.firewall.allowedTCPPorts = [ 3000 ];
+
+                    system.stateVersion = "24.11";
+                };
+            };
+        };
+    };
+
+    flake.nixosModules.gitea-docker = { config, lib, pkgs, ... }: let
+
+    subdomain = "gitea";
+
+    name = "gitea";
+
+    in {
+
+        config = {
+
+
+            virtualisation.oci-containers.containers."${name}" = {
+                image = "docker.gitea.com/gitea:1.25.4";
+
+# unstable, waiting for 26.05
+#pull = "newer";
+
+                hostname = "${subdomain}.esotericbytes.com";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                labels = {
+                    "traefik.enable" = "true";
+                    "traefik.http.routers.${name}.entrypoints" = "localsecure";
+                    "traefik.http.routers.${name}.rule" = "Host(`${subdomain}.esotericbytes.com`)";
+                    "traefik.http.routers.${name}.service" = "${name}";
+                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
+
+                    "traefik.http.services.${name}.loadbalancer.server.port" = "3000";
+
+
+                    "traefik.tcp.routers.${name}-ssh.entrypoints" = "gitea-ssh";
+                    "traefik.tcp.routers.${name}-ssh.rule" = "HostSNI(`*`)";
+                    "traefik.tcp.routers.${name}-ssh.service" = "${name}-ssh";
+
+                    "traefik.tcp.services.${name}-ssh.loadbalancer.server.port" = "22";
+                };
+
+                ports = [
+                ];
+
+                extraOptions = [
+                    "--ip=192.168.101.20"
+                ];
+
+                volumes = [
+                    "vol_gitea:/data"
+                ];
+
+                environment = {
+                };
+            };
+
+            virtualisation.oci-containers.containers."${name}-db" = {
+                image = "docker.io/library/postgres:14";
+
+# unstable, waiting for 26.05
+#pull = "newer";
+
+                hostname = "${name}-db";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                labels = {
+                };
+
+                ports = [
+                ];
+
+                extraOptions = [
+                    "--ip=192.168.101.21"
+                ];
+
+                volumes = [
+                    "/etc/gitea/db:/var/lib/postgresql/data"
+                ];
+
+                environment = {
+                };
+            };
+
+            systemd.services."docker-gitea" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-setup.service"
+                        "docker-volume-gitea.service" 
+                        "docker-gitea-db.service" 
+                ];
+                requires = [
+                    "docker-network-setup.service"
+                        "docker-volume-gitea.service" 
+                        "docker-gitea-db.service" 
+                ];
+                partOf = [
+                    "docker-compose-gitea-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-gitea-root.target"
+                ];
+            };
+
+            systemd.services."docker-gitea-db" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-setup.service"
+                ];
+                requires = [
+                    "docker-network-setup.service"
+                ];
+                partOf = [
+                    "docker-compose-gitea-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-gitea-root.target"
+                ];
+            };
+
+            systemd.services."docker-volume-gitea" = {
+                path = [ pkgs.docker ];
+                serviceConfig = {
+                    Type = "oneshot";
+                    RemainAfterExit = true;
+                };
+                script = ''
+                    docker volume inspect vol_gitea || docker volume create vol_gitea --driver=local
+                    '';
+                partOf = [ "docker-compose-gitea-root.target" ];
+                wantedBy = [ "docker-compose-gitea-root.target" ];
+            };
+
+        };
+    };
+
+}

modules/features/home-assistant/configuration.yaml

@@ -0,0 +1,16 @@
+
+# Loads default set of integrations. Do not remove.
+default_config:
+
+# Load frontend themes from the themes folder
+frontend:
+  themes: !include_dir_merge_named themes
+
+automation: !include automations.yaml
+script: !include scripts.yaml
+scene: !include scenes.yaml
+
+http:
+  use_x_forwarded_for: true
+  trusted_proxies:
+    - 192.168.101.11

modules/features/home-assistant/home-assistant.nix

@@ -0,0 +1,63 @@
+{ ... }: {
+
+    flake.nixosModules.home-assistant = { config, lib, ... }: let
+
+    subdomain = "hass";
+
+    name = "home-assistant";
+
+    in {
+
+        config = {
+
+            environment.etc."home-assistant/configuration.yaml".source = ./configuration.yaml;
+
+            virtualisation.oci-containers.containers.home-assistant = {
+                image = "ghcr.io/home-assistant/home-assistant:stable";
+
+# unstable, waiting for 26.05
+#pull = "newer";
+
+                hostname = "${subdomain}.esotericbytes.com";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                labels = {
+                    "traefik.enable" = "true";
+                    "traefik.http.routers.${name}.entrypoints" = "localsecure";
+                    "traefik.http.routers.${name}.rule" = "Host(`${subdomain}.esotericbytes.com`)";
+                    "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.port" = "8123";
+                };
+
+                environment = {
+                    TZ = "America/Chicago";
+                };
+
+                extraOptions = [
+                    "--ip=192.168.101.13"
+                ];
+
+                ports = [
+                ];
+
+                volumes = [
+                    "vol_home-assistant:/config/"
+                        "/etc/home-assistant/configuration.yaml:/config/configuration.yaml"
+                ];
+            };
+        };
+    };
+
+    flake.nixosModules.home-assistant-vm = { config, lib, ... }: {
+
+        config = {
+
+        };
+    };
+}

modules/features/hyprland.nix

@@ -0,0 +1,28 @@
+{ inputs, ... }: {
+
+    flake.nixosModules.hyprland = { config, lib, pkgs, ... }: {
+
+        config = {
+
+            environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+            programs.hyprland = let
+                system = pkgs.stdenv.hostPlatform.system;
+                #pkgs-us = import inputs.nixpkgs-us { inherit system; };
+            in {
+                enable = true;
+
+                withUWSM = false;
+
+                xwayland.enable = true;
+
+                systemd.setPath.enable = true;
+
+                package = inputs.hyprland.packages.${system}.hyprland;
+
+                portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
+            };
+        };
+    };
+}
+