diff --git a/.sops.yaml b/.sops.yaml
index fb48793..08ff984 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,7 +1,7 @@
 keys:
   - &primary age1j3uuyax673fvl5x4dveupq3dylngnrq0e5uy7fmclsexkfd25vysk646wk
 creation_rules:
-  - path_regex: home-manager/users/sweetbread/secrets.yaml$
+  - path_regex: home-manager/users/(sweetbread|chest)/secrets.yaml$
     key_groups:
       - age:
           - *primary
diff --git a/flake.nix b/flake.nix
index f3b26c7..b5cfb5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,6 +80,7 @@
           ./home-manager/users/chest/home.nix
           inputs.sops-nix.homeManagerModules.sops
           inputs.stylix.homeManagerModules.stylix
+          inputs.ags.homeManagerModules.default
         ];
       };
     };
diff --git a/home-manager/users/sweetbread/modules/ags.nix b/home-manager/modules/ags.nix
similarity index 100%
rename from home-manager/users/sweetbread/modules/ags.nix
rename to home-manager/modules/ags.nix
diff --git a/home-manager/users/sweetbread/modules/ags/README.md b/home-manager/modules/ags/README.md
similarity index 100%
rename from home-manager/users/sweetbread/modules/ags/README.md
rename to home-manager/modules/ags/README.md
diff --git a/home-manager/users/sweetbread/modules/ags/config.js b/home-manager/modules/ags/config.js
similarity index 100%
rename from home-manager/users/sweetbread/modules/ags/config.js
rename to home-manager/modules/ags/config.js
diff --git a/home-manager/users/sweetbread/modules/ags/style.css b/home-manager/modules/ags/style.css
similarity index 100%
rename from home-manager/users/sweetbread/modules/ags/style.css
rename to home-manager/modules/ags/style.css
diff --git a/home-manager/users/sweetbread/modules/bundle.nix b/home-manager/modules/bundle.nix
similarity index 70%
rename from home-manager/users/sweetbread/modules/bundle.nix
rename to home-manager/modules/bundle.nix
index c0a9e01..34214b9 100644
--- a/home-manager/users/sweetbread/modules/bundle.nix
+++ b/home-manager/modules/bundle.nix
@@ -1,17 +1,14 @@
 {
   imports = [
-    ./git.nix
     ./kitty.nix
     ./qt.nix
     ./sops.nix
-    ./style.nix
     ./neofetch.nix
     ./syncthing.nix
     ./yazi.nix
     ./ags.nix
+    ./zsh.nix
 
-    ./wms/hyprland.nix
-    ./wms/waybar.nix
     ./wms/wofi.nix
     ./wms/mako.nix
   ];
diff --git a/home-manager/users/sweetbread/modules/kitty.nix b/home-manager/modules/kitty.nix
similarity index 100%
rename from home-manager/users/sweetbread/modules/kitty.nix
rename to home-manager/modules/kitty.nix
diff --git a/home-manager/users/sweetbread/modules/neofetch.nix b/home-manager/modules/neofetch.nix
similarity index 100%
rename from home-manager/users/sweetbread/modules/neofetch.nix
rename to home-manager/modules/neofetch.nix
diff --git a/home-manager/users/chest/modules/qt.nix b/home-manager/modules/qt.nix
similarity index 100%
rename from home-manager/users/chest/modules/qt.nix
rename to home-manager/modules/qt.nix
diff --git a/home-manager/modules/sops.nix b/home-manager/modules/sops.nix
new file mode 100644
index 0000000..20d3bc5
--- /dev/null
+++ b/home-manager/modules/sops.nix
@@ -0,0 +1,8 @@
+{ config, ... }: {
+  sops = {
+    defaultSopsFile = ../users/${config.home.username}/secrets.yaml;
+    age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
+
+    secrets."tokens/apis/wallhaven" = {};
+  };
+}
diff --git a/home-manager/users/sweetbread/modules/syncthing.nix b/home-manager/modules/syncthing.nix
similarity index 100%
rename from home-manager/users/sweetbread/modules/syncthing.nix
rename to home-manager/modules/syncthing.nix
diff --git a/home-manager/users/sweetbread/modules/wms/mako.nix b/home-manager/modules/wms/mako.nix
similarity index 100%
rename from home-manager/users/sweetbread/modules/wms/mako.nix
rename to home-manager/modules/wms/mako.nix
diff --git a/home-manager/users/sweetbread/modules/wms/wofi.nix b/home-manager/modules/wms/wofi.nix
similarity index 100%
rename from home-manager/users/sweetbread/modules/wms/wofi.nix
rename to home-manager/modules/wms/wofi.nix
diff --git a/home-manager/users/sweetbread/modules/yazi.nix b/home-manager/modules/yazi.nix
similarity index 100%
rename from home-manager/users/sweetbread/modules/yazi.nix
rename to home-manager/modules/yazi.nix
diff --git a/home-manager/users/sweetbread/zsh.nix b/home-manager/modules/zsh.nix
similarity index 100%
rename from home-manager/users/sweetbread/zsh.nix
rename to home-manager/modules/zsh.nix
diff --git a/home-manager/packages/coding.nix b/home-manager/packages/coding.nix
new file mode 100644
index 0000000..08847f3
--- /dev/null
+++ b/home-manager/packages/coding.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    vscode
+    jetbrains.pycharm-community
+    jetbrains.idea-community
+    android-studio
+
+    cmake
+    gnumake
+    nodejs
+    (python3.withPackages (ps: with ps; [ requests bpython ]))
+    python311Packages.pip
+    rocmPackages.llvm.clang-tools-extra
+    rocmPackages.llvm.clang
+    ncurses
+  ];
+}
diff --git a/home-manager/packages/desktop.nix b/home-manager/packages/desktop.nix
new file mode 100644
index 0000000..4acaf4c
--- /dev/null
+++ b/home-manager/packages/desktop.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    google-chrome
+    telegram-desktop
+    vesktop
+    obs-studio
+    mpv
+    obsidian
+    thunderbird
+  ];
+}
diff --git a/home-manager/packages/utils.nix b/home-manager/packages/utils.nix
new file mode 100644
index 0000000..7bb1e7b
--- /dev/null
+++ b/home-manager/packages/utils.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    scrot
+    ffmpeg
+    yt-dlp
+    bat
+    fd
+    feh
+    imv
+    gromit-mpx
+    notify-desktop
+  ];
+}
diff --git a/home-manager/users/sweetbread/modules/wms/hyprland.nix b/home-manager/patterns/hyprland.nix
similarity index 67%
rename from home-manager/users/sweetbread/modules/wms/hyprland.nix
rename to home-manager/patterns/hyprland.nix
index 204897e..dfc6a46 100644
--- a/home-manager/users/sweetbread/modules/wms/hyprland.nix
+++ b/home-manager/patterns/hyprland.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, config, collection, swww_flags }: {
   home.packages = with pkgs; [
     swww
     kitty
@@ -24,8 +24,8 @@
       from os.path import exists
 
       notify = lambda s: system(f"notify-desktop Wallpaper '{s}'")
-      folder = "/home/sweetbread/Wallpapers"
-      url = "https://wallhaven.cc/api/v1/collections/sweetbread/1764377"
+      folder = "${config.home.homeDirectory}/Wallpapers"
+      url = "https://wallhaven.cc/api/v1/collections/${collection}"
       with open("${config.sops.secrets."tokens/apis/wallhaven".path}") as f:
         token = f.read()
 
@@ -58,7 +58,7 @@
         filename = choice(listdir(folder))
 
       finally:
-        system(f"swww img {folder}/{filename} --transition-type center")
+        system(f"swww img {folder}/{filename} ${swww_flags}")
     '';
 
     clipsync = pkgs.writers.writeBash "clipsync" ''
@@ -80,13 +80,6 @@
     settings = {
       "$mainMod" = "SUPER";
 
-      monitor = [
-        "DP-3, 3440x1440@165.00Hz, auto-right, 1"
-        # "HDMI-A-1, 3840x2160@60.00Hz, auto-left, 2"
-        "HDMI-A-1, disabled"
-        ",preferred,auto,1"
-      ];
-
       env = [
         "LIBVA_DRIVER_NAME,nvidia"
         "XDG_SESSION_TYPE,wayland"
@@ -120,73 +113,6 @@
         sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
       };
 
-      general = {
-        gaps_in = 5;
-        gaps_out = 20;
-        border_size = 3;
-        "col.active_border" = "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
-        "col.inactive_border" = "rgba(${colors.base05}aa)";
-
-        layout = "dwindle";
-      };
-
-      decoration = {
-        rounding = 10;
-
-        blur = {
-          enabled = true;
-          size = 16;
-          passes = 2;
-          new_optimizations = true;
-        };
-
-        drop_shadow = true;
-        shadow_range = 4;
-        shadow_render_power = 3;
-        "col.shadow" = "rgba(1a1a1aee)";
-      };
-
-      animations = {
-        enabled = true;
-
-        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
-        # bezier = "myBezier, 0.33, 0.82, 0.9, -0.08";
-
-        animation = [
-          "windows,     1, 7,  myBezier"
-          "windowsOut,  1, 7,  default, popin 80%"
-          "border,      1, 10, default"
-          "borderangle, 1, 8,  default"
-          "fade,        1, 7,  default"
-          "workspaces,  1, 6,  default"
-        ];
-      };
-
-      dwindle = {
-        pseudotile = true; # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-        smart_split = true;
-      };
-
-      master = {
-        new_status = "master";
-      };
-
-      gestures = {
-        workspace_swipe = true;
-        workspace_swipe_fingers = 3;
-        workspace_swipe_invert = true;
-        workspace_swipe_distance = 200;
-        workspace_swipe_forever = true;
-      };
-
-      misc = {
-        animate_manual_resizes = true;
-        animate_mouse_windowdragging = true;
-        enable_swallow = true;
-        render_ahead_of_time = false;
-        disable_hyprland_logo = false;
-      };
-
       windowrule = [
         "float, ^(imv)$"
         "float, ^(feh)$"
@@ -201,16 +127,16 @@
       ];
 
       exec-once = [
-          "systemctl --user start plasma-polkit-agent"
-          "swww init"
-          "python3 ${lib.getExe wallpaper_changer}"
-          "waybar"
-          "${clipsync}"
-          "clipse -listen"
-        ];
+        "systemctl --user start plasma-polkit-agent"
+        "swww init"
+        "python3 ${lib.getExe wallpaper_changer}"
+        "waybar"
+        "${clipsync}"
+        "clipse -listen"
+      ];
 
       bind = [
-        "$mainMod, V, exec, kitty --class clipse -e clipse  "
+        "$mainMod, V, exec, kitty --class clipse -e clipse"
 
         "$mainMod, Return, exec, kitty"
         "$mainMod, Q, killactive,"
@@ -283,24 +209,11 @@
         ", XF86MonBrightnessDown, exec, brightnessctl set 5%- "
         ", XF86MonBrightnessUp, exec, brightnessctl set +5% "
 
-        # Configuration files
-        ''$mainMod ALT, N, exec, kitty -e sh -c "rb"''
-        ''$mainMod ALT, C, exec, kitty -e sh -c "conf"''
-        ''$mainMod ALT, H, exec, kitty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/hyprland.nix"''
-        ''$mainMod ALT, W, exec, kitty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/waybar.nix"''
-
-        "    , Print, exec, grimblast --notify copy output"
-        "CTRL, Print, exec, grimblast --notify copy area"
-        "ALT , Print, exec, grimblast --notify copy active"
-
         # Waybar
         "$mainMod, B, exec, pkill -SIGUSR1 waybar"
         #"$mainMod, W, exec, pkill -SIGUSR2 waybar"
 
         "$mainMod, W, exec, python3 ${lib.getExe wallpaper_changer}"
-
-        # Disable all effects
-        "$mainMod Shift, G, exec, ~/.config/hypr/gamemode.sh "
       ];
 
       # Move/resize windows with mainMod + LMB/RMB and dragging
diff --git a/home-manager/users/sweetbread/modules/wms/waybar.nix b/home-manager/patterns/waybar.nix
similarity index 98%
rename from home-manager/users/sweetbread/modules/wms/waybar.nix
rename to home-manager/patterns/waybar.nix
index 85e1e04..7c74dcc 100644
--- a/home-manager/users/sweetbread/modules/wms/waybar.nix
+++ b/home-manager/patterns/waybar.nix
@@ -1,11 +1,11 @@
-{ pkgs, config, ...}: {
+{ pkgs, config, active_color }: {
   home.packages = [ pkgs.pulsemixer ];
   wayland.windowManager.hyprland.settings.windowrule = [
     "float, ^(pulsemixer)"
     "float, ^(nmtui)"
   ];
 
-  xdg.configFile."waybar/scripts/wttr.py".source = pkgs.requireFile {
+  xdg.configFile."waybar/scripts/wttr.py".source = pkgs.fetchurl {
     name = "waybar-wttr.py";
     url = "https://gist.githubusercontent.com/bjesus/f8db49e1434433f78e5200dc403d58a3/raw/47f9ffd573dc8e8edce0ea6708601b8e685a70ab/waybar-wttr.py";
     sha256 = "15j2cqg405q37wrrlm70mhp7rx6xnrn92rfm1ix6g3nl98ksh45g";
@@ -248,7 +248,7 @@ window#waybar.hidden {
 }
 
 #taskbar button.active {
-    background: #${colors.base0B};
+    background: ${active_color};
 }
 
 #language {
diff --git a/home-manager/users/chest/home.nix b/home-manager/users/chest/home.nix
index 771ebb5..08bb7bc 100644
--- a/home-manager/users/chest/home.nix
+++ b/home-manager/users/chest/home.nix
@@ -1,13 +1,25 @@
-{
-
+{ pkgs, ... }: {
   imports = [
-    ./zsh.nix
-    ./modules/bundle.nix
+    ../../modules/bundle.nix
+    
+    ../../packages/desktop.nix
+
+    ./modules/aagl.nix
+    ./modules/git.nix
+    ./modules/hyprland.nix
+    ./modules/style.nix
+    ./modules/waybar.nix
   ];
 
+  nixpkgs.config.allowUnfree = true;
+
   home = {
     username = "chest";
     homeDirectory = "/home/chest";
     stateVersion = "23.11";
+
+    packages = with pkgs; [
+      nautilus
+    ];
   };
 }
diff --git a/home-manager/users/chest/modules/aagl.nix b/home-manager/users/chest/modules/aagl.nix
index da4f5eb..ce94d16 100644
--- a/home-manager/users/chest/modules/aagl.nix
+++ b/home-manager/users/chest/modules/aagl.nix
@@ -2,9 +2,10 @@ let
   aagl-gtk-on-nix = import (
     builtins.fetchTarball {
       url = "https://github.com/ezKEa/aagl-gtk-on-nix/archive/main.tar.gz";
-      sha256 = "023yqdxs83cxx39kl7cawwyr39c1qnnv4n99igpsm2a5yay3wmsa";
+      sha256 = "06s9swqgqkafv18zl3k5dbc6q8gdm095rhrnpr2xcqk2vriwwzzk";
     }
   );
-in {
+in
+{
   home.packages = [ aagl-gtk-on-nix.the-honkers-railway-launcher ];
 }
diff --git a/home-manager/users/chest/modules/alacritty.nix b/home-manager/users/chest/modules/alacritty.nix
deleted file mode 100644
index fee9d21..0000000
--- a/home-manager/users/chest/modules/alacritty.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, ... }: {
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      window = {
-        opacity = lib.mkDefault 0.5;
-        blur = true;
-      };
-
-      font = lib.mkDefault {
-        size = 13.0;
-        normal = {
-          family = "JetBrains Mono";
-          style = "Bold";
-        };
-      };
-
-      colors.primary.background = lib.mkDefault "#1d2021";
-    };
-  };
-}
diff --git a/home-manager/users/chest/modules/bundle.nix b/home-manager/users/chest/modules/bundle.nix
deleted file mode 100644
index a391ca6..0000000
--- a/home-manager/users/chest/modules/bundle.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  imports = [
-    ./git.nix
-    ./alacritty.nix
-    ./qt.nix
-    # ./sops.nix
-    ./style.nix
-    ./aagl.nix
-
-    ./wms/hyprland.nix
-    ./wms/waybar.nix
-    ./wms/wofi.nix
-    ./wms/mako.nix
-  ];
-}
diff --git a/home-manager/users/chest/modules/hyprland.nix b/home-manager/users/chest/modules/hyprland.nix
new file mode 100644
index 0000000..7d36d81
--- /dev/null
+++ b/home-manager/users/chest/modules/hyprland.nix
@@ -0,0 +1,91 @@
+{ pkgs, lib, config, ... }: {
+  imports = [(
+    import ../../../patterns/hyprland.nix {
+      inherit lib;
+      inherit pkgs;
+      inherit config;
+      collection = "cheeeest/1767552";
+      swww_flags = "";
+    }
+  )];
+
+  wayland.windowManager.hyprland = let
+    colors = config.lib.stylix.colors;
+  in {
+    settings = {
+      monitor = ",preferred,auto,1";
+
+      general = {
+        gaps_in = 5;
+        gaps_out = 20;
+        border_size = 3;
+        "col.active_border" = "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
+        "col.inactive_border" = "rgba(${colors.base05}aa)";
+
+        layout = "dwindle";
+      };
+
+      decoration = {
+        rounding = 10;
+
+        blur = {
+          enabled = true;
+          size = 16;
+          passes = 2;
+          new_optimizations = true;
+        };
+
+        drop_shadow = true;
+        shadow_range = 4;
+        shadow_render_power = 3;
+        "col.shadow" = "rgba(1a1a1aee)";
+      };
+
+      animations = {
+        enabled = true;
+
+        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+
+        animation = [
+          "windows,     1, 7,  myBezier"
+          "windowsOut,  1, 7,  default, popin 80%"
+          "border,      1, 10, default"
+          "borderangle, 1, 8,  default"
+          "fade,        1, 7,  default"
+          "workspaces,  1, 6,  default"
+        ];
+      };
+
+      dwindle = {
+        pseudotile = true;
+        smart_split = true;
+      };
+
+      master.new_status = "master";
+
+      gestures = {
+        workspace_swipe = true;
+        workspace_swipe_fingers = 3;
+        workspace_swipe_invert = true;
+        workspace_swipe_distance = 200;
+        workspace_swipe_forever = true;
+      };
+
+      misc = {
+        animate_manual_resizes = true;
+        animate_mouse_windowdragging = true;
+        enable_swallow = true;
+        render_ahead_of_time = false;
+        disable_hyprland_logo = false;
+      };
+
+      windowrulev2 = [
+        "opacity 0.75, class:vesktop"
+      ];
+
+      bind = [
+        ''$mainMod Shift, S, exec, ${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp})" - | ${lib.getExe pkgs.swappy} -f -''
+      ];
+    };
+  };
+}
diff --git a/home-manager/users/chest/modules/sops.nix b/home-manager/users/chest/modules/sops.nix
deleted file mode 100644
index e6e32ce..0000000
--- a/home-manager/users/chest/modules/sops.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }: {
-  sops = {
-    defaultSopsFile = ../secrets.yaml;
-    age.keyFile = "/home/chest/.config/sops/age/keys.txt";
-
-    secrets."tokens/apis/wallhaven" = {};
-  };
-}
diff --git a/home-manager/users/chest/modules/style.nix b/home-manager/users/chest/modules/style.nix
index 3604d3c..7a644f9 100644
--- a/home-manager/users/chest/modules/style.nix
+++ b/home-manager/users/chest/modules/style.nix
@@ -4,6 +4,7 @@
     targets = {
       hyprland.enable = false;
       waybar.enable = false;
+      kitty.variant256Colors = true;
     };
 
     base16Scheme = "${pkgs.base16-schemes}/share/themes/eris.yaml";
diff --git a/home-manager/users/chest/modules/waybar.nix b/home-manager/users/chest/modules/waybar.nix
new file mode 100644
index 0000000..41ab218
--- /dev/null
+++ b/home-manager/users/chest/modules/waybar.nix
@@ -0,0 +1,9 @@
+{ pkgs, config, ... }: {
+  imports = [(
+    import ../../../patterns/waybar.nix {
+      inherit pkgs;
+      inherit config;
+      active_color = "#d197d9";
+    }
+  )];
+}
diff --git a/home-manager/users/chest/modules/wms/hyprland.nix b/home-manager/users/chest/modules/wms/hyprland.nix
deleted file mode 100644
index 32fce92..0000000
--- a/home-manager/users/chest/modules/wms/hyprland.nix
+++ /dev/null
@@ -1,278 +0,0 @@
-{ pkgs, lib, config, ... }: {
-  wayland.windowManager.hyprland =
-  let
-    colors = config.lib.stylix.colors;
-    
-    wallpaper_changer = pkgs.writers.writePython3Bin "wallpaper_changer" {
-      flakeIgnore = [ "E501" "E111" "E701" "E241" "E731" ];
-    } /*py*/ ''
-      import requests as requests
-      from random import choice
-      from os import system, mkdir, listdir
-      from os.path import exists
-
-      notify = lambda s: system(f"notify-desktop Wallpaper '{s}'")
-      folder = "/home/chest/Wallpapers"
-      url = "https://wallhaven.cc/api/v1/collections/cheeeest/1767552"
-      token = "8KkNcm3jS0hbjt0MPQXCi9EW0rMsqw5r"
-
-      notify("Updating wallpaper!")
-
-      try:
-        json = requests.get(url, params={'apikey': token}).json()
-
-        wallpaper = choice(json['data'])
-        link = wallpaper['path']
-        format = wallpaper['file_type']
-        id = wallpaper['id']
-
-        if format == "image/jpeg": ext = "jpg"
-        else:                      ext = "png"
-
-        filename = f"{id}.{ext}"
-
-        if not exists(f"{folder}/{filename}"):
-          if not exists(folder):
-            mkdir(f"{folder}")
-
-          notify("Downloading...")
-          with open(f"{folder}/{filename}", 'wb') as f:
-            r = requests.get(link)
-            f.write(r.content)
-
-      except requests.exceptions.ConnectionError:
-        notify("Offline mode")
-        filename = choice(listdir(folder))
-
-      finally:
-        system(f"swww img {folder}/{filename}")
-    '';
-  in {
-    enable = true;
-    xwayland.enable = true;
-
-    settings = {
-      "$mainMod" = "SUPER";
-
-      monitor = ",preferred,auto,1";
-
-      env = [
-        "LIBVA_DRIVER_NAME,nvidia"
-        "XDG_SESSION_TYPE,wayland"
-        "GBM_BACKEND,nvidia"
-        "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-        "WLR_NO_HARDWARE_CURSORS,1"
-        "XDG_CURRENT_DESKTOP,Hyprland"
-        "XDG_SESSION_TYPE,wayland"
-        "XDG_SESSION_DESKTOP,Hyprland"
-        "XCURSOR_SIZE,36"
-        "QT_QPA_PLATFORM,wayland"
-        "XDG_SCREENSHOTS_DIR,~/screens"
-      ];
-
-      debug = {
-        disable_logs = false;
-        enable_stdout_logs = true;
-      };
-
-      input = {
-        kb_layout = "us,ru";
-        kb_variant = "lang";
-        kb_options = "grp:caps_toggle";
-
-        follow_mouse = 1;
-
-        touchpad = {
-          natural_scroll = false;
-        };
-
-        sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
-      };
-
-      general = {
-        gaps_in = 5;
-        gaps_out = 20;
-        border_size = 3;
-        "col.active_border" = "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
-        "col.inactive_border" = "rgba(${colors.base05}aa)";
-
-        layout = "dwindle";
-      };
-
-      decoration = {
-        rounding = 10;
-
-        blur = {
-          enabled = true;
-          size = 16;
-          passes = 2;
-          new_optimizations = true;
-        };
-
-        drop_shadow = true;
-        shadow_range = 4;
-        shadow_render_power = 3;
-        "col.shadow" = "rgba(1a1a1aee)";
-      };
-
-      animations = {
-        enabled = true;
-
-        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
-        # bezier = "myBezier, 0.33, 0.82, 0.9, -0.08";
-
-        animation = [
-          "windows,     1, 7,  myBezier"
-          "windowsOut,  1, 7,  default, popin 80%"
-          "border,      1, 10, default"
-          "borderangle, 1, 8,  default"
-          "fade,        1, 7,  default"
-          "workspaces,  1, 6,  default"
-        ];
-      };
-
-      dwindle = {
-        pseudotile = true; # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-        smart_split = true;
-      };
-
-      master = {
-        new_status = "master";
-      };
-
-      gestures = {
-        workspace_swipe = true;
-        workspace_swipe_fingers = 3;
-        workspace_swipe_invert = true;
-        workspace_swipe_distance = 200;
-        workspace_swipe_forever = true;
-      };
-
-      misc = {
-        animate_manual_resizes = true;
-        animate_mouse_windowdragging = true;
-        enable_swallow = true;
-        render_ahead_of_time = false;
-        disable_hyprland_logo = false;
-      };
-
-      windowrule = [
-        "float, ^(imv)$"
-        "float, ^(feh)$"
-        "float, ^(mpv)$"
-        "float, ^(nmtui)$"
-        "float, title:^(Список друзей)"
-      ];
-
-      windowrulev2 = [
-        "opacity 0.75, class:vesktop"
-      ];
-
-      exec-once = [
-          "systemctl --user start plasma-polkit-agent"
-          "swww init"
-          "python3 ${lib.getExe wallpaper_changer}"
-          "waybar"
-          "wl-paste --type text --watch cliphist store"
-          "wl-paste --type image --watch cliphist store"
-        ];
-
-      bind = [
-        "$mainMod, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy"
-
-        "$mainMod, Return, exec, alacritty"
-        "$mainMod, Q, killactive,"
-        "$mainMod, M, exit,"
-        "$mainMod, E, exec, alacritty -e sh -c yazi"
-        "$mainMod, F, togglefloating,"
-        "$mainMod, D, exec, wofi --show drun"
-        "$mainMod, P, pseudo, # dwindle"
-        "$mainMod, J, togglesplit, # dwindle"
-
-        # Move focus with mainMod + arrow keys
-        "$mainMod, left,  movefocus, l"
-        "$mainMod, right, movefocus, r"
-        "$mainMod, up,    movefocus, u"
-        "$mainMod, down,  movefocus, d"
-
-        # Moving windows
-        "$mainMod SHIFT, left,  swapwindow, l"
-        "$mainMod SHIFT, right, swapwindow, r"
-        "$mainMod SHIFT, up,    swapwindow, u"
-        "$mainMod SHIFT, down,  swapwindow, d"
-
-        # Window resizing                     X  Y
-        "$mainMod CTRL, left,  resizeactive, -60 0"
-        "$mainMod CTRL, right, resizeactive,  60 0"
-        "$mainMod CTRL, up,    resizeactive,  0 -60"
-        "$mainMod CTRL, down,  resizeactive,  0  60"
-
-        # Switch workspaces with mainMod + [0-9]
-        "$mainMod, 1, workspace, 1"
-        "$mainMod, 2, workspace, 2"
-        "$mainMod, 3, workspace, 3"
-        "$mainMod, 4, workspace, 4"
-        "$mainMod, 5, workspace, 5"
-        "$mainMod, 6, workspace, 6"
-        "$mainMod, 7, workspace, 7"
-        "$mainMod, 8, workspace, 8"
-        "$mainMod, 9, workspace, 9"
-        "$mainMod, 0, workspace, 10"
-
-        # Move active window to a workspace with mainMod + SHIFT + [0-9]
-        "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
-        "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
-        "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
-        "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
-        "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
-        "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
-        "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
-        "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
-        "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
-        "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
-
-        "$mainMod SHIFT, F, fullscreen"
-
-        # Scroll through existing workspaces with mainMod + scroll
-        "$mainMod, mouse_down, workspace, e+1"
-        "$mainMod, mouse_up, workspace, e-1"
-
-        # Keyboard backlight
-        "$mainMod, F3, exec, brightnessctl -d *::kbd_backlight set +33%"
-        "$mainMod, F2, exec, brightnessctl -d *::kbd_backlight set 33%-"
-
-        # Volume and Media Control
-        ", XF86AudioRaiseVolume, exec, pamixer -i 5 "
-        ", XF86AudioLowerVolume, exec, pamixer -d 5 "
-        ", XF86AudioMute, exec, pamixer -t"
-        ", XF86AudioMicMute, exec, pamixer --default-source -m"
-        
-        # Brightness control
-        ", XF86MonBrightnessDown, exec, brightnessctl set 5%- "
-        ", XF86MonBrightnessUp, exec, brightnessctl set +5% "
-
-        # Configuration files
-        ''$mainMod ALT, N, exec, alacritty -e sh -c "rb"''
-        ''$mainMod ALT, C, exec, alacritty -e sh -c "conf"''
-        ''$mainMod ALT, H, exec, alacritty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/hyprland.nix"''
-        ''$mainMod ALT, W, exec, alacritty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/waybar.nix"''
-        ''$mainMod Shift, S, exec, grim -g "$(slurp)" - | swappy -f -''
-
-        # Waybar
-        "$mainMod, B, exec, pkill -SIGUSR1 waybar"
-        #"$mainMod, W, exec, pkill -SIGUSR2 waybar"
-
-        "$mainMod, W, exec, python3 ${lib.getExe wallpaper_changer}"
-
-        # Disable all effects
-        "$mainMod Shift, G, exec, ~/.config/hypr/gamemode.sh "
-      ];
-
-      # Move/resize windows with mainMod + LMB/RMB and dragging
-      bindm = [
-        "$mainMod, mouse:272, movewindow"
-        "$mainMod, mouse:273, resizewindow"
-      ];
-    };
-  };
-}
diff --git a/home-manager/users/chest/modules/wms/mako.nix b/home-manager/users/chest/modules/wms/mako.nix
deleted file mode 100644
index b010503..0000000
--- a/home-manager/users/chest/modules/wms/mako.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  xdg.configFile."mako/config".text = ''
-    background-color=#303446
-    text-color=#c6d0f5
-    border-color=#8caaee
-    progress-color=over #414559
-    default-timeout=5000
-
-    [urgency=high]
-    border-color=#ef9f76
-  '';
-}
diff --git a/home-manager/users/chest/modules/wms/waybar.nix b/home-manager/users/chest/modules/wms/waybar.nix
deleted file mode 100644
index 41fab82..0000000
--- a/home-manager/users/chest/modules/wms/waybar.nix
+++ /dev/null
@@ -1,455 +0,0 @@
-{ pkgs, config, ...}: {
-  home.packages = [ pkgs.pulsemixer ];
-  wayland.windowManager.hyprland.settings.windowrule = [
-    "float, ^(pulsemixer)"
-    "float, ^(nmtui)"
-  ];
-
-  xdg.configFile."waybar/scripts/wttr.py".source = pkgs.fetchurl {
-    name = "waybar-wttr.py";
-    url = "https://gist.githubusercontent.com/bjesus/f8db49e1434433f78e5200dc403d58a3/raw/47f9ffd573dc8e8edce0ea6708601b8e685a70ab/waybar-wttr.py";
-    sha256 = "15j2cqg405q37wrrlm70mhp7rx6xnrn92rfm1ix6g3nl98ksh45g";
-  };
-
-  programs.waybar =
-  let
-    colors = config.lib.stylix.colors;
-  in {
-    enable = true;
-
-    settings = {
-      mainBar = {
-        layer = "top";
-        position = "top";
-        margin = "9 13 -10 18";
-
-        modules-left = ["hyprland/workspaces" "hyprland/language" "keyboard-state" "hyprland/submap"];
-        modules-center = ["mpris" "wlr/taskbar"];
-        modules-right = ["group/system" "battery" "pulseaudio" "clock" "tray"];
-
-        "hyprland/workspaces" = {
-          disable-scroll = true;
-        };
-
-        "wlr/taskbar" = {
-            on-click = "activate";
-            on-click-middle = "close";
-            on-click-right = "minimize";
-        };
-
-        "group/system" = {
-            orientation = "inherit";
-            drawer = {
-                transition-duration = 500;
-                transition-left-to-right = false;
-            };
-            modules = [
-                "network"
-                "custom/mem"
-                "cpu"
-                "temperature"
-                "backlight"
-            ];
-        };
-
-
-    "hyprland/language" = {
-        format-en = "US";
-        format-ru = "RU";
-	      min-length = 5;
-	      tooltip = false;
-    };
-
-    "keyboard-state" = {
-        capslock = true;
-        format = "{icon}";
-        format-icons = {
-            locked = "CUPS";
-            unlocked = "";
-        };
-    };
-
-    "clock" = {
-        tooltip = false;
-        format = "{:%a, %d %b %R}";
-    };
-
-    "custom/weather" = {
-        format = "{}";
-        tooltip = true;
-        interval = 1800;
-        exec = "python3 $HOME/.config/waybar/scripts/wttr.py";
-        return-type = "json";
-    };
-
-    "pulseaudio" = {
-        # scroll-step = 1; # %, can be a float
-        reverse-scrolling = 1;
-        format = "{volume}% {icon} {format_source}";
-        format-bluetooth = "{volume}% {icon} {format_source}";
-        format-bluetooth-muted = " {icon} {format_source}";
-        format-muted = " {format_source}";
-        format-source = "{volume}% ";
-        format-source-muted = "";
-        format-icons = {
-            headphone = "";
-            hands-free = "";
-            headset = "";
-            phone = "";
-            portable = "";
-            car = "";
-            default = ["" "" ""];
-        };
-        on-click = "alacritty --class pulsemixer -e pulsemixer";
-        min-length = 13;
-    };
-
-    "custom/mem" = {
-        format = "{} ";
-        interval = 3;
-        exec = "free -h | awk '/Mem:/{printf $3}'";
-        tooltip = false;
-    };
-
-    "cpu" = {
-      interval = 2;
-      format = "{usage}% ";
-      min-length = 6;
-    };
-
-    "temperature" = {
-        # thermal-zone = 2;
-        # hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
-        critical-threshold = 80;
-        # format-critical = "{temperatureC}°C {icon}";
-        format = "{temperatureC}°C {icon}";
-        format-icons = ["" "" "" "" ""];
-        tooltip = false;
-    };
-
-    "network" = {
-      format = "{ifname}";
-      format-wifi = "{essid} ({signalStrength}%) ";
-      format-ethernet = "{ifname} ";
-      format-disconnected = "";
-      tooltip-format = "{ifname}";
-      tooltip-format-wifi = "{essid} ({signalStrength}%) ";
-      tooltip-format-ethernet = "{ifname} ";
-      tooltip-format-disconnected = "Disconnected";
-      max-length = 50;
-      on-click = "alacritty --class nmtui -e sh -c nmtui";
-    };
-
-    "backlight" = {
-        device = "intel_backlight";
-        format = "{percent}% {icon}";
-        format-icons = [""];
-        min-length = 7;
-    };
-
-    battery = {
-        states = {
-            warning = 30;
-            critical = 15;
-        };
-        format = "{capacity}%";
-        format-charging = "{capacity}% {time}";
-        format-plugged = "{capacity}%";
-        format-alt = "{time}";
-        format-time = "{H}:{m}";
-    };
-
-    mpris = {
-        format = "{title}";
-        format-len = "20";
-    };
-
-    tray = {
-        icon-size = 16;
-        spacing = 0;
-    };
-
-      };
-    };
-  
-    style = /*css*/
-      ''
-* {
-    border: none;
-    border-radius: 0;
-    /* `otf-font-awesome` is required to be installed for icons */
-    font-family: JetBrains Mono;
-    font-weight: bold; 
-    min-height: 20px;
-}
-
-window#waybar {
-    background: transparent;
-}
-
-window#waybar.hidden {
-    opacity: 0.2;
-}
-
-#workspaces {
-    margin-right: 8px;
-    border-radius: 10px;
-    transition: none;
-    background: #${colors.base00};
-}
-
-#workspaces button {
-    transition: none;
-    color: #${colors.base04};
-    background: transparent;
-    padding: 5px;
-    font-size: 18px;
-}
-
-#workspaces button.persistent {
-    font-size: 12px;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-#workspaces button:hover {
-    transition: none;
-    box-shadow: inherit;
-    text-shadow: inherit;
-    border-radius: inherit;
-    color: #${colors.base05};
-}
-
-#workspaces button.active {
-    background: #${colors.base02};
-    color: #${colors.base05};
-    border-radius: inherit;
-}
-
-#taskbar {
-    border-radius: 10px;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#taskbar button {
-    transition: none;
-    background: transparent;
-    border-radius: 10px;
-    padding: 8px;
-    margin: 0px;
-}
-
-#taskbar button:hover {
-    transition: none;
-    box-shadow: inherit;
-    text-shadow: inherit;
-    border-radius: inherit;
-    background: #${colors.base02};
-}
-
-#taskbar button.active {
-    background: #d197d9;
-}
-
-#language {
-    padding: 8px 0px 8px 8px;
-    border-radius: 10px 0px 0px 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#keyboard-state {
-    margin-right: 8px;
-    padding: 8px 8px 8px 0px;
-    border-radius: 0px 10px 10px 0px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#custom-pacman {
-    padding-left: 16px;
-    padding-right: 8px;
-    border-radius: 10px 0px 0px 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#custom-mail {
-    margin-right: 8px;
-    padding-right: 16px;
-    border-radius: 0px 10px 10px 0px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#submap {
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#clock {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#network {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#network.disconnected {
-    color: #${colors.base00};
-    background-color: #${colors.base08};
-}
-
-#custom-weather {
-    padding-right: 16px;
-    border-radius: 0px 10px 10px 0px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#pulseaudio {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#pulseaudio.muted {
-    background-color: #${colors.base08};
-    color: #${colors.base01};
-}
-
-#custom-mem {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#cpu {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#temperature {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#temperature.critical {
-    background-color: #${colors.base08};
-}
-
-#backlight {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#battery {
-    margin-right: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#battery.charging {
-    color: #${colors.base05};
-    background-color: #${colors.base0B};
-}
-
-#battery.warning:not(.charging) {
-    background-color: #${colors.base09};
-    color: black;
-}
-
-#battery.critical:not(.charging) {
-    background-color: #${colors.base08};
-    color: #${colors.base05};
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
-#tray {
-    padding-left: 16px;
-    padding-right: 16px;
-    border-radius: 10px;
-    transition: none;
-    color: #${colors.base05};
-    background: #${colors.base00};
-}
-
-#mpris{
-    background: #${colors.base00};
-    border-radius: 10px;
-    color: #${colors.base05};
-    padding: 0px 8px;
-    margin: 0px 8px;
-}
-
-#mpris.playing {
-    background-color: #${colors.base0B};
-    color: #${colors.base01};
-}
-
-#mpris.paused {
-    background-color: #${colors.base0A};
-    color: #${colors.base01};
-}
-
-@keyframes blink {
-    to {
-        background-color: #${colors.base05};
-        color: #${colors.base00};
-    }
-}
-      '';
-  };
-}
diff --git a/home-manager/users/chest/modules/wms/wofi.nix b/home-manager/users/chest/modules/wms/wofi.nix
deleted file mode 100644
index c46a2e3..0000000
--- a/home-manager/users/chest/modules/wms/wofi.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }: {
-  xdg.configFile."wofi/style.css".source = pkgs.requireFile {
-  xdg.configFile."wofi/style.css".source = pkgs.fetchurl {
-    name = "style.css";
-    url = "https://raw.githubusercontent.com/PaulGuerre/arch_dotfiles/main/wofi/style.css";
-    sha256 = "16lr4j0nn6kpggr4wdz9s0jymqmn05vm7i4vsdslzp5vlarcv03j";
-  };
-}
diff --git a/home-manager/users/chest/secrets.yaml b/home-manager/users/chest/secrets.yaml
new file mode 100644
index 0000000..bacf01a
--- /dev/null
+++ b/home-manager/users/chest/secrets.yaml
@@ -0,0 +1,23 @@
+tokens:
+    apis:
+        wallhaven: ENC[AES256_GCM,data:7vHkndUVda78lMscP25sAAxSjTcJ7a/Fb+Wu0NHtUG4=,iv:O9xJAYEwkX7RMoxOf6QHWt1wOaMAmTGzJkCBO/cGvXs=,tag:lwsWCtbC8NxMf11Sj1ifLw==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1j3uuyax673fvl5x4dveupq3dylngnrq0e5uy7fmclsexkfd25vysk646wk
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnbDl6ZWZpc2U2SnNYQVpJ
+            cmtBRzVOZTdOaXd6MFFnTGFLbzBhNldlN25RCisyNnAwY21udlZCWEc4U2hPa2di
+            WXN5cEduMXUwNXpmU0hBQzdkamtSd28KLS0tIHUzd3RTbUM4VnFYZkRYbXJCUDZl
+            UkZPZUlLQVNUZ1ZGV3BZM3hib3JHMXcKqyQUcRMhoVHK78lAYl2vSJUCxBL6atLb
+            VXT5DV67KKnUKyKUAQ+gjEP9EpvR16PBCZ+EcSFfx/azHONCtV3mZg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-10-02T18:38:04Z"
+    mac: ENC[AES256_GCM,data:xe8S8xpJtqd8ip5w7ZOWVSlkVEBpLVMSWCrJiz+bTd0Pgn5EVLtIro5JJu5hFbCspMj42sukuj0nI0fC/ryESm0eKwSzBQy0jGCr0jyd2Ie280Do4QYYasnoZ46GbhhHAxBLnr2FKHhZLS7dUzGp3nsgh1d3RAvf6hiB1GcYv5k=,iv:1DPhQgiwNzc8IUmgX6UMdK5sWzjP0pLJkEmRKJ5ol/U=,tag:LvieY4xTgy118/iOctRkOA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.0
diff --git a/home-manager/users/chest/zsh.nix b/home-manager/users/chest/zsh.nix
deleted file mode 100644
index 290f79f..0000000
--- a/home-manager/users/chest/zsh.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ config, ... }: {
-  programs.zoxide.enable = true;
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    # enableAutosuggestions = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-
-    shellAliases =
-      let
-        flakeDir = "~/nix";
-      in {
-      rb = "sudo nixos-rebuild switch --flake ${flakeDir}";
-      upd = "nix flake update ${flakeDir}";
-      upg = "sudo nixos-rebuild switch --upgrade --flake ${flakeDir}";
-
-      hms = "home-manager switch --flake ${flakeDir}";
-
-      conf = "$EDITOR ${flakeDir}/nixos/hosts/$(hostname)/configuration.nix";
-      pkgs = "$EDITOR ${flakeDir}/nixos/packages.nix";
-
-      ll = "ls -l";
-      se = "sudoedit";
-      ff = "fastfetch";
-      cat = "bat";
-      cd = "z";
-    };
-
-    initExtra = ''
-      if [ -z "''${WAYLAND_DISPLAY}" ] && [ "''${XDG_VTNR}" -eq 1 ]; then
-        dbus-run-session Hyprland
-      fi
-      eval "$(zoxide init zsh)"
-    '';
-
-    history.size = 10000;
-    history.path = "${config.xdg.dataHome}/zsh/history";
-
-    oh-my-zsh = {
-      enable = true;
-      plugins = [ "git" "sudo" ];
-      theme = "agnoster"; # blinks is also really nice
-    };
-  };
-}
diff --git a/home-manager/users/sweetbread/home.nix b/home-manager/users/sweetbread/home.nix
index f20fa21..294546a 100644
--- a/home-manager/users/sweetbread/home.nix
+++ b/home-manager/users/sweetbread/home.nix
@@ -1,7 +1,15 @@
 { pkgs, ... }: {
   imports = [
-    ./zsh.nix
-    ./modules/bundle.nix
+    ../../modules/bundle.nix
+
+    ../../packages/coding.nix
+    ../../packages/desktop.nix
+    ../../packages/utils.nix
+
+    ./modules/git.nix
+    ./modules/hyprland.nix
+    ./modules/style.nix
+    ./modules/waybar.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -10,44 +18,6 @@
     username = "sweetbread";
     homeDirectory = "/home/sweetbread";
     stateVersion = "23.11";
-
-    packages = with pkgs; [
-      # Desktop apps
-      google-chrome
-      telegram-desktop
-      vesktop
-      obs-studio
-      mpv
-      obsidian
-      vscode
-      jetbrains.pycharm-community
-      jetbrains.idea-community
-      android-studio
-      thunderbird
-    
-      # Coding stuff
-      cmake
-      gnumake
-      nodejs
-      (python3.withPackages (ps: with ps; [ requests bpython ]))
-      python311Packages.pip
-      rocmPackages.llvm.clang-tools-extra
-      rocmPackages.llvm.clang
-      ncurses
-
-      # CLI utils
-      scrot
-      ffmpeg
-      yt-dlp
-      bat
-      fd
-
-      # GUI utils
-      feh
-      imv
-      gromit-mpx
-      notify-desktop
-    ];
   };
 
   services.syncthing.enable = true;
diff --git a/home-manager/users/sweetbread/modules/hyprland.nix b/home-manager/users/sweetbread/modules/hyprland.nix
new file mode 100644
index 0000000..443dd0f
--- /dev/null
+++ b/home-manager/users/sweetbread/modules/hyprland.nix
@@ -0,0 +1,94 @@
+{ pkgs, lib, config, ... }: {
+  imports = [(
+    import ../../../patterns/hyprland.nix {
+      inherit lib;
+      inherit pkgs;
+      inherit config;
+      collection = "sweetbread/1764377";
+      swww_flags = "--transition-type center";
+    }
+  )];
+
+  wayland.windowManager.hyprland = let
+    colors = config.lib.stylix.colors;
+  in {
+    settings = {
+      monitor = [
+        "DP-3, 3440x1440@165.00Hz, auto-right, 1"
+        # "HDMI-A-1, 3840x2160@60.00Hz, auto-left, 2"
+        "HDMI-A-1, disabled"
+        ",preferred,auto,1"
+      ];
+
+      general = {
+        gaps_in = 5;
+        gaps_out = 20;
+        border_size = 3;
+        "col.active_border" = "rgba(${colors.base0C}ee) rgba(${colors.base0B}ee) 45deg";
+        "col.inactive_border" = "rgba(${colors.base05}aa)";
+
+        layout = "dwindle";
+      };
+
+      decoration = {
+        rounding = 10;
+
+        blur = {
+          enabled = true;
+          size = 16;
+          passes = 2;
+          new_optimizations = true;
+        };
+
+        drop_shadow = true;
+        shadow_range = 4;
+        shadow_render_power = 3;
+        "col.shadow" = "rgba(1a1a1aee)";
+      };
+
+      animations = {
+        enabled = true;
+
+        bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
+
+        animation = [
+          "windows,     1, 7,  myBezier"
+          "windowsOut,  1, 7,  default, popin 80%"
+          "border,      1, 10, default"
+          "borderangle, 1, 8,  default"
+          "fade,        1, 7,  default"
+          "workspaces,  1, 6,  default"
+        ];
+      };
+
+      dwindle = {
+        pseudotile = true;
+        smart_split = true;
+      };
+
+      master.new_status = "master";
+
+      gestures = {
+        workspace_swipe = true;
+        workspace_swipe_fingers = 3;
+        workspace_swipe_invert = true;
+        workspace_swipe_distance = 200;
+        workspace_swipe_forever = true;
+      };
+
+      misc = {
+        animate_manual_resizes = true;
+        animate_mouse_windowdragging = true;
+        enable_swallow = true;
+        render_ahead_of_time = false;
+        disable_hyprland_logo = false;
+      };
+
+      bind = [
+        "    , Print, exec, grimblast --notify copy output"
+        "CTRL, Print, exec, grimblast --notify copy area"
+        "ALT , Print, exec, grimblast --notify copy active"
+      ];
+    };
+  };
+}
diff --git a/home-manager/users/sweetbread/modules/qt.nix b/home-manager/users/sweetbread/modules/qt.nix
deleted file mode 100644
index 792c144..0000000
--- a/home-manager/users/sweetbread/modules/qt.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  qt = {
-    enable = true;
-    platformTheme = "qtct";
-    style.name = "kvantum";
-  };
-}
diff --git a/home-manager/users/sweetbread/modules/sops.nix b/home-manager/users/sweetbread/modules/sops.nix
deleted file mode 100644
index e95b390..0000000
--- a/home-manager/users/sweetbread/modules/sops.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }: {
-  sops = {
-    defaultSopsFile = ../secrets.yaml;
-    age.keyFile = "/home/sweetbread/.config/sops/age/keys.txt";
-
-    secrets."tokens/apis/wallhaven" = {};
-  };
-}
diff --git a/home-manager/users/sweetbread/modules/style.nix b/home-manager/users/sweetbread/modules/style.nix
index 94ba86e..6c30cab 100644
--- a/home-manager/users/sweetbread/modules/style.nix
+++ b/home-manager/users/sweetbread/modules/style.nix
@@ -4,6 +4,7 @@
     targets = {
       hyprland.enable = false;
       waybar.enable = false;
+      kitty.variant256Colors = true;
     };
 
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
diff --git a/home-manager/users/sweetbread/modules/waybar.nix b/home-manager/users/sweetbread/modules/waybar.nix
new file mode 100644
index 0000000..3577dd8
--- /dev/null
+++ b/home-manager/users/sweetbread/modules/waybar.nix
@@ -0,0 +1,9 @@
+{ pkgs, config, ... }: {
+  imports = [(
+    import ../../../patterns/waybar.nix {
+      inherit pkgs;
+      inherit config;
+      active_color = "#${config.lib.stylix.colors.base0B}";
+    }
+  )];
+}
diff --git a/nixos/hosts/Rias/configuration.nix b/nixos/hosts/Rias/configuration.nix
index e445dcc..2897565 100644
--- a/nixos/hosts/Rias/configuration.nix
+++ b/nixos/hosts/Rias/configuration.nix
@@ -3,6 +3,7 @@
     ./hardware-configuration.nix
     ../../packages.nix
     ../../modules/bundle.nix
+    ../../modules/adb.nix
     ../../modules/gamemode.nix
     ../../modules/users/sweetbread.nix
   ];
diff --git a/nixos/hosts/Senko/configuration.nix b/nixos/hosts/Senko/configuration.nix
index 652051b..40b02c7 100644
--- a/nixos/hosts/Senko/configuration.nix
+++ b/nixos/hosts/Senko/configuration.nix
@@ -3,7 +3,7 @@
     ./hardware-configuration.nix
     ../../packages.nix
     ../../modules/bundle.nix
-    ../../modules/gamemode.nix
+    ../../modules/adb.nix
     ../../modules/users/sweetbread.nix
     ../../modules/laptop.nix
   ];
diff --git a/nixos/modules/bundle.nix b/nixos/modules/bundle.nix
index 3cd7b20..6e59d78 100644
--- a/nixos/modules/bundle.nix
+++ b/nixos/modules/bundle.nix
@@ -11,7 +11,6 @@
     ./bluetooth.nix
     ./vpn.nix
     ./printing.nix
-    ./adb.nix
     ./shutdown-on-lan.nix
   ];
 }