From a2d5ca2963e9faa1f3fb8add2b223370e73b5f6f Mon Sep 17 00:00:00 2001
From: Ghostfox <ghostfox@laminax.co>
Date: Thu, 2 Apr 2026 02:44:48 +0200
Subject: [PATCH] Fix up Kurin

---
 flake.nix                            |  2 +-
 modules/base/default.nix             |  9 +++++++--
 modules/base/home/starship.toml      | 10 ++++++++--
 modules/development/home/default.nix |  6 +-----
 modules/development/packages.nix     |  6 +-----
 modules/server/default.nix           |  6 +++++-
 modules/server/home/default.nix      |  5 +++++
 modules/server/packages.nix          |  3 ++-
 systems/kurin/configuration.nix      |  4 ++++
 9 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 modules/server/home/default.nix

diff --git a/flake.nix b/flake.nix
index 135e5ba..5118f08 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,7 +52,7 @@
         system = "aarch64-linux";
         inherit specialArgs;
         modules = [
-					(inputs.nixos-hardware + "/raspberry-pi/4")
+					#(inputs.nixos-hardware + "/raspberry-pi/4")
 					(nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64.nix")
           ./systems/kurin/configuration.nix
         ];
diff --git a/modules/base/default.nix b/modules/base/default.nix
index a854f66..7508cf2 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ config, lib, inputs, pkgs, ... }:
 {
     imports = [
         inputs.catppuccin.nixosModules.catppuccin
@@ -14,4 +14,9 @@
         ./user.nix
     ];
 
-}
\ No newline at end of file
+    environment.enableAllTerminfo = true;
+
+        image.fileName = lib.mkDefault "${config.networking.hostName}-${pkgs.stdenv.hostPlatform.system}";
+	image.baseName = lib.mkDefault "${config.networking.hostName}-${pkgs.stdenv.hostPlatform.system}";
+
+}
diff --git a/modules/base/home/starship.toml b/modules/base/home/starship.toml
index 3de9eaf..a4ee178 100644
--- a/modules/base/home/starship.toml
+++ b/modules/base/home/starship.toml
@@ -3,7 +3,7 @@
 format = """
 [](red)\
 $os\
-$username\
+$hostname\
 [](bg:peach fg:red)\
 $directory\
 [](bg:yellow fg:peach)\
@@ -23,13 +23,19 @@ $python\
 $conda\
 [](fg:sapphire bg:lavender)\
 $time\
-[ ](fg:lavender)\
+[ ](fg:lavender)\
 $cmd_duration\
 $line_break\
 $character"""
 
 palette = 'catppuccin_mocha'
 
+[hostname]
+ssh_symbol = " "
+style = "bg:red fg:crust"
+trim_at = ""
+format = "[  $ssh_symbol $hostname ]($style)"
+
 [os]
 disabled = false
 style = "bg:red fg:crust"
diff --git a/modules/development/home/default.nix b/modules/development/home/default.nix
index 81f7f54..0633482 100644
--- a/modules/development/home/default.nix
+++ b/modules/development/home/default.nix
@@ -3,8 +3,4 @@
         ./git.nix
         ./vscode.nix
     ];
-    
-    programs = {
-        zellij.enable = true;
-    };
-}
\ No newline at end of file
+}
diff --git a/modules/development/packages.nix b/modules/development/packages.nix
index d96abca..be176d1 100644
--- a/modules/development/packages.nix
+++ b/modules/development/packages.nix
@@ -7,9 +7,5 @@
         go
         just
         nodejs
-        
-        
-        # Tooling
-        zellij
     ];
-}
\ No newline at end of file
+}
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 2decfee..c9f123c 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -6,7 +6,11 @@
         ./zerotier.nix
     ];
 
+    home-manager.sharedModules = [
+	./home
+    ];
+
     system.nixos.variantName = lib.mkDefault "Server";
     system.nixos.variant_id = lib.mkDefault "server";
     services.openssh.enable = true;
-}
\ No newline at end of file
+}
diff --git a/modules/server/home/default.nix b/modules/server/home/default.nix
new file mode 100644
index 0000000..c7a553f
--- /dev/null
+++ b/modules/server/home/default.nix
@@ -0,0 +1,5 @@
+{
+    programs = {
+        zellij.enable = true;
+    };
+}
diff --git a/modules/server/packages.nix b/modules/server/packages.nix
index e915490..8a0537d 100644
--- a/modules/server/packages.nix
+++ b/modules/server/packages.nix
@@ -2,5 +2,6 @@
 {
     environment.systemPackages = with pkgs; [
         sops
+	zellij
     ];
-}
\ No newline at end of file
+}
diff --git a/systems/kurin/configuration.nix b/systems/kurin/configuration.nix
index c1d44d0..940df8b 100644
--- a/systems/kurin/configuration.nix
+++ b/systems/kurin/configuration.nix
@@ -9,6 +9,8 @@
         #./hardware-configuration.nix
     ];
 
+	#programs.nvf.enable = lib.mkForce false;
+
 	networking.hostName = "kurin";
 
 	# hardware.raspberry-pi."4" = {
@@ -20,6 +22,7 @@
 	sops = {
 		defaultSopsFile = ../../secrets/kurin.yaml;
 		defaultSopsFormat = "yaml";
+                age.keyFile = "/nix/keys.txt";
 	};
 
     sops.secrets."users_dark_password".neededForUsers = true;
@@ -89,6 +92,7 @@
 	#	memoryPercent = 40;
 	#};
 
+	sops.secrets."wireless_passwords".mode = "0440";
 	networking.wireless = {
 		enable = true;
 		networks = {