change

flake.nix

@@ -64,9 +64,13 @@
             myhostname = "legacy";
           };
           modules = [
-            stylix.nixosModules.stylix
             ./maskiner/legacy/configuration.nix
+            stylix.nixosModules.stylix
+            home-manager.nixosModules.home-manager
             sops-nix.nixosModules.sops
+            catppuccin.nixosModules.catppuccin
+            confetti.nixosModules.default
+            playerctl-gtk.nixosModules.default
             bbk.nixosModules.default
           ];
         };

maskiner/legacy/configuration.nix

@@ -10,6 +10,7 @@
   ...
 }:
 let
+  theme = "mocha";
 in
 {
   imports = [
@@ -17,8 +18,8 @@ in
 
     ../../moduler/base.nix
 
-    inputs.home-manager.nixosModules.home-manager
     ../../moduler/users.nix
+    ../../moduler/git.nix
     ../../moduler/network.nix
     ../../moduler/programs.nix
     ../../moduler/system.nix
@@ -26,14 +27,35 @@ in
     ../../moduler/lsp.nix
     ../../moduler/hyprland.nix
     ../../moduler/sound.nix
+    ../../moduler/programs/kubernetes-tools.nix
+    ../../moduler/programs/confetti
   ];
 
-  sops.defaultSopsFile = ../../secrets/sops.yaml;
+  kubernetes-tools.enable = true;
-  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+  networking.networkmanager = {
+    enable = true;
+    plugins = with pkgs; [
+      networkmanager-openvpn
+    ];
+  };
 
   stylix = {
     enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-${theme}.yaml";
+  };
+
+  programs.ssh.knownHosts = {
+    desktop = {
+      extraHostNames = [ "192.168.1.227" ];
+      publicKeyFile = ../../keys/rsa_pubkey;
+    };
+    "192.168.1.227" = {
+      publicKeyFile = ../../keys/rsa_pubkey;
+    };
+  };
+  hyprland = {
+    enable = true;
+    theme = theme;
   };
 
   home-manager.extraSpecialArgs = { inherit inputs pkgs; };
@@ -45,8 +67,8 @@ in
     ];
     waybar = {
       enable = true;
-		configPath =  ./../../moduler/programs/waybar/waybar-laptop.jsonc;
+      configPath = ./../../moduler/programs/waybar/waybar.jsonc;
-		stylePath =  ./../../moduler/programs/waybar/waybar-latte.css;
+      stylePath = ./../../moduler/programs/waybar/waybar-${theme}.css;
     };
     gtk = {
       enable = true;
@@ -55,10 +77,37 @@ in
         package = pkgs.gruvbox-dark-icons-gtk;
       };
     };
+    kitty = {
+      enable = true;
+      theme = theme;
+    };
+    fish = {
+      theme = theme;
+    };
+    k9s = {
+      enable = true;
+      theme = theme;
+    };
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+
+      shellAliases = {
+        ll = "ls -l";
+        update = "sudo nixos-rebuild switch";
+      };
+      history.size = 10000;
+    };
+    oh-my-posh = {
+      enable = true;
+      theme = theme;
+    };
     catppuccin = {
       librewolf = {
         enable = true;
-        flavor = "latte";
+        flavor = theme;
         accent = "peach";
       };
     };
@@ -73,22 +122,6 @@ in
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  networking.hostName = myhostname;
-
-
-  services = {
-    searx = {
-      enable = true;
-      redisCreateLocally = true;
-      settings.server = {
-        bind_address = "::1";
-        port = 8000;
-        secret_key = "alsjdioefj.asdi";
-      };
-    };
-  };
   security.sudo.wheelNeedsPassword = false;
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDALsdpwvC0w/Aj+1fWtzJyyWoUrGkdh8o2thVHeQQBNo0D7cmVberYmi4Cv9gWGX6PaElrnOl0KRdGyro2wxOYokSxgk2VgWW67BFITAQAbKyG2NhXXPbhb4jccDo7WH7TtOG8IofuJTPRu1Duda6k4RN0I0CkyAN6LGX+zy49cq0qKf9ijXYhCDYNih3+Fu/ig0aW/SYmsVoUl2VFTWdI5x5/wLvIjTEZhmAtYIeYADaLnom356cFrUysZa++FUujQAz3Ow236BvP95XZdTsqvfWNZFNIpC9VYF72JeIDCs5wDIr0GFmanF2On1nar+jJpoOE8SdHt357p5g/PqXV5TisN2xQRkqVwO9tWtMl4sF84jA4ULnY2gQWv9jErMxymUQ1IwuPUzDDlbRHCtfexAtkBy7wv6xslKAzG1QahvF/btNs5Caj3LN31rgAuxyooCbKGKTeBP3kHPKcz1iupgidfbO/QqVXBRQJTEdGyAKa8hVmLQZZPC/XUhxESAk= fw@fw-nix"
@@ -101,5 +134,9 @@ in
   	enable = true;
   };
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  networking.hostName = myhostname;
+
   system.stateVersion = "25.05";
 }

maskiner/node/configuration.nix

@@ -46,6 +46,22 @@ in
     beets
   ];
 
+  services.nginx = {
+    enable = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+    virtualHosts."router.wastring.com" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "http://192.168.1.1:80";
+        proxyWebsockets = true;
+        extraConfig =
+          "proxy_ssl_server_name on;" + "proxy_pass_header Authorization;";
+      };
+    };
+  };
+
   mpd = {
     enable = true;
   };

moduler/system.nix

@@ -10,11 +10,11 @@
 }:
 {
 
-  services.pcscd.enable = true;
+  # services.pcscd.enable = true;
-  programs.gnupg.agent = {
+  # programs.gnupg.agent = {
-    enable = true;
+  #   enable = true;
-    enableSSHSupport = true;
+  #   enableSSHSupport = true;
-  };
+  # };
 
   programs.nh = {
     enable = true;