overhaul for pi4

home-manager/nathan/default.nix

@@ -42,6 +42,12 @@
             iconTheme.name = "rose-pine-moon";
         };
 
+        sops = {
+            age.keyFile = "/home/nathan/.config/sops/age/keys.txt";
+            defaultSopsFile = ./secrets.yaml;
+            defaultSopsFormat = "yaml";
+        };
+
         services.mpris-proxy.enable = true;
 
         programs.ssh.enable = true;

home-manager/nathan/dotfiles/default.nix

@@ -5,6 +5,7 @@
 		".config/hypr" = { source = ./hypr; recursive = true; };
 		".config/swaylock" = { source = ./swaylock; recursive = true; };
 		".config/wal/templates" = { source = ./wal/templates; recursive = true; };
+		".config/zsh" = { source = ./zsh; recursive = true; };
 		"Pictures/Wallpaper" = { source = ./Wallpaper; recursive = true; };
 	};
 

home-manager/nathan/dotfiles/zsh/ohmyposh.toml

@@ -0,0 +1,120 @@
+console_title_template = '{{ .Shell }} in {{ .Folder }}'
+version = 3
+final_space = true
+
+[palette]
+  c0 = '#0B0704'
+  c1 = '#846550'
+  c10 = '#636E90'
+  c11 = '#6FAEAC'
+  c12 = '#A5ADA2'
+  c13 = '#F1DCB7'
+  c14 = '#A1E7DA'
+  c15 = '#c2c1c0'
+  c2 = '#4a526c'
+  c3 = '#538281'
+  c4 = '#7b8179'
+  c5 = '#b4a589'
+  c6 = '#78ada3'
+  c7 = '#958d89'
+  c8 = '#665b54'
+  c9 = '#B1876B'
+
+[secondary_prompt]
+  template = '❭❭ '
+  background = 'transparent'
+
+[transient_prompt]
+  template = '{{ if gt .Code 0 }}!❭ {{else}}❭ {{end}}'
+  background = 'transparent'
+  foreground_templates = ['{{ if gt .Code 0 }}p:c13{{end}}', '{{ if eq .Code 0 }}p:c14{{end}}']
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    trailing_diamond = ''
+    template = ' {{ .Icon }} '
+    foreground = 'p:c12'
+    background = 'p:c1'
+    type = 'os'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    trailing_diamond = ''
+    template = '{{ .UserName }}@{{ .HostName }}'
+    foreground = 'p:c14'
+    background = 'p:c2'
+    type = 'session'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    trailing_diamond = ''
+    template = '{{ .Path }}'
+    foreground = 'p:c13'
+    background = 'p:c4'
+    type = 'path'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+      style = 'full'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'right'
+  overflow = 'hidden'
+
+  [[blocks.segments]]
+    leading_diamond = ''
+    template = '{{ .FormattedMs }}'
+    foreground = 'p:c13'
+    background = 'p:c4'
+    type = 'executiontime'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    leading_diamond = ''
+    foreground = 'p:c14'
+    background = 'p:c2'
+    type = 'time'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    leading_diamond = ''
+    foreground = 'p:c12'
+    background = 'p:c1'
+    type = 'shell'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    template = '{{ if gt .Code 0 }}!❭ {{else}}❭ {{end}}'
+    background = 'transparent'
+    type = 'text'
+    style = 'plain'
+    foreground_templates = ['{{ if gt .Code 0 }}p:c13{{end}}', '{{ if eq .Code 0 }}p:c14{{end}}']
+
+    [blocks.segments.properties]
+      cache_duration = 'none'

home-manager/nathan/packages/default.nix

@@ -34,6 +34,8 @@
                 xfce.thunar
                 grim
                 slurp
+                curl
+                wget
             ];
         }
         

home-manager/nathan/programs/default.nix

@@ -2,6 +2,8 @@
 
     imports = [
         ./ags
+        ./git
+        ./nh
         ./hyprland
 	    ./terminal
         ./rofi

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

@@ -9,6 +9,19 @@
 
         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;

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

@@ -0,0 +1,28 @@
+{ config, lib, ... }: {
+
+    options.homeconfig.git.enable = lib.options.mkOption {
+        type = lib.types.bool;
+        default = false;
+    };
+
+    config = lib.mkIf config.homeconfig.git.enable {
+        
+        programs.git = {
+            userName = "Nathan";
+            userEmail = "nathanblunkall5@gmail.com";
+
+            extraConfig = {
+                init = {
+                    defaultBranch = "master";
+                };
+                url = {
+                    "ssh://gitea@gitea.blunkall.us/" = {
+                        insteadOf = [
+                            "blunkall:"
+                        ];
+                    };
+                };
+            };
+        };
+    };
+}

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

@@ -0,0 +1,21 @@
+{ 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 = "/home/nathan/Projects/Olympus";
+
+            clean = {
+                enable = true;
+                dates = "weekly";
+                extraArgs = "--keep 5 --keep-since 3d";
+            };
+        };
+    };
+}

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

@@ -5,11 +5,7 @@
         default = false;
     };
 
-    config = let
-        pywalfox-wrapper = pkgs.writeShellScriptBin "pywalfox-wrapper" ''
-            ${pkgs.pywalfox-native}/bin/pywalfox start
-        '';
-    in  lib.mkIf config.homeconfig.wal.enable {
+    config = lib.mkIf config.homeconfig.wal.enable {
 
         home.packages = with pkgs; [
 
@@ -20,12 +16,8 @@
 
             pywal16
 		    imagemagick
-            pywalfox-native
         ];
 
-        home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = lib.replaceStrings [ "<path>" ] [
-            "${pywalfox-wrapper}/bin/pywalfox-wrapper"
-        ] (lib.readFile "${pkgs.pywalfox-native}/lib/python3.12/site-packages/pywalfox/assets/manifest.json");
-
+        
     };
 }

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

@@ -32,10 +32,12 @@
       share = true;
     };
 
-    initContent = lib.mkBefore ''
+    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)"
+    '');
 
   };