Merge branch 'main' of https://git.wastring.com/fw/nix

maskiner/legacy/configuration.nix

@@ -40,7 +40,28 @@ in
   home-manager.users.fw = {
     imports = [
       ./../../moduler/home.nix
+      ./../../moduler/programs/waybar
+      inputs.catppuccin.homeModules.catppuccin
     ];
+	waybar = {
+		enable = true;
+		configPath =  ./../../moduler/programs/waybar/waybar-laptop.jsonc;
+	};
+    gtk = {
+      enable = true;
+      iconTheme = {
+        name = "oomox-gruvbox-dark";
+        package = pkgs.gruvbox-dark-icons-gtk;
+      };
+    };
+    catppuccin = {
+      librewolf = {
+        enable = true;
+        flavor = "latte";
+        accent = "peach";
+      };
+    };
+    programs.ranger.enable = true;
     stylix.targets = {
       lazygit.enable = false;
       fish.enable = false;
@@ -70,6 +91,17 @@ in
       };
     };
   };
+  security.sudo.wheelNeedsPassword = false;
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDALsdpwvC0w/Aj+1fWtzJyyWoUrGkdh8o2thVHeQQBNo0D7cmVberYmi4Cv9gWGX6PaElrnOl0KRdGyro2wxOYokSxgk2VgWW67BFITAQAbKyG2NhXXPbhb4jccDo7WH7TtOG8IofuJTPRu1Duda6k4RN0I0CkyAN6LGX+zy49cq0qKf9ijXYhCDYNih3+Fu/ig0aW/SYmsVoUl2VFTWdI5x5/wLvIjTEZhmAtYIeYADaLnom356cFrUysZa++FUujQAz3Ow236BvP95XZdTsqvfWNZFNIpC9VYF72JeIDCs5wDIr0GFmanF2On1nar+jJpoOE8SdHt357p5g/PqXV5TisN2xQRkqVwO9tWtMl4sF84jA4ULnY2gQWv9jErMxymUQ1IwuPUzDDlbRHCtfexAtkBy7wv6xslKAzG1QahvF/btNs5Caj3LN31rgAuxyooCbKGKTeBP3kHPKcz1iupgidfbO/QqVXBRQJTEdGyAKa8hVmLQZZPC/XUhxESAk= fw@fw-nix"
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8ku8iCb7tXd/tfxYDW+Tj8K9kpfrYZciYUZ6tBpO80inm4EImtfyEeJTuqDWMKov2BftUKs8brNeTBCXUEvU1P0+cpOP9RtYA5tfBXf3su+iVSswJJStIxNboXHrEGKdJJRNsTv/9agshDSUBy6G5TI1cXhv/updornfA4fwOMqOmtlYEn6XCRnsrO6NBLc/uLckdbF75HOsoLvezRvuqTLjpapjaUKGVPrgNXiclIKHmuOx71kgD4FX3rSz9FgKjnfu3a7DBbrHsf/g+N9PjNF1muN9UOV6nK3WwiO9BMWi7NpAWfzJOeZg9chqzI+U6CcsqYVeESgL41so+dnv3 fw@laptop"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP34dnsZSnWdDvd+3BXDwcw7wP0PjPEx2eCdBQJyGD6O fw@laptop"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII60tdNsG0z9q2jHmoTKvkeLQE6OF0bmTsDX1bpqpoG7 fw@jobb"
+  ];
+
+  services.upower = {
+  	enable = true;
+  };
 
   system.stateVersion = "25.05";
 }

moduler/hyprland.nix

@@ -94,11 +94,11 @@ in
             splash = false;
             splash_offset = 2.0;
 
-            preload = [ "/home/fw/nix/wallpapers/nix-wallpaper-nineish-catppuccin-mocha.png" "/home/fw/nix/wallpapers/blue.png" ];
+            preload = [ "/home/fw/nix/wallpapers/nix-wallpaper-nineish-catppuccin-mocha.png" "/home/fw/nix/wallpapers/nix-wallpaper-nineish-catppuccin-latte.png" ];
 
             wallpaper = [
-              "DP-1,/home/fw/nix/wallpapers/blue.png"
+              "DP-1,/home/fw/nix/wallpapers/nix-wallpaper-nineish-catppuccin-latte.png"
-              "eDP-1,/home/fw/nix/wallpapers/blue.png"
+              "eDP-1,/home/fw/nix/wallpapers/nix-wallpaper-nineish-catppuccin-latte.png"
             ];
           };
         };
@@ -117,7 +117,7 @@ in
           monitor = [
             "desc: ASUSTek COMPUTER INC ASUS PA279CV S4LMTF159462 (DP-1), 3840x2160@60, 0x0, 1.5, transform, 1"
             "desc: ASUSTek COMPUTER INC VG279 JBLMQS021792 (DP-1), 1920x1080@144, 0x0, 1"
-            "eDP-1, 1920x1080@60, 0x0, 1, transform, 2"
+            "eDP-1, 1920x1080@60, 0x0, 1, transform, 0"
             ",prefered,auto,1"
           ];
 

moduler/programs/waybar/waybar-laptop.jsonc

@@ -13,6 +13,7 @@
 		"bluetooth",
 		"pulseaudio",
 		"upower",
+		"network",
 		"clock"
 	],
 	"mpris": {
@@ -42,6 +43,18 @@
 		"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
 		"on-click": "pgrep .blueman-manage && pkill .blueman-manage || blueman-manager &"
 	},
+	"network": {
+		"interface": "wlp1s0",
+		"format": "{ifname}",
+		"format-wifi": " {essid} ({signalStrength}%)",
+		"format-ethernet": "{ifname} ",
+		"format-disconnected": "no signal", //An empty format will hide the module.
+		"tooltip-format": "{ifname}",
+		"tooltip-format-wifi": "{essid} ({signalStrength}%) ",
+		"tooltip-format-ethernet": "{ifname} ",
+		"tooltip-format-disconnected": "Disconnected",
+		"max-length": 50
+	},
 	"upower": {
 		"icon-size": 20,
 		"hide-if-empty": true,

moduler/programs/waybar/waybar-latte.css

@@ -33,7 +33,7 @@ window#waybar.termite { background: @base; }
 window#waybar.chromium { background: @base; border: none; }
 
 /* -------- Module “pill” look -------- */
-#workspaces, #clock, #mpris, #pulseaudio, #bluetooth, #upower {
+#workspaces, #clock, #mpris, #pulseaudio, #bluetooth, #upower, #network {
   background: @base;
   border: none;
   border-radius: 5px;
@@ -133,7 +133,15 @@ button:active {
 }
 
 /* -------- Upower -------- */
-#bluetooth {
+#upower {
+  background: @green;
+  color: @base;
+  font-weight: 600;
+  letter-spacing: 0.2px;
+}
+
+/* -------- Network -------- */
+#network {
   background: @green;
   color: @base;
   font-weight: 600;

moduler/programs/waybar/waybar-mocha.css

@@ -139,6 +139,14 @@ button:active {
   letter-spacing: 0.2px;
 }
 
+/* -------- Network -------- */
+#network {
+  background: @green;
+  color: @base;
+  font-weight: 600;
+  letter-spacing: 0.2px;
+}
+
 /* -------- Helpers -------- */
 @keyframes blink {
   to { background-color: @peach; color: @base; }