more overhaul

etcnixos/flake.lock

@@ -33,11 +33,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729348269,
+        "lastModified": 1729599319,
-        "narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=",
+        "narHash": "sha256-e/4JPcIRte5zkwqmGFrFo3763e0iHURX6N0apz4jbI0=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "528723447ef037a1c081add43f4fd46440c9c3b1",
+        "rev": "1b86b304c8eb1437d9337a760e7f930826fc4d6d",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729027341,
+        "lastModified": 1729414726,
-        "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
+        "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
+        "rev": "fe56302339bb28e3471632379d733547caec8103",
         "type": "github"
       },
       "original": {
@@ -208,11 +208,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728974938,
+        "lastModified": 1729177642,
-        "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=",
+        "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "23170582b0658e6afd913149a58863af3a57b376",
+        "rev": "bb69165ff372ddbd3228a03513922acd783040e8",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1729455275,
+        "lastModified": 1729742320,
-        "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=",
+        "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36",
+        "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729471405,
+        "lastModified": 1729878015,
-        "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=",
+        "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413",
+        "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085",
         "type": "github"
       },
       "original": {

home-manager/flake.lock

@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729459288,
+        "lastModified": 1729864948,
-        "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
+        "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
+        "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0",
         "type": "github"
       },
       "original": {
@@ -98,11 +98,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1729450307,
+        "lastModified": 1729841254,
-        "narHash": "sha256-jhpL4ttlp8kxBurzfdlNsnI0n3iOkpy0iDaSMG1DzqE=",
+        "narHash": "sha256-KywrT/D1yMOLxc2xDJAPx9Z+qVoQw5rCScQR/lU3NTc=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "bfe9f1a9906e66c83cb073d281920e902cd63e01",
+        "rev": "d7c058c0c0b8cd5b799a3a3ac4f8a1090454155e",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1729444736,
+        "lastModified": 1729744939,
-        "narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=",
+        "narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af",
+        "rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729471405,
+        "lastModified": 1729878015,
-        "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=",
+        "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413",
+        "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1729181673,
+        "lastModified": 1729691686,
-        "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
+        "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
+        "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729391507,
+        "lastModified": 1729823394,
-        "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=",
+        "narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "784981a9feeba406de38c1c9a3decf966d853cca",
+        "rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f",
         "type": "github"
       },
       "original": {
@@ -253,11 +253,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1729139001,
+        "lastModified": 1729838433,
-        "narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=",
+        "narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499",
+        "rev": "67efa2c559b53d3ca90c131c06c247278783880d",
         "type": "github"
       },
       "original": {

home-manager/progs/swaylock.nix

@@ -1,31 +1,37 @@
+{ pkgs, ... }:
 {
-  color = "24273a";
+  programs.swaylock = {
-  bs-hl-color = "f4dbd6";
+    enable = true;
-  caps-lock-bs-hl-color = "f4dbd6";
+    settings = {
-  caps-lock-key-hl-color = "a6da95";
+      color = "24273a";
-  inside-color = 0;
+      bs-hl-color = "f4dbd6";
-  inside-clear-color = 0;
+      caps-lock-bs-hl-color = "f4dbd6";
-  inside-caps-lock-color = 0;
+      caps-lock-key-hl-color = "a6da95";
-  inside-ver-color = 0;
+      inside-color = 0;
-  inside-wrong-color = 0;
+      inside-clear-color = 0;
-  key-hl-color = "a6da95";
+      inside-caps-lock-color = 0;
-  layout-bg-color = 0;
+      inside-ver-color = 0;
-  layout-border-color = 0;
+      inside-wrong-color = 0;
-  layout-text-color = "cad3f5";
+      key-hl-color = "a6da95";
-  line-color = 0;
+      layout-bg-color = 0;
-  line-clear-color = 0;
+      layout-border-color = 0;
-  line-caps-lock-color = 0;
+      layout-text-color = "cad3f5";
-  line-ver-color = 0;
+      line-color = 0;
-  line-wrong-color = 0;
+      line-clear-color = 0;
-  ring-color = "b7bdf8";
+      line-caps-lock-color = 0;
-  ring-clear-color = "f4dbd6";
+      line-ver-color = 0;
-  ring-caps-lock-color = "f5a97f";
+      line-wrong-color = 0;
-  ring-ver-color = "8aadf4";
+      ring-color = "b7bdf8";
-  ring-wrong-color = "ee99a0";
+      ring-clear-color = "f4dbd6";
-  separator-color = 0;
+      ring-caps-lock-color = "f5a97f";
-  text-color = "cad3f5";
+      ring-ver-color = "8aadf4";
-  text-clear-color = "f4dbd6";
+      ring-wrong-color = "ee99a0";
-  text-caps-lock-color = "f5a97f";
+      separator-color = 0;
-  text-ver-color = "8aadf4";
+      text-color = "cad3f5";
-  text-wrong-color = "ee99a0";
+      text-clear-color = "f4dbd6";
+      text-caps-lock-color = "f5a97f";
+      text-ver-color = "8aadf4";
+      text-wrong-color = "ee99a0";
+    };
+  };
 }

home-manager/progs/waybar.nix

@@ -1,270 +1,273 @@
-{ pkgs }:
+{ pkgs, ... }:
 {
-  enable = true;
+  programs.waybar = {
-  settings.mainBar = {
+    enable = true;
-    layer = "top";
+    settings.mainBar = {
-    position = "top";
+      layer = "top";
-    # mod = "dock";
+      position = "top";
-    # exclusive = true;
+      # mod = "dock";
-    # gtk-layer-shell = true;
+      # exclusive = true;
-    margin-bottom = -1;
+      # gtk-layer-shell = true;
-    # passthrough = false;
+      margin-bottom = -1;
-    height = 32;
+      # passthrough = false;
-    modules-left =
+      height = 32;
-      [
+      modules-left =
+        [
+        ];
+      modules-center = [ "clock" ];
+      modules-right = [
+        "cpu"
+        "memory"
+        "tray"
+        "bluetooth"
+        "pulseaudio"
+        "network"
+        "battery"
       ];
-    modules-center = [ "clock" ];
+      cpu = {
-    modules-right = [
+        interval = 5;
-      "cpu"
+        format = "  {usage}%";
-      "memory"
+        max-length = 10;
-      "tray"
+      };
-      "bluetooth"
+      memory = {
-      "pulseaudio"
+        interval = 10;
-      "network"
+        format = "  {percentage}%";
-      "battery"
+        max-length = 10;
-    ];
+        tooltip = true;
-    cpu = {
+        tooltip-format = "RAM - {used:0.1f}GiB used";
-      interval = 5;
+      };
-      format = "  {usage}%";
+      tray = {
-      max-length = 10;
+        icon-size = 18;
-    };
+        spacing = 3;
-    memory = {
+      };
-      interval = 10;
+      clock = {
-      format = "  {percentage}%";
+        format = "      {:%R\n %d.%m.%Y}";
-      max-length = 10;
+        tooltip-format = "<tt><small>{calendar}</small></tt>";
-      tooltip = true;
+        calendar = {
-      tooltip-format = "RAM - {used:0.1f}GiB used";
+          mode = "year";
-    };
+          mode-mon-col = 3;
-    tray = {
+          weeks-pos = "right";
-      icon-size = 18;
+          on-scroll = 1;
-      spacing = 3;
+          on-click-right = "mode";
-    };
+          format = {
-    clock = {
+            months = "<span color='#ffead3'><b>{}</b></span>";
-      format = "      {:%R\n %d.%m.%Y}";
+            days = "<span color='#ecc6d9'><b>{}</b></span>";
-      tooltip-format = "<tt><small>{calendar}</small></tt>";
+            weeks = "<span color='#99ffdd'><b>W{}</b></span>";
-      calendar = {
+            weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-        mode = "year";
+            today = "<span color='#ff6699'><b><u>{}</u></b></span>";
-        mode-mon-col = 3;
+          };
-        weeks-pos = "right";
+        };
-        on-scroll = 1;
+        actions = {
-        on-click-right = "mode";
+          on-click-right = "mode";
-        format = {
+          on-click-forward = "tz_up";
-          months = "<span color='#ffead3'><b>{}</b></span>";
+          on-click-backward = "tz_down";
-          days = "<span color='#ecc6d9'><b>{}</b></span>";
+          on-scroll-up = "shift_up";
-          weeks = "<span color='#99ffdd'><b>W{}</b></span>";
+          on-scroll-down = "shift_down";
-          weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-          today = "<span color='#ff6699'><b><u>{}</u></b></span>";
         };
       };
-      actions = {
+
-        on-click-right = "mode";
+      network = {
-        on-click-forward = "tz_up";
+        format-wifi = " {icon}";
-        on-click-backward = "tz_down";
+        tooltip-format-wifi = "{essid} ({signalStrength}%)";
-        on-scroll-up = "shift_up";
+        format-ethernet = "  ";
-        on-scroll-down = "shift_down";
+        format-disconnected = "󰌙 ";
+        format-icons = [
+          "󰤯 "
+          "󰤟 "
+          "󰤢 "
+          "󰤢 "
+          "󰤨 "
+        ];
+        # tooltip = false;
       };
-    };
 
-    network = {
+      battery = {
-      format-wifi = " {icon}";
+        states = {
-      tooltip-format-wifi = "{essid} ({signalStrength}%)";
+          good = 95;
-      format-ethernet = "  ";
+          warning = 30;
-      format-disconnected = "󰌙 ";
+          critical = 20;
-      format-icons = [
+        };
-        "󰤯 "
+        format = " {icon} {capacity}%";
-        "󰤟 "
+        format-charging = "  {capacity}%";
-        "󰤢 "
+        format-plugged = "  {capacity}%";
-        "󰤢 "
+        format-alt = "{time} {icon}";
-        "󰤨 "
+        format-icons = [
-      ];
+          "󰂎"
-      # tooltip = false;
+          "󰁺"
-    };
+          "󰁻"
-
+          "󰁼"
-    battery = {
+          "󰁽"
-      states = {
+          "󰁾"
-        good = 95;
+          "󰁿"
-        warning = 30;
+          "󰂀"
-        critical = 20;
+          "󰂁"
-      };
+          "󰂂"
-      format = " {icon} {capacity}%";
+          "󰁹"
-      format-charging = "  {capacity}%";
-      format-plugged = "  {capacity}%";
-      format-alt = "{time} {icon}";
-      format-icons = [
-        "󰂎"
-        "󰁺"
-        "󰁻"
-        "󰁼"
-        "󰁽"
-        "󰁾"
-        "󰁿"
-        "󰂀"
-        "󰂁"
-        "󰂂"
-        "󰁹"
-      ];
-    };
-
-    # not actually pulseaudio-specific (I use pipewire!)
-    pulseaudio = {
-      max-volume = 100;
-      scroll-step = 10;
-      format = "{icon}";
-      tooltip-format = "{desc} ({volume}%)";
-      format-muted = "🔇";
-      format-icons = {
-        default = [
-          " "
-          " "
-          " "
         ];
       };
-      on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol";
+
+      # not actually pulseaudio-specific (I use pipewire!)
+      pulseaudio = {
+        max-volume = 100;
+        scroll-step = 10;
+        format = "{icon}";
+        tooltip-format = "{desc} ({volume}%)";
+        format-muted = "🔇";
+        format-icons = {
+          default = [
+            " "
+            " "
+            " "
+          ];
+        };
+        on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol";
+      };
+
+      bluetooth = {
+        format = " ({status}) ";
+        format-connected = " {device_alias}";
+        format-connected-battery = " {device_alias} {device_battery_percentage}%";
+        tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected";
+        tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}";
+        tooltip-format-enumerate-connected = "{device_alias}\t{device_address}";
+        tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%";
+
+        on-click = "${pkgs.blueman}/bin/blueman-manager";
+      };
     };
 
-    bluetooth = {
+    style = ''
-      format = " ({status}) ";
+      /*base background color*/
-      format-connected = " {device_alias}";
+      @define-color bg_main rgba(25, 25, 25, 1.0);
-      format-connected-battery = " {device_alias} {device_battery_percentage}%";
+      @define-color bg_main_tooltip rgba(0, 0, 0, 0.7);
-      tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected";
+
-      tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}";
+
-      tooltip-format-enumerate-connected = "{device_alias}\t{device_address}";
+      /*base background color of selections */
-      tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%";
+      @define-color bg_hover rgba(200, 200, 200, 0.3);
-      on-click = "${pkgs.blueman}/bin/blueman-manager";
+      /*base background color of active elements */
-    };
+      @define-color bg_active rgba(100, 100, 100, 0.5);
+
+      /*base border color*/
+      @define-color border_main rgba(255, 255, 255, 0.2);
+
+      /*text color for entries, views and content in general */
+      @define-color content_main white;
+      /*text color for entries that are unselected */
+      @define-color content_inactive rgba(255, 255, 255, 0.25);
+
+      * {
+      	text-shadow: none;
+      	box-shadow: none;
+        border: none;
+        border-radius: 0;
+      	font-family: "Segoe UI", "Ubuntu";
+        font-weight: 600;
+        font-size: 12.7px;
+      }
+
+      window#waybar {
+        background:  @bg_main;
+        border-top: 0;
+        color: @content_main;
+      }
+
+      tooltip {
+        background: @bg_main_tooltip;
+        border-radius: 5px;
+        border-width: 1px;
+        border-style: solid;
+        border-color: @border_main;
+      }
+
+      tooltip label {
+        color: @content_main;
+      }
+
+      #taskbar {
+      }
+
+      #taskbar button {
+      	min-width: 130px;
+      	border-bottom: 3px solid rgba(255, 255, 255, 0.3);
+      	margin-left: 2px;
+      	margin-right: 2px;
+        padding-left: 8px;
+        padding-right: 8px;
+        color: white;
+      	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
+      }
+
+      #taskbar button.active {
+      	border-bottom: 3px solid white;
+        background: @bg_active;
+      }
+
+      #taskbar button:hover {
+      	border-bottom: 3px solid white;
+        background: @bg_hover;
+      	color: @content_main;
+      }
+
+      #cpu, #memory {
+      	padding:3px;
+      }
+
+      #window {
+        border-radius: 10px;
+        margin-left: 20px;
+        margin-right: 20px;
+      }
+
+      #tray {
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+
+      #tray > .passive {
+      	border-bottom: none;
+      }
+
+      #tray > .active {
+      	border-bottom: 3px solid white;
+      }
+
+      #tray > .needs-attention {
+      	border-bottom: 3px solid @warning_color;
+      }
+
+      #tray > widget {
+      	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
+      }
+
+      #tray > widget:hover {
+      	background: @bg_hover;
+      }
+
+      #pulseaudio {
+      	font-family: "JetBrains Mono Nerd Font";
+      	padding-left: 3px;
+        padding-right: 3px;
+      	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
+      }
+
+      #pulseaudio:hover {
+       	background: @bg_hover;
+      }
+
+      #network {
+      	padding-left: 3px;
+        padding-right: 3px;
+      }
+
+      #clock {
+        padding-right: 5px;
+        padding-left: 5px;
+      	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
+      }
+
+      #clock:hover {
+      	background: @bg_hover;
+      }
+    '';
   };
-
-  style = ''
-    /*base background color*/
-    @define-color bg_main rgba(25, 25, 25, 1.0);
-    @define-color bg_main_tooltip rgba(0, 0, 0, 0.7);
-
-
-    /*base background color of selections */
-    @define-color bg_hover rgba(200, 200, 200, 0.3);
-    /*base background color of active elements */
-    @define-color bg_active rgba(100, 100, 100, 0.5);
-
-    /*base border color*/
-    @define-color border_main rgba(255, 255, 255, 0.2);
-
-    /*text color for entries, views and content in general */
-    @define-color content_main white;
-    /*text color for entries that are unselected */
-    @define-color content_inactive rgba(255, 255, 255, 0.25);
-
-    * {
-    	text-shadow: none;
-    	box-shadow: none;
-      border: none;
-      border-radius: 0;
-    	font-family: "Segoe UI", "Ubuntu";
-      font-weight: 600;
-      font-size: 12.7px;
-    }
-
-    window#waybar {
-      background:  @bg_main;
-      border-top: 0;
-      color: @content_main;
-    }
-
-    tooltip {
-      background: @bg_main_tooltip;
-      border-radius: 5px;
-      border-width: 1px;
-      border-style: solid;
-      border-color: @border_main;
-    }
-
-    tooltip label {
-      color: @content_main;
-    }
-
-    #taskbar {
-    }
-
-    #taskbar button {
-    	min-width: 130px;
-    	border-bottom: 3px solid rgba(255, 255, 255, 0.3);
-    	margin-left: 2px;
-    	margin-right: 2px;
-      padding-left: 8px;
-      padding-right: 8px;
-      color: white;
-    	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
-    }
-
-    #taskbar button.active {
-    	border-bottom: 3px solid white;
-      background: @bg_active;
-    }
-
-    #taskbar button:hover {
-    	border-bottom: 3px solid white;
-      background: @bg_hover;
-    	color: @content_main;
-    }
-
-    #cpu, #memory {
-    	padding:3px;
-    }
-
-    #window {
-      border-radius: 10px;
-      margin-left: 20px;
-      margin-right: 20px;
-    }
-
-    #tray {
-      margin-left: 5px;
-      margin-right: 5px;
-    }
-
-    #tray > .passive {
-    	border-bottom: none;
-    }
-
-    #tray > .active {
-    	border-bottom: 3px solid white;
-    }
-
-    #tray > .needs-attention {
-    	border-bottom: 3px solid @warning_color;
-    }
-
-    #tray > widget {
-    	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
-    }
-
-    #tray > widget:hover {
-    	background: @bg_hover;
-    }
-
-    #pulseaudio {
-    	font-family: "JetBrains Mono Nerd Font";
-    	padding-left: 3px;
-      padding-right: 3px;
-    	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
-    }
-
-    #pulseaudio:hover {
-     	background: @bg_hover;
-    }
-
-    #network {
-    	padding-left: 3px;
-      padding-right: 3px;
-    }
-
-    #clock {
-      padding-right: 5px;
-      padding-left: 5px;
-    	transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1);
-    }
-
-    #clock:hover {
-    	background: @bg_hover;
-    }
-  '';
 }

home-manager/system-mreow.nix

@@ -8,25 +8,25 @@
 {
   imports = [
     ./gui.nix
+
+    # niri wayland compositor
     ./progs/niri.nix
+
+    # waybar for status bar
+    ./progs/waybar.nix
+
+    ./progs/swaylock.nix
   ];
 
   home.packages = with pkgs; [
     wdisplays
     intel-gpu-tools
-    swaylock
-
-    # manage bluetooth devices
-    blueman
 
     # used by /etc/nixos logic to launch niri
     config.programs.niri.package
   ];
 
-  # # bluetooth manager
+  # media controls
-  # services.blueman-applet.enable = true;
-
-  # bluetooth media controls
   systemd.user.services.mpris-proxy = {
     Unit.Description = "Mpris proxy";
     Install.After = [
@@ -43,14 +43,6 @@
     package = pkgs.dunst;
   };
 
-  programs.swaylock = {
-    enable = true;
-    settings = import ./progs/swaylock.nix;
-  };
-
-  # waybar for status bar
-  programs.waybar = import ./progs/waybar.nix { inherit pkgs; };
-
   # rofi for application launcher
   programs.rofi = {
     enable = true;
@@ -88,7 +80,7 @@
   # Filter: ON PK   Fc 7500.0  Hz   Gain -2.09  dB  Q 3.0
   # Filter: ON PK   Fc 8000.0  Hz   Gain  2.01  dB  Q 4.36
   # Filter: ON PK   Fc 900.0   Hz   Gain -4.12  dB  Q 5.909999999999967
-  home.file.".config/easyeffects/output/framework.json".text =
+  home.file.".config/easyeffects/output/${config.services.easyeffects.preset}.json".text =
     let
       baseBand = {
         mode = "RLC (BT)";