diff --git a/flake.lock b/flake.lock
index 28fc561..7627887 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760130406,
-        "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
+        "lastModified": 1764636297,
+        "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
+        "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1760208466,
-        "narHash": "sha256-1tQJ7hOxG7SN61ZMTrOewtv7FV1JHCcHiU8fQ7DYuos=",
-        "rev": "d9c1c0925ca74536bfaeaeb69042886e33c4e5a6",
+        "lastModified": 1764637364,
+        "narHash": "sha256-QFnWVaNNEhM9Q5RP52yj2zeB1mUfKVY96IFegnWLH94=",
+        "rev": "716a885def4eadc4a031a931eea1e8dc135341ad",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d9c1c0925ca74536bfaeaeb69042886e33c4e5a6.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/716a885def4eadc4a031a931eea1e8dc135341ad.tar.gz?rev=716a885def4eadc4a031a931eea1e8dc135341ad"
       },
       "original": {
         "type": "tarball",
@@ -133,11 +133,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756511062,
-        "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=",
-        "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16",
+        "lastModified": 1764519849,
+        "narHash": "sha256-XnNABKfIYKSimQVvKc9FnlC2H0LurOhd9MS6l0Z67lE=",
+        "rev": "6c95c0b6f73f831226453fc6905c216ab634c30f",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/6c95c0b6f73f831226453fc6905c216ab634c30f.tar.gz?rev=6c95c0b6f73f831226453fc6905c216ab634c30f"
       },
       "original": {
         "type": "tarball",
@@ -150,11 +150,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1759833546,
-        "narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=",
+        "lastModified": 1764591717,
+        "narHash": "sha256-T/HMA0Bb/O6UnlGQ0Xt+wGe1j8m7eyyQ5+vVcCJslsM=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730",
+        "rev": "84d1dab290feb4865d0cfcffc7aa0cf9bc65c3b7",
         "type": "github"
       },
       "original": {
@@ -198,11 +198,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1759733170,
-        "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1760038930,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a87d05e..2738f45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
     # pydev.url ="./system/extras/pydev/";
     currents.url = "github:autumnalmusing/currents/main";
     #regular flakes
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
     lix.flake = false;
     lix-module = {
diff --git a/home/autumn/home.nix b/home/autumn/home.nix
index 0599558..cc2437a 100644
--- a/home/autumn/home.nix
+++ b/home/autumn/home.nix
@@ -53,9 +53,5 @@
     # package bundles
     ../bundles/langs.nix
 
-    ## Development
-    inputs.currents.homeManagerModules.currents
   ];
-
-  services.currents.enable = true;
 }
diff --git a/home/autumn/sysconfs/yukigekko.nix b/home/autumn/sysconfs/yukigekko.nix
index d3901ce..a8b3b1b 100644
--- a/home/autumn/sysconfs/yukigekko.nix
+++ b/home/autumn/sysconfs/yukigekko.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{config, pkgs, inputs, ...}:
 {
   home.packages = with pkgs; [
     obsidian
@@ -16,8 +16,12 @@
     ../../packages/mako/mako.nix
     ../../packages/fuzzel/fuzzel.nix
     # ../../packages/avizo/avizo.nix
+    ../../packages/niri/niri.nix
     # Distrobox containers
-    ../../boxes/archlinux/box-archlinux.nix
+    # ../../boxes/archlinux/box-archlinux.nix
 
+    inputs.currents.homeManagerModules.currents
   ];
+
+  services.currents.enable = true;
 }
diff --git a/home/packages/alacritty/alacritty.nix b/home/packages/alacritty/alacritty.nix
index b88e235..0b451ff 100644
--- a/home/packages/alacritty/alacritty.nix
+++ b/home/packages/alacritty/alacritty.nix
@@ -16,8 +16,6 @@
         };
       };
       window = {
-        opacity = 0.9;
-        blur = true;
         padding = {x=0;y=15;};
       };
       colors = {
diff --git a/home/packages/helix/helix.nix b/home/packages/helix/helix.nix
index a3516f7..531e9f0 100644
--- a/home/packages/helix/helix.nix
+++ b/home/packages/helix/helix.nix
@@ -8,7 +8,7 @@
       dracula_trans = ./dracula_trans.toml;
     };
     settings = {
-      theme = "everforest_dark_trans";
+      theme = "everforest_dark";
       editor = {
         mouse = true;
         middle-click-paste = true;
diff --git a/home/packages/niri/niri.kdl b/home/packages/niri/niri.kdl
new file mode 100644
index 0000000..f06214b
--- /dev/null
+++ b/home/packages/niri/niri.kdl
@@ -0,0 +1,118 @@
+input {
+	keyboard {
+		xkb {
+			layout "us"
+		}
+	}
+	touchpad {
+		tap
+		accel-speed 0.0
+		scroll-method "two-finger"
+		middle-emulation
+		drag true
+		tap-button-map "left-right-middle"
+		disabled-on-external-mouse
+	}
+	focus-follows-mouse max-scroll-amount="60%"
+}
+layout {
+	gaps 10
+	center-focused-column "on-overflow"
+	preset-column-widths {
+	    proportion 0.3333333
+	    proportion 0.5
+	    proportion 0.6666667
+	    proportion 1.0
+	}
+	preset-window-heights{
+		proportion 1.0
+	    proportion 0.75
+	    proportion 0.5
+	    proportion 0.25
+	}
+	default-column-width { proportion 0.6666667; }
+	focus-ring { off; }
+	border {
+	    width 4
+	    active-color "#7fbbb3"
+	    inactive-color "#d3c6aa"
+	    urgent-color "#e67e80"
+	}
+}
+window-rule {
+	geometry-corner-radius 8
+	clip-to-geometry true
+}
+window-rule{
+	match app-id="Alacritty"
+	match is-focused=true
+	opacity 0.95
+}
+// spawn-at-startup "waybar"
+spawn-at-startup "swaybg" "-i" "~/Downloads/wp.jpg"
+spawn-at-startup "avizo-service"
+binds {
+    //spawn binds
+    Super+Shift+Slash {show-hotkey-overlay;}
+    Super+Return hotkey-overlay-title="Alacritty" {spawn "alacritty";}
+    Super+R hotkey-overlay-title="Fuzzel" {spawn "fuzzel";}
+    Super+E hotkey-overlay-title="File Manager" {spawn "pcmanfm";}
+    Super+B hotkey-overlay-title="Obsidian" {spawn "obsidian";}
+    Super+Escape hotkey-overlay-title="Lock" {spawn "swaylock --screenshots --clock --indicator --indicator-radius 250 --indicator-thickness 12 --effect-blur 7x5 --ring-color 7fbbb3 --line-color d3c6aa --inside-color 2b3339 --separator-color 83c092";}
+    Super+Shift+E hotkey-overlay-title="Quit" {quit;}
+    Super+Q hotkey-overlay-title="Close" {close-window;}
+    Super+O hotkey-overlay-title="Toggle Overview" {toggle-overview;}
+    Super+KP_Subtract {spawn "swaybg" "-i" "~/Downloads/wp.jpg";}
+
+    Super+H           {focus-column-left;}
+    Super+J           {focus-window-down;}
+    Super+K           {focus-window-up;}
+    Super+L           {focus-column-right;}
+    Super+Left        {focus-column-left;}
+    Super+Down        {focus-window-down;}
+    Super+Up          {focus-window-up;}
+    Super+Right       {focus-column-right;}
+    Super+Shift+H     {move-column-left;}
+    Super+Shift+J     {move-window-down;}
+    Super+Shift+K     {move-window-up;}
+    Super+Shift+L     {move-column-right;}
+    Super+Shift+Left  {move-column-left;}
+    Super+Shift+Down  {move-window-down;}
+    Super+Shift+Up    {move-window-up;}
+    Super+Shift+Right {move-column-right;}
+    Super+Home        {focus-column-first;}
+    Super+End         {focus-column-last;}
+    Super+1           {focus-workspace 1;}
+    Super+2           {focus-workspace 2;}
+    Super+3           {focus-workspace 3;}
+    Super+4           {focus-workspace 4;}
+    Super+5           {focus-workspace 5;}
+    Super+6           {focus-workspace 6;}
+    Super+7           {focus-workspace 7;}
+    Super+8           {focus-workspace 8;}
+    Super+9           {focus-workspace 9;}
+    // Super+10          {focus-workspace 10;}
+    Super+Shift+1     {move-column-to-workspace 1;}
+    Super+Shift+2     {move-column-to-workspace 2;}
+    Super+Shift+3     {move-column-to-workspace 3;}
+    Super+Shift+4     {move-column-to-workspace 4;}
+    Super+Shift+5     {move-column-to-workspace 5;}
+    Super+Shift+6     {move-column-to-workspace 6;}
+    Super+Shift+7     {move-column-to-workspace 7;}
+    Super+Shift+8     {move-column-to-workspace 8;}
+    Super+Shift+9     {move-column-to-workspace 9;}
+    Super+BracketLeft {consume-or-expel-window-left;}
+    Super+BracketRight {consume-or-expel-window-right;}
+    Super+Comma       {consume-window-into-column;}
+    Super+Period      {expel-window-from-column;}
+    Super+A           {switch-preset-column-width;}
+    Super+Shift+A     {switch-preset-window-height;}
+    Super+F           {maximize-column;}
+    Super+Shift+F     {fullscreen-window;}
+    Super+V           {toggle-window-floating;}
+    Super+W           {toggle-column-tabbed-display;}
+    Super+Page_Down   {focus-workspace-down;}
+    Super+Page_Up     {focus-workspace-up;}
+    Super+Shift+Page_Down{move-column-to-workspace-down;}
+    Super+Shift+Page_Up{move-column-to-workspace-up;}
+}
diff --git a/home/packages/niri/niri.nix b/home/packages/niri/niri.nix
new file mode 100644
index 0000000..0da0c44
--- /dev/null
+++ b/home/packages/niri/niri.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  xdg.configFile."niri/config.kdl".source = ./niri.kdl;
+}
+
diff --git a/home/packages/waybar/waybar.css b/home/packages/waybar/waybar.css
index 97c0221..11a9089 100644
--- a/home/packages/waybar/waybar.css
+++ b/home/packages/waybar/waybar.css
@@ -1,12 +1,11 @@
 * {
-  font-family: JetBrains Mono, Font Awesome 6 Free;
+  font-family: "Hack Nerd Font Mono";
   font-size: 13px;
 }
 
 window#waybar {
-  color: #ffffff;
-  background-color: #1e3b28;
-  border-bottom: 3px solid #8f2fef;
+  color: #d3c6aa;
+  background-color: #2b3339;
   transition-property: background-color;
   transition-duration: .5s;
 }
@@ -15,34 +14,56 @@ window#waybar.hidden {
   opacity: 0.2;
 }
 
+.modules-left,
+.modules-center,
+.modules-right {
+  border: 3px solid #7fbbb3;
+  border-radius: 4px;
+  padding: 0 5px;
+}
+
+#custom-weather {
+  /* border-bottom: #a7c080; */
+}
+
 button {
   box-shadow: inset 0 -3px transparent;
-  border: none;
+  border: 1px #000000 solid;
   border-radius: 0;
+  color: #d3c6aa;
 }
 
 button:hover {
   background: inherit;
-  box-shadow: inset 0 -3px #ffffff;
+  box-shadow: inset 0 -3px #7fbbb3;
+  opacity: 0.8;
 }
 
-#workspaces button {
-  padding: 0 15px;
+#workspaces button,
+#tags button {
+  padding: 0 5px;
   background-color: transparent;
-  border: 2px solid #8f2fef
+  border: 2px solid #d3c6aa;
+  margin: 3px;
 }
 
-#workspaces button:hover {
-  background: rgba(255, 255, 255, 0.2);
+#workspaces button.active,
+#tags button.occupied {
+  background: #d3c6aa;
+  border: 1px solid #2b3339;
+  color: #2b3339;
 }
 
-#workspaces button.focused {
-  background-color: #8f2fef;
-  box-shadow: inset 0 -3px #ffffff;
+#workspaces button.focused,
+#tags button.focused {
+  background-color: #7fbbb3;
+  color: #2b3339;
+  border: 1px solid #2b3339;
+  /* border-bottom: 3px solid #2b3339; */
 }
 
-#workspaces button.urgent {
-  background-color: #f38ba8;
+#tags button.urgent {
+  background-color: #e67e80;
 }
 
 #backlight,
@@ -55,10 +76,9 @@ button:hover {
 #pulseaudio,
 #temperature,
 #tray,
-#idle_inhibitor,
-#keyboard-state,
 #power-profiles-daemon {
   padding: 0 8px;
+  color: #d3c6aa;
 }
 
 #window,
@@ -66,126 +86,80 @@ button:hover {
   margin: 0 8px;
 }
 
-.modules-left>widget:first-child>#workspaces {
-  margin-left: 0;
-}
-
-.modules-right>widget:last-child>#workspaces {
-  margin-right: 0;
-}
 
 #backlight {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #cba6f7;
+  /* border-bottom: 3px solid #7fbbb3; */
 }
 
 #battery {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #a6e3a1;
+  border-right: 3px solid #7fbbb3;
+  font-size: 18px;
 }
 
 #battery.critical.discharging {
-  background-color: #f38ba8;
-  animation: blink 1s infinite;
+  background-color: #e67e80;
+  /* animation: blink 5s infinite; */
 }
 
 #battery.warning.discharging {
-  background-color: #f9e2af;
-  animation: blink 1s infinite;
+  background-color: #dbbc7f;
+  /* animation: blink 10s infinite; */
 }
 
-@keyframes blink {
-  to {
-    background-color: transparent;
-  }
-}
+/* @keyframes blink { */
+/* to { */
+/* background-color: transparent; */
+/* } */
+/* } */
 
 #clock {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #a6e3a1;
+  /* border-bottom: 3px solid #a7c080; */
 }
 
 #cpu {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #cba6f7;
+  border-right: 3px solid #7fbbb3;
 }
 
 #memory {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #f9e2af;
-}
-
-#mode {
-  color: #ffffff;
-  background-color: #8f2fef;
-  border-bottom: 3px solid #ffffff;
+  border-right: 3px solid #7fbbb3;
 }
 
 #network {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #a6e3a1;
+  border-right: 3px solid #7fbbb3;
 }
 
 #network.disconnected {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #f38ba8;
+  /* border-bottom: 3px solid #f38ba8; */
 }
 
 #pulseaudio {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #a6e3a1;
+  border-right: 3px solid #7fbbb3;
 }
 
 #pulseaudio.muted {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #f38ba8;
+  /* border-bottom: 3px solid #e67e80; */
 }
 
 #temperature {
-  color: #ffffff;
   background-color: transparent;
-  border-bottom: 3px solid #a6e3a1;
+  border-right: 3px solid #7fbbb3;
 }
 
 #temperature.critical {
   background-color: transparent;
-  border-bottom: 3px solid #f38ba8;
+  /* border-bottom: 3px solid #e67e80; */
 }
 
 #tray {
   background-color: transparent;
-  border-bottom: 3px solid #8f2fef;
-}
-
-#idle_inhibitor {
-  color: #ffffff;
-  background-color: transparent;
-  border-bottom: 3px solid #f9e2af;
-}
-
-#idle_inhibitor.activated {
-  color: #1e3b28;
-  background-color: #f9e2af;
-  border-bottom: 3px solid #f9e2af;
-}
-
-#keyboard-state {
-  color: #ffffff;
-  background-color: transparent;
-  border-bottom: 3px solid #fab387;
-}
-
-#power-profiles-daemon {
-  color: #ffffff;
-  background-color: transparent;
-  border-bottom: 3px solid #94e2d5;
-}
+  border-left: 3px solid #7fbbb3;
+}
\ No newline at end of file
diff --git a/home/packages/waybar/waybar.nix b/home/packages/waybar/waybar.nix
index 65b2b85..659727b 100644
--- a/home/packages/waybar/waybar.nix
+++ b/home/packages/waybar/waybar.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   programs.waybar = {
@@ -8,17 +8,19 @@
       mainBar = {
         layer = "top";
         position = "top";
-        height = 30;
+        height = 45;
         spacing = 4;
 
         # Module layout
         #
         modules-left = [
           "river/tags"
+          "niri/workspaces"
         ];
         modules-center = [
           "custom/currents"
           "river/window"
+          "niri/window"
         ];
         modules-right = [
           "pulseaudio"
@@ -74,11 +76,20 @@
           hide-vacant = true;
         };
 
+        "niri/workspaces" = {
+          format = "{index}";
+        };
+
         "river/window" = {
           format = "{}";
           max-length = 20;
         };
-        
+
+        "niri/window" = {
+          format = "{}";
+          max-length = 20;
+        };
+
         "tray" = {
           icon-size = 21;
           spacing = 10;
@@ -121,10 +132,10 @@
           };
           format = "{icon} {capacity}%";
           format-full = "{icon} Full";
-          format-charging = "{icon} Charging {capacity}% {time}";
-          format-plugged = "{icon} Charge complete";
+          format-charging = "{icon} {capacity}% {time}";
+          format-plugged = "{icon}  ";
           format-good = ">{icon} {capacity}%";
-          format-icons = ["" "" "" "" "" "" "" ""];
+          format-icons = [" " " " " " " " " "];
         };
           
         "network#wifi" = {
@@ -154,163 +165,13 @@
             on-click = "pavucontrol";
           };
         };
-          "custom/currents"= {
-            interval= 150;
-            exec= "/home/autumn/.local/bin/currents --output";
-            return-type= "json";
-          };
+        "custom/currents"= {
+          interval= 150;
+          exec= "/home/autumn/.local/bin/currents --output";
+          return-type= "json";
+        };
       };
     };
-      
-    style = ''
-      * {
-        font-family: "Hack Nerd Font Mono";
-        font-size: 13px;
-      }
-      window#waybar {
-        color: #d3c6aa;
-        background-color: #2b3339;
-        border-bottom: 3px solid #7fbbb3;
-        transition-property: background-color;
-        transition-duration: .5s;
-      }
-
-      window#waybar.hidden {
-        opacity: 0.2;
-      }
-      #custom-weather{
-        border-bottom: #a7c080;
-      }
-      button {
-        box-shadow: inset 0 -3px transparent;
-        border: 1px #000000 solid;
-        border-radius: 0;
-        color:#d3c6aa;
-        
-      }
-      button:hover {
-        background: inherit;
-        box-shadow: inset 0 -3px #7fbbb3;
-      }
-
-      #tags button {
-        padding: 0 15px;
-        background-color: transparent;
-        border: 2px solid #d3c6aa;
-      }
-
-      #tags button.occupied {
-        background: #d3c6aa;
-        border: 1px solid #2b3339;
-        color:#2b3339;
-      }
-
-      #tags button.focused {
-        background-color: #7fbbb3;
-        color: #2b3339;
-        border: 1px solid #2b3339;
-        border-bottom: 3px solid #2b3339;
-      }
-
-      #tags button.urgent {
-        background-color: #e67e80;
-      }
-
-      #backlight,
-      #battery,
-      #clock,
-      #cpu,
-      #memory,
-      #mode,
-      #network,
-      #pulseaudio,
-      #temperature,
-      #tray,
-      #power-profiles-daemon {
-        padding: 0 8px;
-        color:#d3c6aa;
-      }
-
-      #window,
-      #workspaces {
-        margin: 0 8px;
-      }
-
-      #backlight {
-        background-color: transparent;
-        border-bottom: 3px solid #7fbbb3;
-      }
-
-      #battery {
-        background-color: transparent;
-        border-bottom: 3px solid #a7c080;
-      }
-
-      #battery.critical.discharging {
-        background-color: #e67e80;
-        animation: blink 5s infinite;
-      }
-
-      #battery.warning.discharging {
-        background-color: #dbbc7f;
-        animation: blink 10s infinite;
-      }
-
-      @keyframes blink {
-        to {
-          background-color: transparent;
-        }
-      }
-
-      #clock {
-        background-color: transparent;
-        border-bottom: 3px solid #a7c080;
-      }
-
-      #cpu {
-        background-color: transparent;
-        border-bottom: 3px solid #7fbbb3;
-      }
-
-      #memory {
-        background-color: transparent;
-        border-bottom: 3px solid #dbbc7f;
-      }
-
-      #network {
-        background-color: transparent;
-        border-bottom: 3px solid #a7c080;
-      }
-
-      #network.disconnected {
-        background-color: transparent;
-        border-bottom: 3px solid #f38ba8;
-      }
-
-      #pulseaudio {
-        background-color: transparent;
-        border-bottom: 3px solid #7fbbb3;
-      }
-
-      #pulseaudio.muted {
-        background-color: transparent;
-        border-bottom: 3px solid #e67e80;
-      }
-
-      #temperature {
-        background-color: transparent;
-        border-bottom: 3px solid #a7c080;
-      }
-
-      #temperature.critical {
-        background-color: transparent;
-        border-bottom: 3px solid #e67e80;
-      }
-
-      #tray {
-        background-color: transparent;
-        border-bottom: 3px solid #7fbbb3;
-      }
-    '';
   };
+  xdg.configFile."waybar/style.css".source = ./waybar.css;
 }
diff --git a/home/themefiles/cursor.nix b/home/themefiles/cursor.nix
index 65a634e..670c863 100644
--- a/home/themefiles/cursor.nix
+++ b/home/themefiles/cursor.nix
@@ -5,6 +5,10 @@
     name = "oreo-cursors-plus";
     package = pkgs.oreo-cursors-plus;
     size = 32;
-    gtk.enable = true;
+  };
+  gtk.enable = true;
+  gtk.cursorTheme = {
+    package = pkgs.oreo-cursors-plus;
+    name = "oreo-cursors-plus";
   };
 }
diff --git a/system/defaults/security.nix b/system/defaults/security.nix
new file mode 100644
index 0000000..ef9d382
--- /dev/null
+++ b/system/defaults/security.nix
@@ -0,0 +1,6 @@
+{config, pkgs, ...}:
+{
+  security.polkit = {
+    enable = true;
+  };
+}
diff --git a/system/packages/sddm/bincache.nix b/system/packages/sddm/bincache.nix
deleted file mode 100644
index c3d852e..0000000
--- a/system/packages/sddm/bincache.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-
-{ config, pkgs, ... }:
-
-{
-  # Configure systems to use Hydra as a binary cache substituter
-  nix.settings = {
-    substituters = [
-      "http://rhiannon.coven.systems:3000"
-    ];
-    trusted-public-keys = [
-      "rhiannon.coven.systems:f8KiECrc7rY3vDMSy7sACyToxRLPECtQTcm6p8LFMPk="
-    ];
-  };
-}
diff --git a/system/services/swaybg.nix b/system/services/swaybg.nix
new file mode 100644
index 0000000..5bb7797
--- /dev/null
+++ b/system/services/swaybg.nix
@@ -0,0 +1,16 @@
+{config, pkgs, ...}:
+{
+  systemd.user.services.swaybg-autoset = {
+    enable = true;
+    description = "start swaybg on login";
+    after = ["waybar.service"];
+    requires = ["network-online.target"];
+    before = ["multi-user.target"];
+    wantedBy = ["multi-user.target"];
+    serviceConfig = {
+      ExecStart = "swaybg -i ~/Downloads/wp.jpg";
+      User = "autumn";
+      Group = "users";
+    };
+  };
+}
diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix
index d2de072..04ed39b 100644
--- a/system/yukigekko/configuration.nix
+++ b/system/yukigekko/configuration.nix
@@ -9,14 +9,17 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
 
-      ../packages/bincache.nix
+      # ../packages/bincache.nix
       #system configs
-      ../defaults/system.nix
-      ../defaults/locale.nix
       ../defaults/boot.nix
+      ../defaults/locale.nix
+      ../defaults/security.nix
       ../defaults/services.nix
+      ../defaults/system.nix
       ../defaults/users.nix
 
+      ../services/swaybg.nix
+
       #system packages
       ../packages/sddm/sddm.nix
 
@@ -37,6 +40,7 @@
   time.timeZone = "${timezone}";
 
   programs.river-classic.enable = true;
+  programs.niri.enable = true;
   xdg.portal = {
     enable = true;
     config.common.default = "*";
@@ -54,7 +58,11 @@
   hardware.graphics = {
     enable = true;
   };
-
+  fileSystems."/mnt/hoardfrost" = {
+    device = "//10.0.0.217/public";
+    fsType = "cifs";
+    options = [ "username=autumn" "password=autest" "x-systemd.automount" "noauto"];
+  };
   hardware.nvidia = {
     modesetting.enable = true;
 
@@ -70,7 +78,7 @@
   };
   # hardware.nvidia.prime.intelBusId = "PCI:0@0:2:0";
   # hardware.nvidia.prime.nvidiaBusId = "PCI:1@0:0:0";
-  # hardware.nvidia.prime.sync.enable = true;
+  # hardware.nvidia.prime.sync.enable = true;o
   # hardware.nvidia.prime.offload.enable = false;
   # hardware.nvidia.prime.offload.enableOffloadCmd = false;
 
@@ -94,6 +102,8 @@
     moonlight-qt
     pcmanfm
     gvfs
+    vlc
+    cifs-utils
     # wayland
     # wayland-protocols
     # libxkbcommon
@@ -126,5 +136,5 @@
   system.autoUpgrade.enable = true;
   system.autoUpgrade.allowReboot = true;
   system.autoUpgrade.flake = "../../flake.nix";
-  qt.platformTheme = "kde6";
+  # qt.platformTheme = "kde6";
 }
diff --git a/system/yukigekko/hardware-configuration.nix b/system/yukigekko/hardware-configuration.nix
index dbf7f31..70382ce 100644
--- a/system/yukigekko/hardware-configuration.nix
+++ b/system/yukigekko/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -33,7 +33,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp3s0f1.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
-  hardware.bluetooth.enable = true;
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }