Moved all to moduler

maskiner/desktop/configuration.nix

@@ -11,9 +11,9 @@
   # You can import other NixOS modules here
   imports = [
     ./hardware-configuration.nix
-	../../config/base.nix
-	../../config/users.nix
-	../../shared/nginx.nix
+	../../moduler/base.nix
+	../../moduler/users.nix
+	../../moduler/nginx.nix
   ];
 
 	environment.systemPackages = with pkgs; [

maskiner/jobb/configuration.nix

@@ -11,24 +11,24 @@
   ...
 }: 
 let
-  btusb = pkgs.callPackage ../../config/btusb.nix { inherit (config.boot.kernelPackages) kernel; };
+  btusb = pkgs.callPackage ../../moduler/btusb.nix { inherit (config.boot.kernelPackages) kernel; };
 in
 {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
 	  inputs.home-manager.nixosModules.home-manager
-	../../config/users.nix
-	../../config/network.nix
-	../../config/programs.nix
-	../../config/system.nix
-	../../config/dev.nix
-	../../config/lsp.nix
-	../../config/sway.nix
-	../../config/hyprland.nix
+	../../moduler/users.nix
+	../../moduler/network.nix
+	../../moduler/programs.nix
+	../../moduler/system.nix
+	../../moduler/dev.nix
+	../../moduler/lsp.nix
+	../../moduler/sway.nix
+	../../moduler/hyprland.nix
     ];
 
-home-manager.extraSpecialArgs = { inherit inputs; };
+home-manager.extraSpecialArgs = { inherit inputs pkgs; };
 	home-manager.users.fw = {
     imports = [
       ./../../config/home.nix

maskiner/jobb/configuration.nix.bak

@@ -11,8 +11,8 @@
   # You can import other NixOS modules here
   imports = [
     ./hardware-configuration.nix
-	../../config/base.nix
-	../../config/users.nix
+	../../moduler/base.nix
+	../../moduler/users.nix
   ];
 
   	environment.systemPackages = with pkgs; [

maskiner/laptop/configuration.nix

@@ -12,8 +12,8 @@
   # You can import other NixOS modules here
   imports = [
     ./hardware-configuration.nix
-    ../../config/base.nix
-    ../../config/users.nix
+    ../../moduler/base.nix
+    ../../moduler/users.nix
   ];
 
   networking.hostName = myhostname;

maskiner/macmini/configuration.nix

@@ -12,7 +12,7 @@
   # You can import other NixOS modules here
   imports = [
     ./hardware-configuration.nix
-    ../../config/users.nix
+    ../../moduler/users.nix
   ];
 
   environment.systemPackages = with pkgs; [

maskiner/work-desktop/configuration.nix

@@ -12,13 +12,13 @@
   # You can import other NixOS modules here
   imports = [
     ./hardware-configuration.nix
-    ../../shared/openssh.nix
-	../../config/users.nix
-    ../../config/dev.nix
-    ../../config/lsp.nix
-    ../../config/network.nix
-    ../../config/system.nix
-    ../../config/k3s.nix
+    ../../moduler/openssh.nix
+	../../moduler/users.nix
+    ../../moduler/dev.nix
+    ../../moduler/lsp.nix
+    ../../moduler/network.nix
+    ../../moduler/system.nix
+    ../../moduler/k3s.nix
   ];
   nixpkgs = {
     overlays = [

moduler/dmenu.nix

@@ -7,7 +7,7 @@ let
     #   imlib2
     #   xorg.libXinerama
     # ];
-	patches = [ ../config/dmenu-center.diff ];
+	patches = [ ../moduler/dmenu-center.diff ];
   });
 in
 {

moduler/hyprland.nix

@@ -80,7 +80,7 @@ in
             };
 
             decoration = {
-              rounding = 15;
+              rounding = 0;
               active_opacity = 0.9;
               inactive_opacity = 0.8;
               fullscreen_opacity = 0.9;
@@ -102,7 +102,7 @@ in
             };
 
             animations = {
-              enabled = true;
+              enabled = false;
               bezier = [
                 "linear, 0, 0, 1, 1"
                 "md3_standard, 0.2, 0, 0, 1"
@@ -201,7 +201,7 @@ in
 
               # Applications
               "$mod, q, exec, ${pkgs.firefox}/bin/firefox"
-              "$mod, d, exec, ${pkgs.wmenu}/bin/wmenu-run"
+              "$mod, d, exec, ${pkgs.rofi}/bin/rofi"
 
 
               # Screencapture

moduler/lazygit.nix

@@ -5,23 +5,6 @@
 		enable = true;
 		settings = {
 		  gui = {
-		  	# Mocha
-			 #  theme = {
-				#   activeBorderColor = [ "#f5a97f" "bold" ];
-				#   inactiveBorderColor = [ "#a5adcb" ];
-				#   optionsTextColor = [ "#8aadf4" ];
-				#   selectedLineBgColor = [ "#363a4f" ];
-				#   cherryPickedCommitBgColor = [ "#494d64" ];
-				#   cherryPickedCommitFgColor = [ "#f5a97f" ];
-				#   unstagedChangesColor = [ "#ed8796" ];
-				#   defaultFgColor = [ "#cad3f5" ];
-				#   searchingActiveBorderColor = [ "#eed49f" ];
-				# };
-				#
-				# authorColors = {
-				#   "*" = "#b7bdf8";
-				# };
-			# Latte
 			theme = {
 				 activeBorderColor = [ "#fe640b" "bold" ];
 				 inactiveBorderColor = [ "#6c6f85" ];

moduler/tmux.nix

@@ -12,12 +12,12 @@
       tmuxPlugins.sensible
       tmuxPlugins.pain-control
       tmuxPlugins.sessionist
-      # {
-      #   plugin = pkgs.fw-pkgs.tmuxPlugins.minimal;
-      #   extraConfig = ''
-      #     				bind-key b set-option status
-      #     			'';
-      # }
+      {
+        plugin = fw-pkgs.tmuxPlugins.minimal;
+        extraConfig = ''
+			bind-key b set-option status
+		'';
+      }
 
     ];
     extraConfig = ''