diff --git a/nix/deadlock.patch b/deadlock.patch
similarity index 100%
rename from nix/deadlock.patch
rename to deadlock.patch
diff --git a/nix/flake.lock b/flake.lock
similarity index 100%
rename from nix/flake.lock
rename to flake.lock
diff --git a/nix/flake.nix b/flake.nix
similarity index 100%
rename from nix/flake.nix
rename to flake.nix
diff --git a/nix/hardwares/doloro-wsl/home.nix b/hardwares/doloro-wsl/home.nix
similarity index 100%
rename from nix/hardwares/doloro-wsl/home.nix
rename to hardwares/doloro-wsl/home.nix
diff --git a/nix/hardwares/doloro-wsl/nixos.nix b/hardwares/doloro-wsl/nixos.nix
similarity index 100%
rename from nix/hardwares/doloro-wsl/nixos.nix
rename to hardwares/doloro-wsl/nixos.nix
diff --git a/nix/hardwares/doloro/disks.nix b/hardwares/doloro/disks.nix
similarity index 100%
rename from nix/hardwares/doloro/disks.nix
rename to hardwares/doloro/disks.nix
diff --git a/nix/hardwares/doloro/hardware-configuration.nix b/hardwares/doloro/hardware-configuration.nix
similarity index 100%
rename from nix/hardwares/doloro/hardware-configuration.nix
rename to hardwares/doloro/hardware-configuration.nix
diff --git a/nix/hardwares/doloro/home.nix b/hardwares/doloro/home.nix
similarity index 100%
rename from nix/hardwares/doloro/home.nix
rename to hardwares/doloro/home.nix
diff --git a/nix/hardwares/doloro/nixos.nix b/hardwares/doloro/nixos.nix
similarity index 100%
rename from nix/hardwares/doloro/nixos.nix
rename to hardwares/doloro/nixos.nix
diff --git a/nix/hosts/doloro-wsl/home.nix b/hosts/doloro-wsl/home.nix
similarity index 100%
rename from nix/hosts/doloro-wsl/home.nix
rename to hosts/doloro-wsl/home.nix
diff --git a/nix/hosts/doloro-wsl/nixos.nix b/hosts/doloro-wsl/nixos.nix
similarity index 100%
rename from nix/hosts/doloro-wsl/nixos.nix
rename to hosts/doloro-wsl/nixos.nix
diff --git a/nix/hosts/doloro/home.nix b/hosts/doloro/home.nix
similarity index 100%
rename from nix/hosts/doloro/home.nix
rename to hosts/doloro/home.nix
diff --git a/nix/hosts/doloro/nixos.nix b/hosts/doloro/nixos.nix
similarity index 100%
rename from nix/hosts/doloro/nixos.nix
rename to hosts/doloro/nixos.nix
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
deleted file mode 100755
index 2cefa3a..0000000
--- a/hypr/hyprland.conf
+++ /dev/null
@@ -1,341 +0,0 @@
-# This is an example Hyprland config file.
-# Refer to the wiki for more information.
-# https://wiki.hypr.land/Configuring/
-
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-
-# You can split this configuration into multiple files
-# Create your files separately and then link them to this file like this:
-# source = ~/.config/hypr/myColors.con
-
-
-################
-### MONITORS ###
-################
-
-# See https://wiki.hypr.land/Configuring/Monitors/
-
-monitor=HDMI-A-1, 1920x1080@60, 0x0, 1
-monitor=DP-3, 1920x1080@144, 1920x0, 1
-
-
-#################
-### Variables ###
-#################
-
-$terminal = foot
-$fileManager = nemo
-$menu = wofi --show drun
-
-$notificationDaemon = dunst
-
-$screenShot = wayfreeze --after-freeze-cmd 'grim -g "$(slurp -d)" - | wl-copy -t image/png;killall wayfreeze' --hide-cursor
-$quickshellBar = quickshell
-$steam = /usr/bin/steam-native
-$ar_rpc = /usr/bin/arrpc
-$polkit = systemctl --user start hyprpolkitagent
-$vesktop = vesktop
-$telegram = Telegram
-$qbit = qbittorrent
-$obs = obs --startreplaybuffer --disable-shutdown-check
-
-$toggleSpeaker = wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-$toggleMic = wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-
-#################
-### AUTOSTART ###
-#################
-
-# Autostart necessary processes (like notifications daemons, status bars, etc.)
-# Or execute your favorite apps at launch like this:
-
-exec-once = $notificationDaemon
-exec-once = $quickshellBar
-exec-once = $steam
-exec-once = hyprpaper
-exec-once = $ar_rpc
-exec-once = $polkit
-exec-once = $vesktop
-exec-once = $telegram
-exec-once = $qbit
-exec-once = $obs
-
-#todo move to proper place
-exec-once = pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=GameAudioSink' -n GameAudioSink &
-exec-once = pw-loopback -m '[ FL FR]' --capture-props='media.class=Audio/Sink node.name=DiscordSink' -n DiscordSink &
-
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-# See https://wiki.hypr.land/Configuring/Environment-variables/
-
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_SIZE,24
-# Nvidia # https://wiki.hypr.land/Nvidia/#environment-variables
-env = LIBVA_DRIVER_NAME,nvidia
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-env = WEBKIT_DISABLE_DMABUF_RENDERER,1
-
-###################
-### PERMISSIONS ###
-###################
-
-# See https://wiki.hypr.land/Configuring/Permissions/
-# Please note permission changes here require a Hyprland restart and are not applied on-the-fly
-# for security reasons
-
-# ecosystem {
-#   enforce_permissions = 1
-# }
-
-# permission = /usr/(bin|local/bin)/grim, screencopy, allow
-permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow
-# permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
-
-
-#####################
-### LOOK AND FEEL ###
-#####################
-
-# Refer to https://wiki.hypr.land/Configuring/Variables/
-
-# https://wiki.hypr.land/Configuring/Variables/#general
-general {
-    gaps_in = 1
-    gaps_out = 1
-
-    border_size = 1
-
-    # https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
-
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = false
-
-    # Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on
-    allow_tearing = true
-
-    layout = dwindle
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#decoration
-decoration {
-    rounding = 0
-    rounding_power = 1
-
-    # Change transparency of focused and unfocused windows
-    active_opacity = 1.0
-    inactive_opacity = 1.0
-
-    shadow {
-        enabled = false
-        range = 4
-        render_power = 3
-        color = rgba(1a1a1aee)
-    }
-
-    # https://wiki.hypr.land/Configuring/Variables/#blur
-    blur {
-        enabled = false
-        size = 3
-        passes = 1
-
-        vibrancy = 0.1696
-    }
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#animations
-animations {
-    enabled = yes, please :)
-
-    # Default animations, see https://wiki.hypr.land/Configuring/Animations/ for more
-
-    bezier = easeOutQuint,0.23,1,0.32,1
-    bezier = easeInOutCubic,0.65,0.05,0.36,1
-    bezier = linear,0,0,1,1
-    bezier = almostLinear,0.5,0.5,0.75,1.0
-    bezier = quick,0.15,0,0.1,1
-
-    animation = global, 1, 10, default
-    animation = border, 1, 5.39, easeOutQuint
-    animation = windows, 1, 2.79, easeOutQuint
-    animation = windowsIn, 1, 1.1, easeOutQuint, popin 87%
-    animation = windowsOut, 1, 1.49, linear, popin 87%
-    animation = fadeIn, 1, 1.73, almostLinear
-    animation = fadeOut, 1, 1.46, almostLinear
-    animation = fade, 1, 2.03, quick
-    animation = layers, 1, 3.81, easeOutQuint
-    animation = layersIn, 1, 4, easeOutQuint, fade
-    animation = layersOut, 1, 1.5, linear, fade
-    animation = fadeLayersIn, 1, 1.79, almostLinear
-    animation = fadeLayersOut, 1, 1.39, almostLinear
-    animation = workspaces, 1, 1.94, almostLinear, fade
-    animation = workspacesIn, 1, 1.21, almostLinear, fade
-    animation = workspacesOut, 1, 1.94, almostLinear, fade
-    animation = zoomFactor, 1, 7, quick
-}
-
-# Ref https://wiki.hypr.land/Configuring/Workspace-Rules/
-# "Smart gaps" / "No gaps when only"
-# uncomment all if you wish to use that.
-# workspace = w[tv1], gapsout:0, gapsin:0
-# workspace = f[1], gapsout:0, gapsin:0
-# windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
-# windowrule = rounding 0, floating:0, onworkspace:w[tv1]
-# windowrule = bordersize 0, floating:0, onworkspace:f[1]
-# windowrule = rounding 0, floating:0, onworkspace:f[1]
-
-# See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
-dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = false # You probably want this
-}
-
-# See https://wiki.hypr.land/Configuring/Master-Layout/ for more
-master {
-    new_status = master
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#misc
-misc {
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
-    enable_anr_dialog = false
-}
-
-
-#############
-### INPUT ###
-#############
-
-# https://wiki.hypr.land/Configuring/Variables/#input
-input {
-    # I'm british sob
-    kb_layout = gb
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 2
-
-    sensitivity = -0.5
-}
-
-
-###################
-### KEYBINDINGS ###
-###################
-
-# See https://wiki.hypr.land/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
-
-# Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, $terminal
-bind = $mainMod, C, killactive,
-bind = $mainMod, M, exit,
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, R, exec, $menu
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-bind = $mainMod, S, exec, $screenShot
-
-bind = $mainMod, F, fullscreen
-
-bind = , home, exec, $toggleSpeaker
-bind = , end, exec, $toggleMic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Laptop multimedia keys for volume and LCD brightness
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
-
-# Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
-
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hypr.land/Configuring/Window-Rules/ for more
-# See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
-
-# Primary monitor
-workspace= name:2, monitor:DP-3
-# Move mouse
-exec-once = hyprctl dispatch workspace 2
-
-# Ignore maximize requests from apps. You'll probably like this.
-windowrule = suppressevent maximize, class:.*
-
-# Gamescope / games on workspace 5
-windowrule = workspace 5 silent, class:^(gamescope)$
-windowrule = 
-
-# Gamescope tearing
-windowrule = immediate, class:^(gamescope)$
-
-# Steam on workspace 6
-windowrule = workspace 6 silent, class:^(steam)$
-windowrule = workspace 8 silent, class:^(vesktop)$
-windowrule = workspace 8 silent, class:^(org.telegram.desktop)$
-windowrule = workspace 10 silent, class:^(com\.obsproject\.Studio)$
-
-# Fix some dragging issues with XWayland
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
-
-# focus polkit
-windowrule = stayfocused,class:^(hyprpolkitagent)$
-windowrulev2 = noinitialfocus, class:.*
-
-# obs clipping
-bind = , F8, sendshortcut, , F8, class:^(com\.obsproject\.Studio)$
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
deleted file mode 100755
index e69de29..0000000
diff --git a/nix/meow.txt b/meow.txt
similarity index 100%
rename from nix/meow.txt
rename to meow.txt
diff --git a/nix/modules/blender/default.nix b/modules/blender/default.nix
similarity index 100%
rename from nix/modules/blender/default.nix
rename to modules/blender/default.nix
diff --git a/nix/modules/blender/home.nix b/modules/blender/home.nix
similarity index 100%
rename from nix/modules/blender/home.nix
rename to modules/blender/home.nix
diff --git a/nix/modules/bottles/default.nix b/modules/bottles/default.nix
similarity index 100%
rename from nix/modules/bottles/default.nix
rename to modules/bottles/default.nix
diff --git a/nix/modules/bottles/home.nix b/modules/bottles/home.nix
similarity index 100%
rename from nix/modules/bottles/home.nix
rename to modules/bottles/home.nix
diff --git a/nix/modules/chromium/default.nix b/modules/chromium/default.nix
similarity index 100%
rename from nix/modules/chromium/default.nix
rename to modules/chromium/default.nix
diff --git a/nix/modules/chromium/home.nix b/modules/chromium/home.nix
similarity index 100%
rename from nix/modules/chromium/home.nix
rename to modules/chromium/home.nix
diff --git a/nix/modules/default.nix b/modules/default.nix
similarity index 100%
rename from nix/modules/default.nix
rename to modules/default.nix
diff --git a/nix/modules/direnv/default.nix b/modules/direnv/default.nix
similarity index 100%
rename from nix/modules/direnv/default.nix
rename to modules/direnv/default.nix
diff --git a/nix/modules/direnv/home.nix b/modules/direnv/home.nix
similarity index 100%
rename from nix/modules/direnv/home.nix
rename to modules/direnv/home.nix
diff --git a/nix/modules/fish/default.nix b/modules/fish/default.nix
similarity index 100%
rename from nix/modules/fish/default.nix
rename to modules/fish/default.nix
diff --git a/nix/modules/fish/home.nix b/modules/fish/home.nix
similarity index 100%
rename from nix/modules/fish/home.nix
rename to modules/fish/home.nix
diff --git a/nix/modules/fish/nixos.nix b/modules/fish/nixos.nix
similarity index 100%
rename from nix/modules/fish/nixos.nix
rename to modules/fish/nixos.nix
diff --git a/nix/modules/git/default.nix b/modules/git/default.nix
similarity index 100%
rename from nix/modules/git/default.nix
rename to modules/git/default.nix
diff --git a/nix/modules/git/home.nix b/modules/git/home.nix
similarity index 100%
rename from nix/modules/git/home.nix
rename to modules/git/home.nix
diff --git a/nix/modules/greetd/default.nix b/modules/greetd/default.nix
similarity index 100%
rename from nix/modules/greetd/default.nix
rename to modules/greetd/default.nix
diff --git a/nix/modules/greetd/nixos.nix b/modules/greetd/nixos.nix
similarity index 100%
rename from nix/modules/greetd/nixos.nix
rename to modules/greetd/nixos.nix
diff --git a/nix/modules/helium/default.nix b/modules/helium/default.nix
similarity index 100%
rename from nix/modules/helium/default.nix
rename to modules/helium/default.nix
diff --git a/nix/modules/helium/home.nix b/modules/helium/home.nix
similarity index 100%
rename from nix/modules/helium/home.nix
rename to modules/helium/home.nix
diff --git a/nix/modules/helix/default.nix b/modules/helix/default.nix
similarity index 100%
rename from nix/modules/helix/default.nix
rename to modules/helix/default.nix
diff --git a/nix/modules/helix/home.nix b/modules/helix/home.nix
similarity index 100%
rename from nix/modules/helix/home.nix
rename to modules/helix/home.nix
diff --git a/nix/modules/hyprland/default.nix b/modules/hyprland/default.nix
similarity index 100%
rename from nix/modules/hyprland/default.nix
rename to modules/hyprland/default.nix
diff --git a/nix/modules/hyprland/home.nix b/modules/hyprland/home.nix
similarity index 100%
rename from nix/modules/hyprland/home.nix
rename to modules/hyprland/home.nix
diff --git a/nix/modules/hyprland/nixos.nix b/modules/hyprland/nixos.nix
similarity index 100%
rename from nix/modules/hyprland/nixos.nix
rename to modules/hyprland/nixos.nix
diff --git a/nix/modules/hyprland/runner.nix b/modules/hyprland/runner.nix
similarity index 100%
rename from nix/modules/hyprland/runner.nix
rename to modules/hyprland/runner.nix
diff --git a/nix/modules/hyprland/screenshot.nix b/modules/hyprland/screenshot.nix
similarity index 100%
rename from nix/modules/hyprland/screenshot.nix
rename to modules/hyprland/screenshot.nix
diff --git a/nix/modules/hyprland/settings.nix b/modules/hyprland/settings.nix
similarity index 100%
rename from nix/modules/hyprland/settings.nix
rename to modules/hyprland/settings.nix
diff --git a/nix/modules/nixvim/default.nix b/modules/nixvim/default.nix
similarity index 100%
rename from nix/modules/nixvim/default.nix
rename to modules/nixvim/default.nix
diff --git a/nix/modules/nixvim/home.nix b/modules/nixvim/home.nix
similarity index 100%
rename from nix/modules/nixvim/home.nix
rename to modules/nixvim/home.nix
diff --git a/nix/modules/nixvim/plugins/conform.nix b/modules/nixvim/plugins/conform.nix
similarity index 100%
rename from nix/modules/nixvim/plugins/conform.nix
rename to modules/nixvim/plugins/conform.nix
diff --git a/nix/modules/nixvim/plugins/default.nix b/modules/nixvim/plugins/default.nix
similarity index 100%
rename from nix/modules/nixvim/plugins/default.nix
rename to modules/nixvim/plugins/default.nix
diff --git a/nix/modules/nixvim/plugins/mini/notify.nix b/modules/nixvim/plugins/mini/notify.nix
similarity index 100%
rename from nix/modules/nixvim/plugins/mini/notify.nix
rename to modules/nixvim/plugins/mini/notify.nix
diff --git a/nix/modules/obs/default.nix b/modules/obs/default.nix
similarity index 100%
rename from nix/modules/obs/default.nix
rename to modules/obs/default.nix
diff --git a/nix/modules/obs/home.nix b/modules/obs/home.nix
similarity index 100%
rename from nix/modules/obs/home.nix
rename to modules/obs/home.nix
diff --git a/nix/modules/quickshell/default.nix b/modules/quickshell/default.nix
similarity index 100%
rename from nix/modules/quickshell/default.nix
rename to modules/quickshell/default.nix
diff --git a/nix/modules/quickshell/home.nix b/modules/quickshell/home.nix
similarity index 89%
rename from nix/modules/quickshell/home.nix
rename to modules/quickshell/home.nix
index 1342620..c534a4b 100644
--- a/nix/modules/quickshell/home.nix
+++ b/modules/quickshell/home.nix
@@ -16,7 +16,7 @@ in
   };
   config.xdg.configFile."quickshell" = lib.mkIf cfg.enable {
     recursive = true;
-    source = config.lib.file.mkOutOfStoreSymlink "/home/doloro/dotfiles/quickshell/";
+    source = config.lib.file.mkOutOfStoreSymlink "./quickshell";
   };
   config.systemd.user.services.quickshell = lib.mkIf cfg.enable {
     Unit = {
diff --git a/quickshell/assets/bar/Mic.svg b/modules/quickshell/quickshell/assets/bar/Mic.svg
similarity index 100%
rename from quickshell/assets/bar/Mic.svg
rename to modules/quickshell/quickshell/assets/bar/Mic.svg
diff --git a/quickshell/assets/bar/MutedMic.svg b/modules/quickshell/quickshell/assets/bar/MutedMic.svg
similarity index 100%
rename from quickshell/assets/bar/MutedMic.svg
rename to modules/quickshell/quickshell/assets/bar/MutedMic.svg
diff --git a/quickshell/assets/bar/MutedSpeaker.svg b/modules/quickshell/quickshell/assets/bar/MutedSpeaker.svg
similarity index 100%
rename from quickshell/assets/bar/MutedSpeaker.svg
rename to modules/quickshell/quickshell/assets/bar/MutedSpeaker.svg
diff --git a/quickshell/assets/bar/Speaker.svg b/modules/quickshell/quickshell/assets/bar/Speaker.svg
similarity index 100%
rename from quickshell/assets/bar/Speaker.svg
rename to modules/quickshell/quickshell/assets/bar/Speaker.svg
diff --git a/quickshell/assets/media_player/pausebutton.svg b/modules/quickshell/quickshell/assets/media_player/pausebutton.svg
similarity index 100%
rename from quickshell/assets/media_player/pausebutton.svg
rename to modules/quickshell/quickshell/assets/media_player/pausebutton.svg
diff --git a/quickshell/assets/media_player/playbutton.svg b/modules/quickshell/quickshell/assets/media_player/playbutton.svg
similarity index 100%
rename from quickshell/assets/media_player/playbutton.svg
rename to modules/quickshell/quickshell/assets/media_player/playbutton.svg
diff --git a/quickshell/assets/media_player/skip_next.svg b/modules/quickshell/quickshell/assets/media_player/skip_next.svg
similarity index 100%
rename from quickshell/assets/media_player/skip_next.svg
rename to modules/quickshell/quickshell/assets/media_player/skip_next.svg
diff --git a/quickshell/assets/media_player/skip_previous.svg b/modules/quickshell/quickshell/assets/media_player/skip_previous.svg
similarity index 100%
rename from quickshell/assets/media_player/skip_previous.svg
rename to modules/quickshell/quickshell/assets/media_player/skip_previous.svg
diff --git a/quickshell/bar/Bar.qml b/modules/quickshell/quickshell/bar/Bar.qml
similarity index 100%
rename from quickshell/bar/Bar.qml
rename to modules/quickshell/quickshell/bar/Bar.qml
diff --git a/quickshell/bar/widgets/Audio.qml b/modules/quickshell/quickshell/bar/widgets/Audio.qml
similarity index 100%
rename from quickshell/bar/widgets/Audio.qml
rename to modules/quickshell/quickshell/bar/widgets/Audio.qml
diff --git a/quickshell/bar/widgets/SystemTray.qml b/modules/quickshell/quickshell/bar/widgets/SystemTray.qml
similarity index 100%
rename from quickshell/bar/widgets/SystemTray.qml
rename to modules/quickshell/quickshell/bar/widgets/SystemTray.qml
diff --git a/quickshell/bar/widgets/Workspaces.qml b/modules/quickshell/quickshell/bar/widgets/Workspaces.qml
similarity index 100%
rename from quickshell/bar/widgets/Workspaces.qml
rename to modules/quickshell/quickshell/bar/widgets/Workspaces.qml
diff --git a/quickshell/bar/widgets/clock/Clock.qml b/modules/quickshell/quickshell/bar/widgets/clock/Clock.qml
similarity index 100%
rename from quickshell/bar/widgets/clock/Clock.qml
rename to modules/quickshell/quickshell/bar/widgets/clock/Clock.qml
diff --git a/quickshell/bar/widgets/clock/ClockData.qml b/modules/quickshell/quickshell/bar/widgets/clock/ClockData.qml
similarity index 100%
rename from quickshell/bar/widgets/clock/ClockData.qml
rename to modules/quickshell/quickshell/bar/widgets/clock/ClockData.qml
diff --git a/quickshell/bar/widgets/clock/Date.qml b/modules/quickshell/quickshell/bar/widgets/clock/Date.qml
similarity index 100%
rename from quickshell/bar/widgets/clock/Date.qml
rename to modules/quickshell/quickshell/bar/widgets/clock/Date.qml
diff --git a/quickshell/bar/widgets/common/Colors.qml b/modules/quickshell/quickshell/bar/widgets/common/Colors.qml
similarity index 100%
rename from quickshell/bar/widgets/common/Colors.qml
rename to modules/quickshell/quickshell/bar/widgets/common/Colors.qml
diff --git a/quickshell/bar/widgets/common/Container.qml b/modules/quickshell/quickshell/bar/widgets/common/Container.qml
similarity index 100%
rename from quickshell/bar/widgets/common/Container.qml
rename to modules/quickshell/quickshell/bar/widgets/common/Container.qml
diff --git a/quickshell/bar/widgets/common/Dot.qml b/modules/quickshell/quickshell/bar/widgets/common/Dot.qml
similarity index 100%
rename from quickshell/bar/widgets/common/Dot.qml
rename to modules/quickshell/quickshell/bar/widgets/common/Dot.qml
diff --git a/quickshell/bar/widgets/common/Icons.qml b/modules/quickshell/quickshell/bar/widgets/common/Icons.qml
similarity index 100%
rename from quickshell/bar/widgets/common/Icons.qml
rename to modules/quickshell/quickshell/bar/widgets/common/Icons.qml
diff --git a/quickshell/bar/widgets/common/MaterialIcon.qml b/modules/quickshell/quickshell/bar/widgets/common/MaterialIcon.qml
similarity index 100%
rename from quickshell/bar/widgets/common/MaterialIcon.qml
rename to modules/quickshell/quickshell/bar/widgets/common/MaterialIcon.qml
diff --git a/quickshell/bar/widgets/common/Meow.qml b/modules/quickshell/quickshell/bar/widgets/common/Meow.qml
similarity index 100%
rename from quickshell/bar/widgets/common/Meow.qml
rename to modules/quickshell/quickshell/bar/widgets/common/Meow.qml
diff --git a/quickshell/bar/widgets/common/VerticalSeprator.qml b/modules/quickshell/quickshell/bar/widgets/common/VerticalSeprator.qml
similarity index 100%
rename from quickshell/bar/widgets/common/VerticalSeprator.qml
rename to modules/quickshell/quickshell/bar/widgets/common/VerticalSeprator.qml
diff --git a/quickshell/bar/widgets/common/text/StyledText.qml b/modules/quickshell/quickshell/bar/widgets/common/text/StyledText.qml
similarity index 100%
rename from quickshell/bar/widgets/common/text/StyledText.qml
rename to modules/quickshell/quickshell/bar/widgets/common/text/StyledText.qml
diff --git a/quickshell/bar/widgets/player/PlayerController.qml b/modules/quickshell/quickshell/bar/widgets/player/PlayerController.qml
similarity index 100%
rename from quickshell/bar/widgets/player/PlayerController.qml
rename to modules/quickshell/quickshell/bar/widgets/player/PlayerController.qml
diff --git a/quickshell/bar/widgets/player/PlayerControllerV2.qml b/modules/quickshell/quickshell/bar/widgets/player/PlayerControllerV2.qml
similarity index 100%
rename from quickshell/bar/widgets/player/PlayerControllerV2.qml
rename to modules/quickshell/quickshell/bar/widgets/player/PlayerControllerV2.qml
diff --git a/quickshell/bar/widgets/player/PlayerPopup.qml b/modules/quickshell/quickshell/bar/widgets/player/PlayerPopup.qml
similarity index 100%
rename from quickshell/bar/widgets/player/PlayerPopup.qml
rename to modules/quickshell/quickshell/bar/widgets/player/PlayerPopup.qml
diff --git a/quickshell/bar/widgets/player/PlayerPopupV2.qml b/modules/quickshell/quickshell/bar/widgets/player/PlayerPopupV2.qml
similarity index 100%
rename from quickshell/bar/widgets/player/PlayerPopupV2.qml
rename to modules/quickshell/quickshell/bar/widgets/player/PlayerPopupV2.qml
diff --git a/quickshell/bar/widgets/player/PlayerWidget.qml b/modules/quickshell/quickshell/bar/widgets/player/PlayerWidget.qml
similarity index 100%
rename from quickshell/bar/widgets/player/PlayerWidget.qml
rename to modules/quickshell/quickshell/bar/widgets/player/PlayerWidget.qml
diff --git a/quickshell/bar/widgets/player/PlayerWidgetV2.qml b/modules/quickshell/quickshell/bar/widgets/player/PlayerWidgetV2.qml
similarity index 100%
rename from quickshell/bar/widgets/player/PlayerWidgetV2.qml
rename to modules/quickshell/quickshell/bar/widgets/player/PlayerWidgetV2.qml
diff --git a/quickshell/bar/widgets/workspace/HyprlandClient.qml b/modules/quickshell/quickshell/bar/widgets/workspace/HyprlandClient.qml
similarity index 100%
rename from quickshell/bar/widgets/workspace/HyprlandClient.qml
rename to modules/quickshell/quickshell/bar/widgets/workspace/HyprlandClient.qml
diff --git a/quickshell/bar/widgets/workspace/HyprlandWindowTracker.qml b/modules/quickshell/quickshell/bar/widgets/workspace/HyprlandWindowTracker.qml
similarity index 100%
rename from quickshell/bar/widgets/workspace/HyprlandWindowTracker.qml
rename to modules/quickshell/quickshell/bar/widgets/workspace/HyprlandWindowTracker.qml
diff --git a/quickshell/bar/widgets/workspace/WorkspaceWidget.qml b/modules/quickshell/quickshell/bar/widgets/workspace/WorkspaceWidget.qml
similarity index 100%
rename from quickshell/bar/widgets/workspace/WorkspaceWidget.qml
rename to modules/quickshell/quickshell/bar/widgets/workspace/WorkspaceWidget.qml
diff --git a/quickshell/shell.qml b/modules/quickshell/quickshell/shell.qml
similarity index 100%
rename from quickshell/shell.qml
rename to modules/quickshell/quickshell/shell.qml
diff --git a/nix/modules/spicetify/default.nix b/modules/spicetify/default.nix
similarity index 100%
rename from nix/modules/spicetify/default.nix
rename to modules/spicetify/default.nix
diff --git a/nix/modules/spicetify/home.nix b/modules/spicetify/home.nix
similarity index 100%
rename from nix/modules/spicetify/home.nix
rename to modules/spicetify/home.nix
diff --git a/nix/modules/steam/default.nix b/modules/steam/default.nix
similarity index 100%
rename from nix/modules/steam/default.nix
rename to modules/steam/default.nix
diff --git a/nix/modules/steam/nixos.nix b/modules/steam/nixos.nix
similarity index 100%
rename from nix/modules/steam/nixos.nix
rename to modules/steam/nixos.nix
diff --git a/nix/modules/stylix/default.nix b/modules/stylix/default.nix
similarity index 100%
rename from nix/modules/stylix/default.nix
rename to modules/stylix/default.nix
diff --git a/nix/modules/stylix/fonts.nix b/modules/stylix/fonts.nix
similarity index 100%
rename from nix/modules/stylix/fonts.nix
rename to modules/stylix/fonts.nix
diff --git a/nix/modules/stylix/home.nix b/modules/stylix/home.nix
similarity index 100%
rename from nix/modules/stylix/home.nix
rename to modules/stylix/home.nix
diff --git a/nix/modules/stylix/nixos.nix b/modules/stylix/nixos.nix
similarity index 100%
rename from nix/modules/stylix/nixos.nix
rename to modules/stylix/nixos.nix
diff --git a/nix/modules/stylix/shared.nix b/modules/stylix/shared.nix
similarity index 100%
rename from nix/modules/stylix/shared.nix
rename to modules/stylix/shared.nix
diff --git a/nix/modules/stylix/theme.yml b/modules/stylix/theme.yml
similarity index 100%
rename from nix/modules/stylix/theme.yml
rename to modules/stylix/theme.yml
diff --git a/nix/modules/theme/default.nix b/modules/theme/default.nix
similarity index 100%
rename from nix/modules/theme/default.nix
rename to modules/theme/default.nix
diff --git a/nix/modules/theme/home.nix b/modules/theme/home.nix
similarity index 100%
rename from nix/modules/theme/home.nix
rename to modules/theme/home.nix
diff --git a/nix/modules/tmux/default.nix b/modules/tmux/default.nix
similarity index 100%
rename from nix/modules/tmux/default.nix
rename to modules/tmux/default.nix
diff --git a/nix/modules/tmux/home.nix b/modules/tmux/home.nix
similarity index 100%
rename from nix/modules/tmux/home.nix
rename to modules/tmux/home.nix
diff --git a/nix/modules/unityhub/default.nix b/modules/unityhub/default.nix
similarity index 100%
rename from nix/modules/unityhub/default.nix
rename to modules/unityhub/default.nix
diff --git a/nix/modules/unityhub/home.nix b/modules/unityhub/home.nix
similarity index 100%
rename from nix/modules/unityhub/home.nix
rename to modules/unityhub/home.nix
diff --git a/nix/modules/wivrn/default.nix b/modules/wivrn/default.nix
similarity index 100%
rename from nix/modules/wivrn/default.nix
rename to modules/wivrn/default.nix
diff --git a/nix/modules/wivrn/home.nix b/modules/wivrn/home.nix
similarity index 100%
rename from nix/modules/wivrn/home.nix
rename to modules/wivrn/home.nix
diff --git a/nix/modules/wivrn/nixos.nix b/modules/wivrn/nixos.nix
similarity index 100%
rename from nix/modules/wivrn/nixos.nix
rename to modules/wivrn/nixos.nix
diff --git a/nix/modules/ytm/a b/modules/ytm/a
similarity index 100%
rename from nix/modules/ytm/a
rename to modules/ytm/a
diff --git a/nix/modules/ytm/default.nix b/modules/ytm/default.nix
similarity index 100%
rename from nix/modules/ytm/default.nix
rename to modules/ytm/default.nix
diff --git a/nix/modules/ytm/home.nix b/modules/ytm/home.nix
similarity index 100%
rename from nix/modules/ytm/home.nix
rename to modules/ytm/home.nix
diff --git a/nix/nix.conf b/nix.conf
similarity index 100%
rename from nix/nix.conf
rename to nix.conf
diff --git a/nix/.sops.yaml b/nix/.sops.yaml
deleted file mode 100644
index a9d55d5..0000000
--- a/nix/.sops.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-keys:
-  - &doloro-desktop age1ykcy2r4kk729e7adqxu8s24ujc60z5eux7ma0ca4ruzydwgm5p6qmdp838 
-  - &doloro-doloro-desktop age1e6vws55p0g23qzthm4qa93hpt6lqmck6670gkygph0sc0j7my4uq5wqjfh
-creation_rules:
-  - path_regex: secrets/.+\.(yaml|json|env|ini|bin)$
-    key_groups:
-    - age:
-      - *doloro-desktop
-      - *doloro-doloro-desktop
-
diff --git a/nixos.qcow2 b/nixos.qcow2
new file mode 100644
index 0000000..54279f3
Binary files /dev/null and b/nixos.qcow2 differ
diff --git a/nix/overlays.nix b/overlays.nix
similarity index 100%
rename from nix/overlays.nix
rename to overlays.nix
diff --git a/result b/result
new file mode 120000
index 0000000..0d26502
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/n30rbc1gjsjxqlpg70k9dncd4pbfb471-helium-browser-0.5.7-141.0.7390.107
\ No newline at end of file
diff --git a/nix/secrets/meow.yaml b/secrets/meow.yaml
similarity index 100%
rename from nix/secrets/meow.yaml
rename to secrets/meow.yaml
diff --git a/nix/secrets/users.yaml b/secrets/users.yaml
similarity index 100%
rename from nix/secrets/users.yaml
rename to secrets/users.yaml
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
deleted file mode 100755
index 45f116d..0000000
--- a/tmux/tmux.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-
-set -g @plugin 'niksingh710/minimal-tmux-status'
-
-
-
-run '~/.tmux/plugins/tpm/tpm'