Lock file maintenance

flake.lock

@@ -39,11 +39,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1701250978,
+        "lastModified": 1701020860,
-        "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=",
+        "narHash": "sha256-NwnRn04C8s+hH+KdVtGmVB1FFNIG7DtPJmQSCBDaET4=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "8772491ed75f150f02552c60694e1beff9f46013",
+        "rev": "b006ec52fce23b1d57f6ab4a42d7400732e9a0a2",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1701264997,
+        "lastModified": 1701198182,
-        "narHash": "sha256-0Q9gNAxk//uaXJd5llBP+1TbgP7FgCZBVdX0rYd3MvM=",
+        "narHash": "sha256-gw6L45n6J/DdQRWKZJbnJVPs6rx+eDMkyjsKS92fBVw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "b80c72c7ddbf79147d64759c8659eb5939d0327e",
+        "rev": "e2f18f8c7f95e4094acb94c5a06dc6d75d7fc9c1",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701068326,
+        "lastModified": 1700794826,
-        "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
+        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
+        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1701297900,
+        "lastModified": 1701203997,
-        "narHash": "sha256-P2iNMqLm8lgcfsuLQEAPmbZeYomWfckTNA2TEDLlER8=",
+        "narHash": "sha256-p7u4S+JyqeSY69RoMxYH4G2z8VWBTw2AHt0M/DMa8o8=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "64dba129a417f506338de690a3e8b8829e7d8df6",
+        "rev": "c713d19b37b4ee88925a6fcf653a9f2af73e82e0",
         "type": "github"
       },
       "original": {

modules/home/cli/other/default.nix

@@ -13,6 +13,5 @@
     pipes-rs
     cmatrix
     cava
-    sl
   ];
 }

modules/home/wayland/apps/default.nix

@@ -1 +1 @@
-{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waylock ./wofi ]; }
+{ ... }: { imports = [ ./dunst ./eww ./kanshi ./waybar ./waylock ./wofi ]; }

modules/home/wayland/apps/dunst/default.nix

@@ -9,7 +9,7 @@
         global = {
           follow = "mouse";
           height = "200";
-          width = "350";
+          width = "400";
           scale = "0";
           origin = "top-right";
           offset =
@@ -17,9 +17,9 @@
           notification_limit = "0";
           progress_bar = "true";
           progress_bar_height = "10";
-          progress_bar_frame_width = "1";
+          progress_bar_frame_width = "0";
-          progress_bar_min_width = "150";
+          progress_bar_min_width = "350";
-          progress_bar_max_width = "350";
+          progress_bar_max_width = "400";
           indicate_hidden = "yes";
           transparency = "0";
           separator_height = "2";

modules/home/wayland/apps/eww/bar/css/_sys.scss

@@ -23,6 +23,15 @@ color: $base0B;
     margin: $gaps-window 0;
 }
 
+
+.icon-text {
+    padding: 5pt;
+    font-size: 5pt;
+    font-weight: 900;
+}
+
+
+
 .cpu-core-usage, .gpu-core-usage, .memory-usage {
     background-color: $bg0;
     border-radius: $border-radius;

modules/home/wayland/apps/eww/bar/eww.scss

@@ -41,30 +41,24 @@ tooltip {
 .icon,
 .icon label { font-family: Material Design Icons; }
 
-.icon-text {
-  padding: 4pt;
-  font-size: 6pt;
-  font-weight: 900;
-}
-
 .grey {
-  color: $base02;
+  background-color: $base02;
 }
 
 .red {
-  color: $base0F;
+  background-color: $base0F;
 }
 
 .orange {
-  color: $base08;
+  background-color: $base08;
 }
 
 .green {
-  color: $base0B;
+  background-color: $base0B;
 }
 
 .blue {
-  color: $base0C;
+  background-color: $base0C;
 }
 
 /* WINDOW WRAPPER CSS */
@@ -122,3 +116,17 @@ tooltip {
 .bar label {
   font-size: 1.2rem;
 }
+
+/* WORKSPACE */
+
+.ws {
+  border-radius: $border-radius;
+  margin: $gaps-window;
+}
+
+.focused {
+  background-color: $bg1;
+  border-radius: 1rem;
+  margin: .3rem;
+  padding: .25rem;
+}

modules/home/wayland/apps/eww/bar/modules/workspaces.yuck

@@ -1,22 +1,17 @@
 (deflisten workspace :initial '[]' "scripts/workspaces")
 
 (defwidget workspace-mod []
-  	(module
+  (module
-  	  	(eventbox
+  (eventbox
 		:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
-			(box
+		(box
-				:class "module workspaces"
+			:class "module workspaces"
-				:orientation "v"
+            :orientation "v"
-				(for ws in workspace
+		  (for ws in workspace
-					(button
+		    (button
-						:onclick "hyprctl dispatch workspace ${ws.number}"
+					:onclick "hyprctl dispatch workspace ${ws.number}"
-						(label 
+					:class "ws icon ${ws.color}"
-							:class "icon-text  ${ws.color}"
+					; :tooltip {ws.tooltip}
-							:text `${ws.focused ? "󰜗" : "󰝥"}`
+					(box
-						)
+						:class `${ws.focused ? "focused" : ""}`
-					)
+						:height 3)))))))
-				)
-			)
-	  	)
-	)
-)

modules/home/wayland/apps/eww/default.nix

@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: {
 
   config = lib.mkIf (config.homecfg.wm == "Wayland") {
-    home.packages = with pkgs; [ eww-wayland jaq custom.amdgpu_top ];
+    home.packages = with pkgs; [ eww-wayland jaq ];
 
     xdg.configFile."eww" = {
       source = lib.cleanSourceWith {

modules/home/wayland/apps/waylock/default.nix

@@ -50,5 +50,59 @@
       caps-lock-key-hl-color=${config.colorscheme.colors.base09}FF
       caps-lock-bs-hl-color=${config.colorscheme.colors.base09}FF
     '';
+
+    xdg.configFile."wlogout/style.css".text = ''
+      window {
+          font-family: Material Design Icons;
+          font-size: 64pt;
+          color: #${config.colorscheme.colors.base07};
+          background-color: alpha(#${config.colorscheme.colors.base00},0.6);
+      }
+
+      button {
+          border-radius:${config.colorscheme.colors.border-radius}px;
+          border-width: ${config.colorscheme.colors.border-width}px;
+          border-style: solid;
+          border-color: #${config.colorscheme.colors.base04};
+          color: #${config.colorscheme.colors.base07};
+          padding: 20px;
+          background-color: alpha(#${config.colorscheme.colors.base00},0.8);
+          transition: box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out;
+      }
+
+      button:hover {
+          background-color: alpha(#${config.colorscheme.colors.base02},0.8);
+      }
+
+      button:focus {
+          background-color: alpha(#${config.colorscheme.colors.base02},1.0);
+          border-radius:${config.colorscheme.colors.border-radius}px;
+          border-width: ${config.colorscheme.colors.border-width}px;
+          border-color: #${config.colorscheme.colors.base04};
+          border-style: solid;
+      }
+
+    '';
+
+    xdg.configFile."wlogout/layout".text = ''
+      {
+          "label" : "lock",
+          "action" : "swaylock",
+          "text" : "󰌾",
+          "keybind" : "l"
+      }
+      {
+          "label" : "reboot",
+          "action" : "systemctl reboot",
+          "text" : "󰜉",
+          "keybind" : "r"
+      }
+      {
+          "label" : "shutdown",
+          "action" : "systemctl poweroff",
+          "text" : "󰐥",
+          "keybind" : "s"
+      }
+    '';
   };
 }

modules/home/wayland/hyprland/config.nix

@@ -117,6 +117,8 @@
         windowrule = float, title:^(Volume Control)$
         windowrule = float, title:^(Picture-in-Picture)$
         windowrule = float, title:^(Steam)$
+        windowrule = fullscreen, title:^(wlogout)$
+        windowrule = float, title:^(wlogout)$
 
         windowrulev2 = workspace 2 silent, class:^(org.telegram.desktop)$
         windowrulev2 = workspace 2 silent, class:^(discord)$

modules/nixos/system/hw/fs/default.nix

@@ -1,6 +1,5 @@
 { pkgs, ... }: {
   services.fstrim.enable = true; # Improves SSD life
-  services.gvfs.enable = true; # User Mounted FS
 
-  environment.systemPackages = with pkgs; [ nfs-utils ];
+  environment.systemPackages = with pkgs; [ gvfs nfs-utils ];
 }

modules/nixos/system/network/bluetooth/default.nix

@@ -1,5 +1,4 @@
 { pkgs, ... }: {
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
-  environment.systemPackages = with pkgs; [ bluez bluez-tools ];
 }