diff --git a/config/kitty/diff.conf b/config/kitty/diff.conf
deleted file mode 120000
index 848f6c3..0000000
--- a/config/kitty/diff.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/p1324gwzjhbv6njfdv7wdfswgsdkv6jl-home-manager-files/.config/kitty/diff.conf
\ No newline at end of file
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
deleted file mode 120000
index e7b1bde..0000000
--- a/config/kitty/kitty.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/p1324gwzjhbv6njfdv7wdfswgsdkv6jl-home-manager-files/.config/kitty/kitty.conf
\ No newline at end of file
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
new file mode 100644
index 0000000..04fa82e
--- /dev/null
+++ b/config/kitty/kitty.conf
@@ -0,0 +1,8 @@
+background_opacity 0.3
+enable_audio_bell no
+enable_wayland_portal no
+detect_system_theme no
+# BEGIN_KITTY_THEME
+# Rosé Pine Moon
+#include current-theme.conf
+# END_KITTY_THEME
diff --git a/config/kitty/kitty.conf.backup b/config/kitty/kitty.conf.backup
deleted file mode 100644
index 04fa82e..0000000
--- a/config/kitty/kitty.conf.backup
+++ /dev/null
@@ -1,8 +0,0 @@
-background_opacity 0.3
-enable_audio_bell no
-enable_wayland_portal no
-detect_system_theme no
-# BEGIN_KITTY_THEME
-# Rosé Pine Moon
-#include current-theme.conf
-# END_KITTY_THEME
diff --git a/flake.nix b/flake.nix
index 9e8e59f..c752683 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,7 @@
         inputs.disko.nixosModules.disko
         stylix.nixosModules.stylix
         agenix.nixosModules.default
-        #./modules/home-manager/stylix.nix
+        ./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
@@ -80,10 +80,7 @@
             backupFileExtension = "backup";
 
             users.tulg = {
-              imports = [
-                ./modules/home-manager/home.nix
-                stylix.homeModules.stylix
-              ];
+              imports = [./modules/home-manager/home.nix];
             };
           };
         }
@@ -99,7 +96,7 @@
         inputs.disko.nixosModules.disko
         stylix.nixosModules.stylix
         agenix.nixosModules.default
-        #./modules/home-manager/stylix.nix
+        ./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
@@ -108,10 +105,7 @@
             backupFileExtension = "backup";
 
             users.tulg = {
-              imports = [
-                ./modules/home-manager/home.nix
-                stylix.homeModules.stylix
-              ];
+              imports = [./modules/home-manager/home.nix];
             };
           };
         }
@@ -127,7 +121,7 @@
         inputs.disko.nixosModules.disko
         agenix.nixosModules.default
         stylix.nixosModules.stylix
-        #./modules/home-manager/stylix.nix
+        ./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
@@ -136,10 +130,7 @@
             backupFileExtension = "backup";
 
             users.tulg = {
-              imports = [
-                ./modules/home-manager/home.nix
-                stylix.homeModules.stylix
-              ];
+              imports = [./modules/home-manager/home.nix];
             };
           };
         }
diff --git a/hosts/overlord/hardware-configuration.nix b/hosts/overlord/hardware-configuration.nix
index 3616e4d..7a6a8c0 100644
--- a/hosts/overlord/hardware-configuration.nix
+++ b/hosts/overlord/hardware-configuration.nix
@@ -24,7 +24,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
   fileSystems."/mnt/2tbhdd" = {
-    device = "/dev/disk/by-uuid/4ec6fd72-a161-4944-8ad4-b727ea90d014";
+    device = "/dev/disk/by-uuid/29c2878a-6b8b-4719-addc-ed57dd647d7b";
     fsType = "ext4";
   };
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index 836c7a0..891c57a 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -3,6 +3,5 @@
     ./yazi.nix
     ./shell.nix
     ./zellij.nix
-    ./fastfetch.nix
   ];
 }
diff --git a/modules/home-manager/cli/fastfetch.nix b/modules/home-manager/cli/fastfetch.nix
deleted file mode 100644
index bf88289..0000000
--- a/modules/home-manager/cli/fastfetch.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  programs.fastfetch = {
-    enable = false;
-    settings = {
-      display = {
-        separator = "  ";
-      };
-      modules = [
-        {
-          type = "os";
-          key = " OS";
-          keyColor = "yellow";
-        }
-        {
-          type = "kernel";
-          key = "│ ├";
-          keyColor = "yellow";
-        }
-        {
-          type = "packages";
-          key = "│ ├󰏖";
-          keyColor = "yellow";
-        }
-        {
-          type = "shell";
-          key = "│ └";
-          keyColor = "yellow";
-        }
-        {
-          type = "wm";
-          key = " wm";
-          keyColor = "blue";
-        }
-        {
-          type = "lm";
-          key = "│ ├󰧨";
-          keyColor = "blue";
-        }
-        {
-          type = "terminal";
-          key = "│ └";
-          keyColor = "blue";
-        }
-        {
-          type = "host";
-          key = " HOST";
-          keyColor = "green";
-        }
-        {
-          type = "cpu";
-          key = "│ ├";
-          keyColor = "green";
-        }
-        {
-          type = "gpu";
-          key = "│ ├󰍛";
-          keyColor = "green";
-        }
-        {
-          type = "disk";
-          key = "│ ├";
-          keyColor = "green";
-        }
-        {
-          type = "memory";
-          key = "│ ├󰑭";
-          keyColor = "green";
-        }
-        {
-          type = "swap";
-          key = "│ ├󰓡";
-          keyColor = "green";
-        }
-        {
-          type = "uptime";
-          key = "│ ├󰅐";
-          keyColor = "green";
-        }
-        {
-          type = "display";
-          key = "│ └󰍹";
-          keyColor = "green";
-        }
-      ];
-    };
-  };
-}
diff --git a/modules/home-manager/cli/shell.nix b/modules/home-manager/cli/shell.nix
index 2016856..0b5d6e7 100644
--- a/modules/home-manager/cli/shell.nix
+++ b/modules/home-manager/cli/shell.nix
@@ -14,13 +14,7 @@
       PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]\$ "
     '';
   };
-  programs.kitty = {
-    enable = true;
-    extraConfig = ''
-      background_opacity 0.3
-      enable_audio_bell no
-    '';
-  };
+
   programs.git = {
     enable = true;
     settings = {
@@ -28,6 +22,90 @@
       user.email = "tulg@protonmail.ch";
     };
   };
-
+  programs.fastfetch = {
+    enable = true;
+    settings = {
+      display = {
+        separator = "  ";
+      };
+      modules = [
+        {
+          type = "os";
+          key = " OS";
+          keyColor = "yellow";
+        }
+        {
+          type = "kernel";
+          key = "│ ├";
+          keyColor = "yellow";
+        }
+        {
+          type = "packages";
+          key = "│ ├󰏖";
+          keyColor = "yellow";
+        }
+        {
+          type = "shell";
+          key = "│ └";
+          keyColor = "yellow";
+        }
+        {
+          type = "wm";
+          key = " wm";
+          keyColor = "blue";
+        }
+        {
+          type = "lm";
+          key = "│ ├󰧨";
+          keyColor = "blue";
+        }
+        {
+          type = "terminal";
+          key = "│ └";
+          keyColor = "blue";
+        }
+        {
+          type = "host";
+          key = " HOST";
+          keyColor = "green";
+        }
+        {
+          type = "cpu";
+          key = "│ ├";
+          keyColor = "green";
+        }
+        {
+          type = "gpu";
+          key = "│ ├󰍛";
+          keyColor = "green";
+        }
+        {
+          type = "disk";
+          key = "│ ├";
+          keyColor = "green";
+        }
+        {
+          type = "memory";
+          key = "│ ├󰑭";
+          keyColor = "green";
+        }
+        {
+          type = "swap";
+          key = "│ ├󰓡";
+          keyColor = "green";
+        }
+        {
+          type = "uptime";
+          key = "│ ├󰅐";
+          keyColor = "green";
+        }
+        {
+          type = "display";
+          key = "│ └󰍹";
+          keyColor = "green";
+        }
+      ];
+    };
+  };
   programs.zsh.enable = true;
 }
diff --git a/modules/home-manager/cli/zellij.nix b/modules/home-manager/cli/zellij.nix
index 2f2c523..a7e5460 100644
--- a/modules/home-manager/cli/zellij.nix
+++ b/modules/home-manager/cli/zellij.nix
@@ -5,7 +5,7 @@
     settings = {
       theme = "rose-pine";
       pane_frames = false;
-      show_startup_tips = false;
+      default_layout = "compact";
     };
   };
 }
diff --git a/modules/home-manager/desktop/symlink.nix b/modules/home-manager/desktop/symlink.nix
index 806fc7d..130e8f2 100644
--- a/modules/home-manager/desktop/symlink.nix
+++ b/modules/home-manager/desktop/symlink.nix
@@ -10,10 +10,10 @@ in {
     source = link "${dots}/waybar";
     recursive = true;
   };
-  # xdg.configFile."kitty" = {
-  #   source = link "${dots}/kitty";
-  #   recursive = true;
-  # };
+  xdg.configFile."kitty" = {
+    source = link "${dots}/kitty";
+    recursive = true;
+  };
   xdg.configFile."wofi" = {
     source = link "${dots}/wofi";
     recursive = true;
@@ -22,4 +22,8 @@ in {
     source = link "${dots}/mako";
     recursive = true;
   };
+  xdg.configFile."zellij" = {
+    source = link "${dots}/zellij";
+    recursive = true;
+  };
 }
diff --git a/modules/home-manager/desktop/vscode.nix b/modules/home-manager/desktop/vscode.nix
index 36998f5..6e1c008 100644
--- a/modules/home-manager/desktop/vscode.nix
+++ b/modules/home-manager/desktop/vscode.nix
@@ -10,7 +10,7 @@
       pkgs.vscode-extensions.jnoortheen.nix-ide
       pkgs.vscode-extensions.leonardssh.vscord
     ];
-    profiles.default.userSettings = {
+    userSettings = {
       "nix.formatterPath" = "alejandra";
       "nix.extraOptions" = ''
         experimental-features = nix-command flakes
diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix
index 9198578..449688a 100644
--- a/modules/home-manager/home.nix
+++ b/modules/home-manager/home.nix
@@ -8,7 +8,6 @@
     ./cli/default.nix
     ./desktop/default.nix
     ./pkgs.nix
-    ./stylix.nix
   ];
   # Home Manager settings
   nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
diff --git a/modules/home-manager/pkgs.nix b/modules/home-manager/pkgs.nix
index 0462242..d2b8669 100644
--- a/modules/home-manager/pkgs.nix
+++ b/modules/home-manager/pkgs.nix
@@ -12,6 +12,7 @@
     restic
     rose-pine-gtk-theme
     alejandra
+
     prismlauncher
     arc-theme
     cliphist
@@ -19,7 +20,7 @@
     mpv
     vulkan-tools
     pkgs.looking-glass-client
-    fastfetch
+
     btop
     nicotine-plus
     strawberry
diff --git a/modules/home-manager/stylix.nix b/modules/home-manager/stylix.nix
index dfe7e4d..42f2295 100644
--- a/modules/home-manager/stylix.nix
+++ b/modules/home-manager/stylix.nix
@@ -5,27 +5,34 @@
   ...
 }: {
   fonts.fontconfig.enable = true;
-  programs.kitty.font.name = "Fira Code";
+  fonts.packages = with pkgs; [
+    #    noto-fonts-color-emoji
+    fira
+    fira-sans
+    fira-code
+    dejavu_fonts
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.iosevka
+  ];
   stylix = {
     enable = true;
-    targets.firefox.enable = false;
-    targets.zen-browser.enable = false;
+
     base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
 
     fonts = {
       serif = {
         package = pkgs.fira;
-        name = "Fira Sans";
+        name = "Fira Sans Regular";
       };
 
       sansSerif = {
         package = pkgs.fira;
-        name = "Fira Sans";
+        name = "Fira Sans Regular";
       };
 
       monospace = {
-        package = pkgs.fira-code;
-        name = "Fira Code";
+        package = pkgs.fira;
+        name = "Fira Sans Regular";
       };
 
       emoji = {
@@ -40,5 +47,13 @@
         popups = 10;
       };
     };
+
+    # targets.rofi.enable = false;
+    #    image = ../../assets/Shogoki.png;
+
+    # opacity = {
+    #   desktop = 0.5;
+    #   terminal = 0.9;
+    # };
   };
 }
diff --git a/modules/nixos/users/tulg.nix b/modules/nixos/users/tulg.nix
index b3dbb7d..a680273 100644
--- a/modules/nixos/users/tulg.nix
+++ b/modules/nixos/users/tulg.nix
@@ -1,5 +1,4 @@
 {
-  users.groups.media.gid = 169;
   users.users.tulg = {
     isNormalUser = true;
     description = "Tulga";
@@ -11,7 +10,6 @@
       "wheel"
       "libvirtd"
       "kvm"
-      "media"
     ];
   };
   users.users."root".openssh.authorizedKeys.keys = [
diff --git a/modules/servers/per-host/overlord/share.nix b/modules/servers/per-host/overlord/share.nix
index 0ac9318..1dd9884 100644
--- a/modules/servers/per-host/overlord/share.nix
+++ b/modules/servers/per-host/overlord/share.nix
@@ -1,7 +1,7 @@
 {
   fileSystems."/export/share" = {
     device = "/mnt/2tbhdd";
-    fsType = "none";
+    fsType = "nfs";
     options = ["bind"];
   };
   services.nfs.server = {
@@ -12,9 +12,13 @@
     statdPort = 4000;
     extraNfsdConfig = '''';
     exports = ''
-      /export/share *(rw,sync,no_subtree_check)
+      /export/share *(rw,sync,no_subtree_check,all_squash,insecure,anonuid=1000,anongid=100)
     '';
   };
+  users.users.tulg = {
+    createHome = false;
+    shell = "/run/current-system/sw/bin/nologin";
+  };
   networking.firewall = {
     enable = true;
     # for NFSv3; view with `rpcinfo -p`
@@ -25,11 +29,12 @@
     enable = true;
 
     shares.share = {
-      path = "/mnt/2tbhdd/nfs";
+      path = "/mnt/2tbhdd/smb/";
       browseable = "yes";
       writable = "yes";
       "guest ok" = "yes";
       "read only" = "no";
+      "force user" = "nobody";
     };
   };
 }