organization p2

config/base.nix

@@ -10,12 +10,12 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./jawz.nix
-    ./modules/modules.nix
+    ../modules/modules.nix
   ];
   system.stateVersion = "23.05";
   sops = {
     defaultSopsFormat = "yaml";
-    defaultSopsFile = ./secrets/secrets.yaml;
+    defaultSopsFile = ../secrets/secrets.yaml;
     age = {
       sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
       keyFile = "/var/lib/sops-nix/key.txt";

config/jawz.nix

@@ -7,7 +7,7 @@ in
     let
       baseDir = ".ssh/ed25519";
       keyConfig = file: {
-        sopsFile = ./secrets/keys.yaml;
+        sopsFile = ../secrets/keys.yaml;
         owner = config.users.users.jawz.name;
         inherit (config.users.users.jawz) group;
         path = "/home/jawz/${file}";
@@ -23,7 +23,7 @@ in
       "syncthing_certs/${hostName}" = keyConfig ".config/syncthing/cert.pem";
     };
 
-  home-manager.users.jawz.home.file.".librewolf/.stignore".source = ./dotfiles/stignore;
+  home-manager.users.jawz.home.file.".librewolf/.stignore".source = ../dotfiles/stignore;
   services.syncthing = {
     enable = true;
     user = "jawz";
@@ -93,12 +93,12 @@ in
       "bluetooth"
     ];
     openssh.authorizedKeys.keyFiles = [
-      ./secrets/ssh/ed25519_deacero.pub
-      ./secrets/ssh/ed25519_workstation.pub
-      ./secrets/ssh/ed25519_server.pub
-      ./secrets/ssh/ed25519_miniserver.pub
-      ./secrets/ssh/ed25519_galaxy.pub
-      ./secrets/ssh/ed25519_phone.pub
+      ../secrets/ssh/ed25519_deacero.pub
+      ../secrets/ssh/ed25519_workstation.pub
+      ../secrets/ssh/ed25519_server.pub
+      ../secrets/ssh/ed25519_miniserver.pub
+      ../secrets/ssh/ed25519_galaxy.pub
+      ../secrets/ssh/ed25519_phone.pub
     ];
   };
 }

config/stylix.nix

@@ -5,7 +5,7 @@
   ...
 }:
 let
-  scheme = schemes.ballerinas;
+  scheme = schemes.paul;
   cfg = config.my.stylix;
   mkScheme =
     {
@@ -14,15 +14,17 @@ let
       polarity,
       image,
       iconPackage ? pkgs.papirus-icon-theme.override { inherit color; },
+      base16Scheme ? if name != null then "${pkgs.base16-schemes}/share/themes/${name}.yaml" else null,
     }:
     {
       inherit
+        color
         name
         polarity
         image
         iconPackage
+        base16Scheme
         ;
-      base16Scheme = if name != null then "${pkgs.base16-schemes}/share/themes/${name}.yaml" else null;
     };
   schemes = {
     who = mkScheme {
@@ -52,6 +54,30 @@ let
       polarity = "dark";
       image = ./wallpapers/Waay-Ballerinas.jpeg;
     };
+    paul = mkScheme {
+      color = "green";
+      name = "valua";
+      polarity = "light";
+      image = ./wallpapers/paul1.jpg;
+      base16Scheme = {
+        base00 = "#18262F";
+        base01 = "#222E38";
+        base02 = "#586875";
+        base03 = "#667581";
+        base04 = "#85939E";
+        base05 = "#A6AFB8";
+        base06 = "#E8E9ED";
+        base07 = "#F5F7FA";
+        base08 = "#4c7c4a"; # deep fern green
+        base09 = "#6b8f3c"; # olive bark
+        base0A = "#b5b938"; # lichen gold
+        base0B = "#7CC844"; # success green (kept from original)
+        base0C = "#4fbf87"; # turquoise vine
+        base0D = "#2aaf6f"; # jungle leaf
+        base0E = "#88a337"; # mossy lime
+        base0F = "#5c8b55"; # swamp olive
+      };
+    };
   };
 in
 {

flake.nix

@@ -72,7 +72,7 @@
           modules = [
             {
               nixpkgs.overlays = [
-                (import ./overlay.nix { inherit mkpkgs inputs; })
+                (import ./config/overlay.nix { inherit mkpkgs inputs; })
                 inputs.doom-emacs.overlays.default
               ];
             }

hosts/miniserver/configuration.nix

@@ -2,8 +2,8 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../base.nix
-    ../../stylix.nix
+    ../../config/base.nix
+    ../../config/stylix.nix
   ];
   my = import ./toggles.nix;
   networking = {

hosts/server/configuration.nix

@@ -2,8 +2,8 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../base.nix
-    ../../stylix.nix
+    ../../config/base.nix
+    ../../config/stylix.nix
   ];
   my = import ./toggles.nix;
   networking =

hosts/shell/configuration.nix

@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ../../base.nix
-    ../../stylix.nix
+    ../../config/base.nix
+    ../../config/stylix.nix
   ];
 }

hosts/workstation/configuration.nix

@@ -17,9 +17,9 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ../../base.nix
-    ../../gnome.nix
-    ../../stylix.nix
+    ../../config/base.nix
+    ../../config/stylix.nix
+    ../../environments/gnome.nix
   ];
   my = import ./toggles.nix;
   home-manager.users.jawz = {