Moved some files

config/home.nix

@@ -9,22 +9,22 @@
   ...
 }: {
   imports = [
-    ../moduler/common/dwm.nix
-    ../moduler/common/dmenu.nix
-    ../moduler/common/kitty.nix
-    ../moduler/common/tmux.nix
-    ../moduler/common/vim.nix
-    ../moduler/common/fish.nix 
-    ../moduler/common/git.nix
-    ../moduler/common/nixpkgs.nix
-    ../moduler/common/firefox.nix
-    ../moduler/common/zathura.nix
-    ../moduler/common/lazygit.nix
-    ../moduler/common/spotifyd.nix
-    ../moduler/common/ssh.nix
-    ../moduler/common/aerc.nix
-    ../moduler/common/rbw.nix
-    ../moduler/common/oh-my-posh.nix
+    ../shared/dwm.nix
+    ../shared/dmenu.nix
+    ../shared/kitty.nix
+    ../shared/tmux.nix
+    ../shared/vim.nix
+    ../shared/fish.nix 
+    ../shared/git.nix
+    ../shared/nixpkgs.nix
+    ../shared/firefox.nix
+    ../shared/zathura.nix
+    ../shared/lazygit.nix
+    ../shared/spotifyd.nix
+    ../shared/ssh.nix
+    ../shared/aerc.nix
+    ../shared/rbw.nix
+    ../shared/oh-my-posh.nix
   ];
 
   nixpkgs = {

config/server.nix

@@ -10,11 +10,11 @@
   ...
 }: {
   imports = [
-    ../moduler/common/git.nix
-    ../moduler/common/tmux.nix
-    ../moduler/common/nixpkgs.nix
-    ../moduler/common/lazygit.nix
-    ../moduler/common/zsh-server.nix
+    ../shared/git.nix
+    ../shared/tmux.nix
+    ../shared/nixpkgs.nix
+    ../shared/lazygit.nix
+    ../shared/zsh-server.nix
   ];
 
   nixpkgs = {

maskiner/desktop/configuration.nix

@@ -13,7 +13,7 @@
     ./hardware-configuration.nix
 	../../config/base.nix
 	../../config/users.nix
-	../../moduler/common/nginx.nix
+	../../shared/nginx.nix
   ];
 
 	environment.systemPackages = with pkgs; [

maskiner/server/configuration.nix

@@ -12,7 +12,7 @@
 	imports = [
 		./hardware-configuration.nix
 		../../config/users.nix
-		../../moduler/common/nginx.nix
+		../../shared/nginx.nix
 	];
 
 	networking.hostName = myhostname;

shared/fish.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
 	programs.fish = {
 		enable = true;
@@ -20,14 +20,6 @@
 			 name = "foreign-env";
 			 src = pkgs.fishPlugins.foreign-env.src;
 		   }
-		  #  {
-			 # name = "pure";
-			 # src = pkgs.fishPlugins.pure.src;
-		  #  }
-		  #  {
-			 # name = "tide";
-			 # src = pkgs.fishPlugins.tide.src;
-		  #  }
 		   {
 		   	 name = "fzf";
 			 src = pkgs.fishPlugins.fzf.src;
@@ -50,20 +42,11 @@
 		  ls="exa -lag --header";
 		  dev="nix develop --command fish";
 		  spot="steam-run ~/program/spotify_player";
+		  sc="sc-im";
 	  };
 	  interactiveShellInit = ''
 		set fish_greeting # Disable greeting
 		set -Ux FZF_DEFAULT_OPTS "--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4"
-		# set --universal pure_symbol_prompt 
-		# set --universal pure_enable_nixdevshell true
-		# set --universal pure_color_primary f5a97f
-		# set --universal pure_color_danger ed8796
-		# set --universal pure_color_success a6da95
-		# set --universal pure_color_warning eed49f
-		# set --universal pure_color_light f4dbd6
-		# set --universal pure_color_mute c6a0f6
-		# set --universal pure_color_danger ed8796
-		# set --universal pure_color_danger ed8796
 	  '';
 	};
 }