Refactoring of variables

config/home.nix

@@ -76,6 +76,8 @@
 	spotify-tui
 	wiki-tui
 	speedcrunch
+	thefuck
+	eza
 
 	#Desktop
 	aerc
@@ -94,7 +96,8 @@
     obsidian
     lazygit
 	betterdiscordctl
-
+	audacity
+	pdfarranger
 
 	#Dev
     python3

flake.nix

@@ -34,20 +34,32 @@
     # NixOS configuration entrypoint
     # Available through 'nixos-rebuild --flake .#your-hostname'
     nixosConfigurations = {
-      nix-laptop = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+      laptop = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+			inherit inputs outputs;
+			myhostname = "laptop";
+		};
         modules = [./maskiner/laptop/configuration.nix];
       };
-      nix-desktop = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+      desktop = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+			inherit inputs outputs;
+			myhostname = "desktop";
+		};
         modules = [./maskiner/desktop/configuration.nix];
       };
-      fw-jobb = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+      jobb = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+			inherit inputs outputs;
+			myhostname = "jobb";
+		};
         modules = [./maskiner/jobb/configuration.nix];
       };
       server = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs;};
+        specialArgs = {
+			inherit inputs outputs;
+			myhostname = "server";
+		};
 		inherit system;
         modules = [
 			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
@@ -59,28 +71,28 @@
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'
     homeConfigurations = {
-      "fw@nix-laptop" = home-manager.lib.homeManagerConfiguration {
+      "fw@laptop" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {
 			inherit inputs outputs;
-			myhostname = "nix-laptop";
+			myhostname = "laptop";
 		};
         modules = [./config/home.nix];
       };
-      "fw@nix-desktop" = home-manager.lib.homeManagerConfiguration {
+      "fw@desktop" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {
 			inherit inputs outputs;
-			myhostname = "nix-desktop";
+			myhostname = "desktop";
 		};
         # > Our main home-manager configuration file <
         modules = [./config/home.nix];
       };
-      "fw@fw-jobb" = home-manager.lib.homeManagerConfiguration {
+      "fw@jobb" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {
 			inherit inputs outputs;
-			myhostname = "fw-jobb";
+			myhostname = "jobb";
 		};
         # > Our main home-manager configuration file <
         modules = [./config/home.nix];

maskiner/desktop/configuration.nix

@@ -5,6 +5,7 @@
   lib,
   config,
   pkgs,
+  myhostname,
   ...
 }: {
   # You can import other NixOS modules here
@@ -15,7 +16,7 @@
   ];
 
   security.rtkit.enable = true;
-  networking.hostName = "nix-desktop";
+  networking.hostName = myhostname;
 
   services.xserver.dpi = 100;
 

maskiner/jobb/configuration.nix

@@ -5,6 +5,7 @@
   lib,
   config,
   pkgs,
+  myhostname,
   ...
 }: {
   # You can import other NixOS modules here
@@ -14,7 +15,7 @@
 	../../config/users.nix
   ];
 
-  networking.hostName = "fw-jobb";
+  networking.hostName = myhostname;
 
   services.xserver.dpi = 140;
 

maskiner/laptop/configuration.nix

@@ -5,6 +5,7 @@
   lib,
   config,
   pkgs,
+  myhostname,
   ...
 }: {
 	# You can import other NixOS modules here
@@ -14,7 +15,7 @@
 	../../config/users.nix
 	];
 
-	networking.hostName = "nix-laptop";
+	networking.hostName = myhostname;
 
 	services.xserver.dpi = 140;
 

maskiner/server/configuration.nix

@@ -5,6 +5,7 @@
   lib,
   config,
   pkgs,
+  myhostname,
   ...
 }: {
 	# You can import other NixOS modules here
@@ -14,7 +15,7 @@
 		../../moduler/common/nginx.nix
 	];
 
-	networking.hostName = "server";
+	networking.hostName = myhostname;
   nixpkgs = {
     overlays = [
     ];

moduler/common/dwm.nix

@@ -2,10 +2,10 @@
 let
   dwm = pkgs.dwm.overrideAttrs (old: {
     src = builtins.fetchGit {
-      # url = "https://github.com/FredzyW/dwm-conf.git";
-      # rev = "99a1e812295bcf65625a4b5a0dc1022658977920";
-      url = "https://git.wastring.com/fw/dwm.git";
-      rev = "04039f157960b83f1ab8abebb0ea77c72a75a249";
+      url = "https://github.com/FredzyW/dwm-conf.git";
+      rev = "99a1e812295bcf65625a4b5a0dc1022658977920";
+      # url = "https://git.wastring.com/fw/dwm.git";
+      # rev = "04039f157960b83f1ab8abebb0ea77c72a75a249";
     };
     nativeBuildInputs = with pkgs; [ 
       xorg.libX11.dev
@@ -16,17 +16,17 @@ let
   });
   dwmblocks = if myhostname == "nix-desktop" then pkgs.dwmblocks.overrideAttrs (old: {
     src = builtins.fetchGit {
-      # url = "https://github.com/FredzyW/dwmblocks.git";
-      # rev = "a334789ec7b9171a3c8e1fcac2ffe8463ee438dc";
-      url = "https://git.wastring.com/fw/dwmblocks.git";
-      rev = "ce19d482155f3292dc77179a2485670a48d2669c";
+      url = "https://github.com/FredzyW/dwmblocks.git";
+      rev = "a334789ec7b9171a3c8e1fcac2ffe8463ee438dc";
+      # url = "https://git.wastring.com/fw/dwmblocks.git";
+      # rev = "ce19d482155f3292dc77179a2485670a48d2669c";
     };
   }) else pkgs.dwmblocks.overrideAttrs (old: {
     src = builtins.fetchGit {
-      # url = "https://github.com/FredzyW/dwmblocks.git";
-      # rev = "7c81c55390f2deec2a3804217abe80221ef6f46a";
-      url = "https://git.wastring.com/fw/dwmblocks.git";
-      rev = "52198f692f5965b3e86577e8481e035d4c37ab52";
+      url = "https://github.com/FredzyW/dwmblocks.git";
+      rev = "7c81c55390f2deec2a3804217abe80221ef6f46a";
+      # url = "https://git.wastring.com/fw/dwmblocks.git";
+      # rev = "52198f692f5965b3e86577e8481e035d4c37ab52";
     };
   });
 in

moduler/common/zsh.nix

@@ -19,6 +19,14 @@
         name = "powerlevel10k";
         src = pkgs.zsh-powerlevel10k;
         file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+      }
+	  {
+        name = "zsh-syntax-highlighting";
+        src = pkgs.zsh-syntax-highlighting;
+      }
+	  {
+        name = "zsh-autosuggestions";
+        src = pkgs.zsh-autosuggestions;
       }
     ];
     profileExtra = "
@@ -27,8 +35,8 @@
       fi
     ";
     shellAliases = {
-      ls="ls --color=auto";
-      ll="ls -al --color=auto";
+      ls="eza";
+      ll="eza -al";
       ccr="gcc intopt.c && ./a.out";
       homec="nvim ~/nix/config/home.nix";
       nvimc="nvim ~/.config/nvim/init.lua";
@@ -65,6 +73,7 @@
     # autoload -Uz compinit
     autoload -U compinit; compinit
     zstyle ':completion:*' menu select
+	eval $(thefuck --alias)
 
     '';
   };