diff --git a/assets/dotfiles/noctalia-state/.setup-complete b/assets/dotfiles/noctalia-state/.setup-complete
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/expose-air b/assets/expose-air
deleted file mode 160000
index a1a4624..0000000
--- a/assets/expose-air
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a1a46244c939969087a0659ce0ac61cc62d5a75a
diff --git a/assets/dotfiles/vscode-config/keybindings.json b/dotfiles/global/vscode/keybindings.json
similarity index 100%
rename from assets/dotfiles/vscode-config/keybindings.json
rename to dotfiles/global/vscode/keybindings.json
diff --git a/assets/dotfiles/vscode-config/settings.json b/dotfiles/global/vscode/settings.json
similarity index 94%
rename from assets/dotfiles/vscode-config/settings.json
rename to dotfiles/global/vscode/settings.json
index 98cef9f..2229d6b 100644
--- a/assets/dotfiles/vscode-config/settings.json
+++ b/dotfiles/global/vscode/settings.json
@@ -54,5 +54,6 @@
   "update.mode": "none",
   "workbench.welcomePage.walkthroughs.openOnInstall": false,
   "explorer.confirmDelete": false,
-  "update.showReleaseNotes": false
+  "update.showReleaseNotes": false,
+  "explorer.confirmDragAndDrop": false
 }
diff --git a/assets/dotfiles/equibop-config/equicord-settings.json b/dotfiles/kitagawa/equibop/equicord-settings.json
similarity index 100%
rename from assets/dotfiles/equibop-config/equicord-settings.json
rename to dotfiles/kitagawa/equibop/equicord-settings.json
diff --git a/assets/dotfiles/equibop-config/quickCss.css b/dotfiles/kitagawa/equibop/quickCss.css
similarity index 100%
rename from assets/dotfiles/equibop-config/quickCss.css
rename to dotfiles/kitagawa/equibop/quickCss.css
diff --git a/assets/dotfiles/equibop-config/settings.json b/dotfiles/kitagawa/equibop/settings.json
similarity index 100%
rename from assets/dotfiles/equibop-config/settings.json
rename to dotfiles/kitagawa/equibop/settings.json
diff --git a/assets/dotfiles/niri.kdl b/dotfiles/kitagawa/niri.kdl
similarity index 100%
rename from assets/dotfiles/niri.kdl
rename to dotfiles/kitagawa/niri.kdl
diff --git a/dotfiles/kitagawa/noctalia/plugins/.placeholder b/dotfiles/kitagawa/noctalia/plugins/.placeholder
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/dotfiles/kitagawa/noctalia/plugins/.placeholder
@@ -0,0 +1 @@
+
diff --git a/dotfiles/kitagawa/noctalia/settings.toml b/dotfiles/kitagawa/noctalia/settings.toml
new file mode 100644
index 0000000..6395bf2
--- /dev/null
+++ b/dotfiles/kitagawa/noctalia/settings.toml
@@ -0,0 +1,552 @@
+config_version = 13
+
+[audio]
+enable_sounds = true
+
+[backdrop]
+blur_intensity = 0.099999997764825821
+tint_intensity = 0.14999999664723873
+
+[bar.default]
+background_opacity = 0.79999998211860657
+center = [ "active_window" ]
+end = [ "tray", "notifications", "bluetooth", "network", "volume", "battery", "control-center" ]
+font_family = "JetBrainsMono Nerd Font"
+font_weight = 300
+margin_edge = 6
+margin_ends = 200
+margin_opposite_edge = 6
+radius = 12
+start = [ "clock", "workspaces", "media" ]
+thickness = 36
+widget_spacing = 16
+
+[battery]
+warning_threshold = 20
+
+[calendar]
+enabled = true
+
+    [calendar.account.personal_google]
+    type = "google"
+
+[control_center]
+sidebar_section = "none"
+width = 750
+
+    [control_center.calendar]
+    show_events_card = true
+
+[desktop_widgets]
+schema_version = 2
+widget_order = [
+    "desktop-widget-000000000000000e",
+    "desktop-widget-0000000000000001",
+    "desktop-widget-0000000000000002",
+    "desktop-widget-0000000000000006",
+    "desktop-widget-0000000000000007",
+    "desktop-widget-0000000000000008",
+    "desktop-widget-0000000000000009",
+    "desktop-widget-000000000000000a",
+    "desktop-widget-000000000000000c",
+    "desktop-widget-000000000000000d",
+    "desktop-widget-000000000000000f",
+    "desktop-widget-0000000000000010"
+]
+
+    [desktop_widgets.grid]
+    cell_size = 16
+    major_interval = 4
+    visible = true
+
+    [desktop_widgets.widget.desktop-widget-0000000000000001]
+    box_height = 128.0
+    box_width = 128.0
+    cx = 1408.0
+    cy = 336.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "clock"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000001.settings]
+        background = true
+        background_color = "surface"
+        background_opacity = 0.59999999999999998
+        background_padding = 10
+        background_radius = 8
+        center_text = false
+        circle = true
+        clock_style = "analog"
+        color = "on_surface"
+        font_family = ""
+        format = "{:%H:%M}"
+        shadow = true
+
+    [desktop_widgets.widget.desktop-widget-0000000000000002]
+    box_height = 112.0
+    box_width = 160.0
+    cx = 1200.0
+    cy = 712.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "sysmon"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000002.settings]
+        background_opacity = 0.59999999999999998
+        background_padding = 8
+        background_radius = 8
+        display = "graph"
+        shadow = false
+        show_label = true
+        stat = "cpu_usage"
+        stat2 = "cpu_temp"
+
+    [desktop_widgets.widget.desktop-widget-0000000000000006]
+    box_height = 128.0
+    box_width = 352.0
+    cx = 1296.0
+    cy = 176.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "media_player"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000006.settings]
+        background_opacity = 0.59999999999999998
+        background_padding = 8
+        background_radius = 8
+        hide_when_no_media = false
+        layout = "horizontal"
+        shadow = false
+
+    [desktop_widgets.widget.desktop-widget-0000000000000007]
+    box_height = 32.0
+    box_width = 352.0
+    cx = 1298.5
+    cy = 96.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "audio_visualizer"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000007.settings]
+        background = false
+        background_opacity = 0.0
+        bands = 64
+        centered = false
+        mirrored = false
+        show_when_idle = false
+
+    [desktop_widgets.widget.desktop-widget-0000000000000008]
+    box_height = 128.0
+    box_width = 192.0
+    cx = 1216.0
+    cy = 336.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "weather"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000008.settings]
+        background_opacity = 0.59999999999999998
+        background_radius = 8
+        show_forecast = true
+
+    [desktop_widgets.widget.desktop-widget-0000000000000009]
+    box_height = 32.0
+    box_width = 128.0
+    cx = 1216.0
+    cy = 520.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = -0.0
+    type = "button"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000009.settings]
+        background = true
+        command = "ssh sakamoto .local/bin/wake-takamaki"
+        glyph = "coffee"
+        label = "Wake"
+        variant = "default"
+
+    [desktop_widgets.widget.desktop-widget-000000000000000a]
+    box_height = 32.0
+    box_width = 128.0
+    cx = 1376.0
+    cy = 576.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "button"
+
+        [desktop_widgets.widget.desktop-widget-000000000000000a.settings]
+        background = true
+        command = "remmina -c /home/grey/.local/share/remmina/group_rdp_takamaki_greyweather-dev.remmina"
+        glyph = "brand-windows-filled"
+        label = "Windows"
+        variant = "default"
+
+    [desktop_widgets.widget.desktop-widget-000000000000000c]
+    box_height = 32.0
+    box_width = 128.0
+    cx = 1376.0
+    cy = 520.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "button"
+
+        [desktop_widgets.widget.desktop-widget-000000000000000c.settings]
+        background = true
+        command = "ssh takamaki universal-shutdown"
+        glyph = "shutdown"
+        label = "Shutdown"
+        variant = "default"
+
+    [desktop_widgets.widget.desktop-widget-000000000000000d]
+    box_height = 32.0
+    box_width = 128.0
+    cx = 1216.0
+    cy = 576.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "button"
+
+        [desktop_widgets.widget.desktop-widget-000000000000000d.settings]
+        background = true
+        command = "moonlight stream takamaki Desktop"
+        glyph = "brand-redhat"
+        label = "Linux"
+        variant = "default"
+
+    [desktop_widgets.widget.desktop-widget-000000000000000e]
+    box_height = 192.0
+    box_width = 352.0
+    cx = 1296.0
+    cy = 528.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "label"
+
+        [desktop_widgets.widget.desktop-widget-000000000000000e.settings]
+        background_opacity = 0.59999999999999998
+        background_radius = 8
+        opacity = 1.0
+        shadow = false
+        title = ""
+
+    [desktop_widgets.widget.desktop-widget-000000000000000f]
+    box_height = 0.0
+    box_width = 0.0
+    cx = 1298.5
+    cy = 467.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "label"
+
+        [desktop_widgets.widget.desktop-widget-000000000000000f.settings]
+        background = false
+        opacity = 1.0
+        shadow = false
+        title = "Remote Desktop"
+
+    [desktop_widgets.widget.desktop-widget-0000000000000010]
+    box_height = 112.0
+    box_width = 160.0
+    cx = 1392.0
+    cy = 712.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "sysmon"
+
+        [desktop_widgets.widget.desktop-widget-0000000000000010.settings]
+        background_opacity = 0.59999999999999998
+        background_padding = 8
+        background_radius = 8
+        stat = "net_rx"
+        stat2 = "net_tx"
+
+[dock]
+background_opacity = 0.79999998211860657
+concave_edge_corners = false
+enabled = true
+icon_size = 40
+inactive_scale = 0.90000001341104507
+magnification_scale = 1.1000000014901161
+main_axis_padding = 12
+margin_edge = 16
+pinned = [ "signal", "equibop", "thunderbird", "spotify", "code", "github-desktop", "proton.vpn.app.gtk" ]
+radius = 16
+reserve_space = false
+show_dots = true
+show_running = false
+smart_auto_hide = true
+
+[idle]
+behavior_order = [ "lock", "screen-off", "Hibernate" ]
+pre_action_fade_seconds = 30
+
+    [idle.behavior.Hibernate]
+    action = "command"
+    command = "systemctl hibernate"
+    enabled = true
+    timeout = 600.0
+
+    [idle.behavior.lock]
+    action = "lock"
+    enabled = true
+    timeout = 300.0
+
+    [idle.behavior.screen-off]
+    action = "screen_off"
+    enabled = true
+    timeout = 450.0
+
+[location]
+auto_locate = true
+
+[lockscreen_widgets]
+enabled = true
+schema_version = 2
+widget_order = [
+    "lockscreen-login-box@eDP-1",
+    "lockscreen-widget-0000000000000001",
+    "lockscreen-widget-0000000000000002",
+    "lockscreen-widget-0000000000000004"
+]
+
+    [lockscreen_widgets.grid]
+    cell_size = 16
+    major_interval = 4
+    visible = true
+
+    [lockscreen_widgets.widget."lockscreen-login-box@eDP-1"]
+    box_height = 196.0
+    box_width = 768.0
+    cx = 512.0
+    cy = 594.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "login_box"
+
+        [lockscreen_widgets.widget."lockscreen-login-box@eDP-1".settings]
+        background_color = "surface_variant"
+        background_opacity = 0.88
+        background_radius = 12.0
+        center_password_text = false
+        input_opacity = 1.0
+        input_radius = 6.0
+        layout = "regular"
+        show_caps_lock = true
+        show_keyboard_layout = true
+        show_login_button = true
+        show_media = true
+        show_session_buttons = true
+        show_unlock_hint = true
+        show_weather = true
+
+    [lockscreen_widgets.widget.lockscreen-widget-0000000000000001]
+    box_height = 80.0
+    box_width = 160.0
+    cx = 208.0
+    cy = 368.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "weather"
+
+    [lockscreen_widgets.widget.lockscreen-widget-0000000000000002]
+    box_height = 128.0
+    box_width = 320.0
+    cx = 288.0
+    cy = 240.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "clock"
+
+        [lockscreen_widgets.widget.lockscreen-widget-0000000000000002.settings]
+        background_padding = 16
+        shadow = false
+
+    [lockscreen_widgets.widget.lockscreen-widget-0000000000000004]
+    box_height = 288.0
+    box_width = 432.0
+    cx = 1192.0
+    cy = 432.0
+    output = "eDP-1"
+    placement_height = 864.0
+    placement_width = 1536.0
+    rotation = 0.0
+    type = "sticker"
+
+        [lockscreen_widgets.widget.lockscreen-widget-0000000000000004.settings]
+        background = false
+        image_path = "/home/grey/Pictures/wife.jpg"
+        opacity = 0.95000000000000007
+
+[nightlight]
+enabled = true
+temperature_day = 6000
+temperature_night = 3800
+
+[plugins]
+enabled = []
+
+[shell]
+corner_radius_scale = 1.2500000186264515
+niri_overview_type_to_launch_enabled = true
+polkit_agent = true
+
+    [shell.animation]
+    speed = 1.5000000223517418
+
+    [shell.launcher]
+    categories = false
+
+    [shell.panel]
+    clipboard_placement = "attached"
+    launcher_placement = "attached"
+    session_position = "center"
+    shadow = false
+    transparency_mode = "glass"
+
+    [shell.screen_corners]
+    enabled = true
+    size = 16
+
+    [[shell.session.actions]]
+    action = "lock"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "1"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "logout"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "2"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "command"
+    command = "noctalia msg session lock && systemctl hibernate"
+    countdown_seconds = 0.0
+    enabled = true
+    glyph = "hibernate"
+    label = "Hibernate"
+    shortcut = "3"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "reboot"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "4"
+    variant = "default"
+
+    [[shell.session.actions]]
+    action = "shutdown"
+    countdown_seconds = 0.0
+    enabled = true
+    shortcut = "5"
+    variant = "destructive"
+
+    [shell.shadow]
+    alpha = 0.44999998994171619
+
+[theme]
+builtin = "Rosé Pine"
+community_palette = "Ayu Blue"
+source = "wallpaper"
+wallpaper_scheme = "muted"
+
+    [theme.templates]
+    builtin_ids = [ "niri" ]
+    enable_community_templates = false
+
+[wallpaper]
+directory = "/home/grey/nixos/modules/hosts/kitagawa"
+
+    [wallpaper.default]
+    path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg"
+
+    [wallpaper.last]
+    path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg"
+
+    [wallpaper.monitors.eDP-1]
+    path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg"
+
+    [[wallpaper.favorite]]
+    path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg"
+    theme_mode = "auto"
+
+[widget.active_window]
+enabled = true
+icon_size = 15
+max_length = 400
+scale = 0.94999999999999996
+title_scroll = "on_hover"
+
+[widget.battery]
+enabled = true
+
+[widget.bluetooth]
+enabled = false
+
+[widget.brightness]
+enabled = true
+
+[widget.control-center]
+custom_image = "/nix/store/5mywyh8lp60x9li5688q1m39rqvy0ckp-noctalia-5.0.0/share/noctalia/assets/images/distros/nixos.svg"
+enabled = true
+
+[widget.custom_button_2]
+type = "custom_button"
+
+[widget.media]
+hide_when_no_media = true
+max_length = 200
+title_scroll = "on_hover"
+
+[widget.network]
+show_label = false
+
+[widget.notifications]
+hide_when_no_unread = true
+
+[widget.session]
+enabled = false
+
+[widget.tray]
+hidden = [ "Udiskie" ]
+
+[widget.volume]
+mute_color = "on_surface"
+show_label = false
+
+[widget.workspaces]
+scale = 0.90000000000000013
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 9a3bf44..4ed2fa8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,6 +141,24 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1787559586,
+        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -216,6 +234,21 @@
         "type": "github"
       }
     },
+    "import-tree": {
+      "locked": {
+        "lastModified": 1784254960,
+        "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
     "nh": {
       "inputs": {
         "nixpkgs": [
@@ -239,7 +272,7 @@
     "nix-cachyos-kernel": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
@@ -304,6 +337,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1785031560,
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-mesa-overlay": {
       "locked": {
         "lastModified": 1770837850,
@@ -407,7 +455,9 @@
     "root": {
       "inputs": {
         "firefox-addons": "firefox-addons",
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager",
+        "import-tree": "import-tree",
         "nh": "nh",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nix-flatpak": "nix-flatpak",
@@ -448,7 +498,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
diff --git a/flake.nix b/flake.nix
index 7a6dde1..e26a49a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,14 +1,14 @@
 {
-  description = "grey's custom NixOS config";
+  description = "grey's NixOS config";
 
   inputs = {
-    nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-unstable";
-    };
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    nixpkgs-mesa-overlay = {
-      url = "github:nixos/nixpkgs/e4f9df8a27c2b4871c665368e65bdb6852dd93e6";
-    };
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
+    import-tree.url = "github:vic/import-tree";
+
+    nixpkgs-mesa-overlay.url = "github:nixos/nixpkgs/e4f9df8a27c2b4871c665368e65bdb6852dd93e6";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -57,48 +57,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };*/
 
-    nix-cachyos-kernel = {
-      url = "github:xddxdd/nix-cachyos-kernel/release";
-    };
+    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
 
-    nix-flatpak = {
-      url = "github:gmodena/nix-flatpak/?ref=latest";
-    };
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
   };
 
-  outputs = {self,nixpkgs,nixpkgs-mesa-overlay,home-manager,plasma-manager,stylix,...}@inputs: let
-    system = "x86_64-linux";
-  in {
-    nixosConfigurations = builtins.listToAttrs (map (name: {
-      inherit name;
-      value = nixpkgs.lib.nixosSystem {
-        modules = [
-          ./hosts/${name}
-          stylix.nixosModules.stylix
-          home-manager.nixosModules.default {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.grey = ./hosts/${name}/home.nix;
-              extraSpecialArgs = {
-                inherit inputs;
-                hostname = name;
-                stateVersion = "26.05";
-              };
-            };
-          }
-        ];
-        specialArgs = {
-          inherit inputs;
-          inherit system;
-          hostname = name;
-          stateVersion = "26.05";
-          pkgs-mesa-overlay = import nixpkgs-mesa-overlay {
-            inherit system;
-            config.allowUnfree = true;
-          };
-        };
-      };
-    }) ["takamaki" "kitagawa" "nixos-vm"]);
-  };
+  outputs = inputs@{ self, flake-parts, import-tree, ... }: flake-parts.lib.mkFlake { inherit inputs; } (import-tree ./modules);
 }
diff --git a/global.nix b/global.nix
new file mode 100644
index 0000000..77c4385
--- /dev/null
+++ b/global.nix
@@ -0,0 +1,148 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.global = { pkgs, config, lib, ... }: {
+    options = {
+      info.rootPath = lib.mkOption {
+        type = lib.types.str;
+        default = "/home/grey/nixos";
+      };
+    };
+
+    config = {
+      nix.settings.experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+
+      nix.gc = {
+        automatic = true;
+        persistent = true;
+        dates = "Sun 05:00";
+      };
+
+      boot.loader.efi.canTouchEfiVariables = true;
+
+      networking.networkmanager.enable = true;
+
+      time.timeZone = "Europe/London";
+      i18n.defaultLocale = "en_GB.UTF-8";
+      i18n.extraLocaleSettings = {
+        LC_ADDRESS = "en_GB.UTF-8";
+        LC_IDENTIFICATION = "en_GB.UTF-8";
+        LC_MEASUREMENT = "en_GB.UTF-8";
+        LC_MONETARY = "en_GB.UTF-8";
+        LC_NAME = "en_GB.UTF-8";
+        LC_NUMERIC = "en_GB.UTF-8";
+        LC_PAPER = "en_GB.UTF-8";
+        LC_TELEPHONE = "en_GB.UTF-8";
+        LC_TIME = "en_GB.UTF-8";
+      };
+
+      services.xserver.xkb = {
+        layout = "gb";
+        variant = "";
+      };
+      console.keyMap = "uk";
+
+      users.users."grey" = {
+        isNormalUser = true;
+        description = "grey";
+        extraGroups = [ "networkmanager" "wheel" ];
+      };
+
+      nixpkgs.config.allowUnfree = true;
+
+      environment.systemPackages = with pkgs; [
+        git
+        fzf
+        jq
+        busybox
+        ethtool
+        wayland-utils
+        mesa-demos
+        vulkan-tools
+        hyperfine
+      ];
+
+      fonts.packages = with pkgs; [
+        iosevka-comfy.comfy
+        nerd-fonts.jetbrains-mono
+      ];
+
+      programs.nano = {
+        enable = true;
+        nanorc = ''
+          set nowrap
+          set tabstospaces
+          set tabsize 2
+        '';
+      };
+
+      hardware.bluetooth = {
+        enable = true;
+        powerOnBoot = false;
+      };
+
+      programs.gnupg.agent = {
+        enable = true;
+      };
+    };
+  };
+
+  flake.homeModules.global = { config, pkgs, ... }: {
+    nix.gc = {
+      automatic = true;
+      persistent = true;
+      dates = "Sun 05:00";
+    };
+
+    home.packages = with pkgs; [
+      bibata-cursors
+      x264
+      speedtest-go
+      gparted
+      vlc
+    ];
+
+    programs.git = {
+      enable = true;
+
+      lfs.enable = true;
+
+      settings = {
+        user.name = "Grey Jones";
+        user.email = "grey@greyweather.dev";
+      };
+
+      signing = {
+        format = "openpgp";
+        key = "CC7388DF8E1890729921BCFF7C67C51C2FF524D9";
+        signByDefault = true;
+      };
+    };
+
+    programs.gpg = {
+      enable = true;
+    };
+
+    programs.ssh = {
+      enable = true;
+      enableDefaultConfig = false;
+      settings = {
+        "git.greyweather.dev" = {
+          HostName = "git.greyweather.dev";
+          Port = "222";
+          User = "git";
+          IdentityFile = "~/.ssh/id_gitea";
+        };
+        "github.com" = {
+          HostName = "github.com";
+          Port = 22;
+          User = "git";
+          IdentityFile = "~/.ssh/id_github";
+        };
+      };
+    };
+
+    home.shell.enableBashIntegration = true;
+  };
+}
\ No newline at end of file
diff --git a/modules/components/display-managers/ly.nix b/modules/components/display-managers/ly.nix
new file mode 100644
index 0000000..8adb800
--- /dev/null
+++ b/modules/components/display-managers/ly.nix
@@ -0,0 +1,9 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.ly = { config, pkgs, ... }: {
+    services.displayManager.ly = {
+      enable = true;
+    };
+
+    security.pam.services.login.fprintAuth = false;
+  };
+}
\ No newline at end of file
diff --git a/modules/components/shells/noctalia/noctalia.nix b/modules/components/shells/noctalia/noctalia.nix
new file mode 100644
index 0000000..c9741fe
--- /dev/null
+++ b/modules/components/shells/noctalia/noctalia.nix
@@ -0,0 +1,39 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.noctalia = { pkgs, ... }: { 
+    environment.systemPackages = with pkgs; [
+      inputs.noctalia.packages.${system}.default
+    ];
+
+    programs.noctalia.enable = true;
+  };
+
+  flake.homeModules.noctalia = { lib, pkgs, osConfig, ... }: {
+    home.activation = {
+      symlinkNoctaliaState = lib.hm.dag.entryAfter ["writeBoundary"] ''
+        #!/bin/bash
+        if [ -f /home/grey/.local/state/noctalia/settings.toml ]; then
+          rm /home/grey/.local/state/noctalia/settings.toml
+        fi
+        ln -s ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/noctalia/settings.toml /home/grey/.local/state/noctalia/settings.toml
+
+        if [ -d /home/grey/.local/state/noctalia/plugins ]; then
+          rm -rf /home/grey/.local/state/noctalia/plugins
+        fi
+        ln -s ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/noctalia/plugins /home/grey/.local/state/noctalia/plugins
+      '';
+
+      copyNoctaliaConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
+        #!/bin/bash
+        if [ -f /home/grey/.config/noctalia/settings.toml ]; then
+          rm /home/grey/.config/noctalia/settings.toml
+        fi
+        cp ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/noctalia/settings.toml /home/grey/.config/noctalia/settings.toml
+
+        if [ -d /home/grey/.config/noctalia/plugins ]; then
+          rm -rf /home/grey/.config/noctalia/plugins
+        fi
+        cp -r ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/noctalia/plugins /home/grey/.config/noctalia/plugins
+      '';
+    };  
+  };
+}
\ No newline at end of file
diff --git a/modules/components/window-managers/niri/niri.nix b/modules/components/window-managers/niri/niri.nix
new file mode 100644
index 0000000..fbec49c
--- /dev/null
+++ b/modules/components/window-managers/niri/niri.nix
@@ -0,0 +1,52 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.niri = { config, pkgs, inputs, lib, ... }: {
+    imports = with self.nixosModules; [
+      nautilus
+    ];
+
+    environment.systemPackages = with pkgs; [
+      xdg-desktop-portal-gnome
+      wl-clipboard
+      libsecret
+      cage
+      wev
+      qalculate-qt
+    ];
+
+    services.upower.enable = true;
+
+    services.udisks2.enable = true;
+
+    programs.niri = {
+      enable = true;
+      useNautilus = true;
+      # override niri source to use https://github.com/niri-wm/niri/pull/3642
+      package = (pkgs.niri.overrideAttrs (finalAttrs: prevAttrs:
+        {
+          cargoHash = "sha256-HypBB3PL4nVFMNH2+jEK0+dG9dJ920nHi8GwRoeH/v4=";
+          src = pkgs.fetchFromGitHub {
+            owner = "niri-wm";
+            repo = "niri";
+            rev = "cb41d54703eef73883bb2be58e19bcf3715d777c";
+            sha256 = "sha256-cLzTeMcCdQJ+kHGcOposjeheFyEG/tGOA1jFAORMHjI=";
+          };
+          cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+            inherit (finalAttrs) pname src version;
+            hash = finalAttrs.cargoHash;
+          };
+        }
+      ));
+    };
+  };
+
+  flake.homeModules.niri = { lib, osConfig, ... }: 
+  {
+    home.activation.symlinkNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
+      #!/bin/bash
+      if [ -f /home/grey/.config/niri/config.kdl ]; then
+        rm /home/grey/.config/niri/config.kdl
+      fi
+      ln -s ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/niri.kdl /home/grey/.config/niri/config.kdl
+    '';
+  };
+}
\ No newline at end of file
diff --git a/modules/features/flake-parts.nix b/modules/features/flake-parts.nix
new file mode 100644
index 0000000..961ce60
--- /dev/null
+++ b/modules/features/flake-parts.nix
@@ -0,0 +1,9 @@
+{ inputs, self, ...}: {
+  imports = [
+    inputs.home-manager.flakeModules.home-manager
+  ];
+
+  config.systems = [
+    "x86_64-linux"
+  ];
+}
\ No newline at end of file
diff --git a/modules/features/home-manager.nix b/modules/features/home-manager.nix
new file mode 100644
index 0000000..f127cec
--- /dev/null
+++ b/modules/features/home-manager.nix
@@ -0,0 +1,12 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.home-manager = { pkgs, ... }: {
+    imports = [
+      inputs.home-manager.nixosModules.default
+    ];
+
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/features/nh.nix b/modules/features/nh.nix
new file mode 100644
index 0000000..398134a
--- /dev/null
+++ b/modules/features/nh.nix
@@ -0,0 +1,11 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.global = { pkgs, config, ... }: {
+    environment.systemPackages = [
+      inputs.nh.packages.${pkgs.stdenv.hostPlatform.system}.default
+    ];
+    programs.nh = {
+      enable = true;
+      flake = "/home/grey/nixos";
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/features/stylix.nix b/modules/features/stylix.nix
new file mode 100644
index 0000000..a06fcd1
--- /dev/null
+++ b/modules/features/stylix.nix
@@ -0,0 +1,7 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.stylix = { pkgs, ... }: {
+    imports = [
+      inputs.stylix.nixosModules.stylix
+    ];
+  };
+}
\ No newline at end of file
diff --git a/modules/global.nix b/modules/global.nix
new file mode 100644
index 0000000..77c4385
--- /dev/null
+++ b/modules/global.nix
@@ -0,0 +1,148 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.global = { pkgs, config, lib, ... }: {
+    options = {
+      info.rootPath = lib.mkOption {
+        type = lib.types.str;
+        default = "/home/grey/nixos";
+      };
+    };
+
+    config = {
+      nix.settings.experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+
+      nix.gc = {
+        automatic = true;
+        persistent = true;
+        dates = "Sun 05:00";
+      };
+
+      boot.loader.efi.canTouchEfiVariables = true;
+
+      networking.networkmanager.enable = true;
+
+      time.timeZone = "Europe/London";
+      i18n.defaultLocale = "en_GB.UTF-8";
+      i18n.extraLocaleSettings = {
+        LC_ADDRESS = "en_GB.UTF-8";
+        LC_IDENTIFICATION = "en_GB.UTF-8";
+        LC_MEASUREMENT = "en_GB.UTF-8";
+        LC_MONETARY = "en_GB.UTF-8";
+        LC_NAME = "en_GB.UTF-8";
+        LC_NUMERIC = "en_GB.UTF-8";
+        LC_PAPER = "en_GB.UTF-8";
+        LC_TELEPHONE = "en_GB.UTF-8";
+        LC_TIME = "en_GB.UTF-8";
+      };
+
+      services.xserver.xkb = {
+        layout = "gb";
+        variant = "";
+      };
+      console.keyMap = "uk";
+
+      users.users."grey" = {
+        isNormalUser = true;
+        description = "grey";
+        extraGroups = [ "networkmanager" "wheel" ];
+      };
+
+      nixpkgs.config.allowUnfree = true;
+
+      environment.systemPackages = with pkgs; [
+        git
+        fzf
+        jq
+        busybox
+        ethtool
+        wayland-utils
+        mesa-demos
+        vulkan-tools
+        hyperfine
+      ];
+
+      fonts.packages = with pkgs; [
+        iosevka-comfy.comfy
+        nerd-fonts.jetbrains-mono
+      ];
+
+      programs.nano = {
+        enable = true;
+        nanorc = ''
+          set nowrap
+          set tabstospaces
+          set tabsize 2
+        '';
+      };
+
+      hardware.bluetooth = {
+        enable = true;
+        powerOnBoot = false;
+      };
+
+      programs.gnupg.agent = {
+        enable = true;
+      };
+    };
+  };
+
+  flake.homeModules.global = { config, pkgs, ... }: {
+    nix.gc = {
+      automatic = true;
+      persistent = true;
+      dates = "Sun 05:00";
+    };
+
+    home.packages = with pkgs; [
+      bibata-cursors
+      x264
+      speedtest-go
+      gparted
+      vlc
+    ];
+
+    programs.git = {
+      enable = true;
+
+      lfs.enable = true;
+
+      settings = {
+        user.name = "Grey Jones";
+        user.email = "grey@greyweather.dev";
+      };
+
+      signing = {
+        format = "openpgp";
+        key = "CC7388DF8E1890729921BCFF7C67C51C2FF524D9";
+        signByDefault = true;
+      };
+    };
+
+    programs.gpg = {
+      enable = true;
+    };
+
+    programs.ssh = {
+      enable = true;
+      enableDefaultConfig = false;
+      settings = {
+        "git.greyweather.dev" = {
+          HostName = "git.greyweather.dev";
+          Port = "222";
+          User = "git";
+          IdentityFile = "~/.ssh/id_gitea";
+        };
+        "github.com" = {
+          HostName = "github.com";
+          Port = 22;
+          User = "git";
+          IdentityFile = "~/.ssh/id_github";
+        };
+      };
+    };
+
+    home.shell.enableBashIntegration = true;
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/graphics.nix b/modules/hosts/graphics.nix
new file mode 100644
index 0000000..e7e9ded
--- /dev/null
+++ b/modules/hosts/graphics.nix
@@ -0,0 +1,3 @@
+{ inputs, self, ... }: {
+  # flake.nixosModules.graphics = 
+}
\ No newline at end of file
diff --git a/modules/hosts/kitagawa/home/fastfetch.nix b/modules/hosts/kitagawa/home/fastfetch.nix
new file mode 100644
index 0000000..4273a72
--- /dev/null
+++ b/modules/hosts/kitagawa/home/fastfetch.nix
@@ -0,0 +1,145 @@
+{ inputs, self, ... }: {
+  flake.homeModules.kitagawa = { pkgs, lib, ... }: {
+    programs.zsh.initContent = lib.mkOrder 1500 "fastfetch";
+
+    programs.fastfetch = {
+      enable = true;
+      settings = {
+        logo = {
+          type = "builtin";
+          padding = {
+            top = 1;
+            left = 2;
+            right = 2;
+          };
+        };
+
+        modules = [
+          {
+            type = "custom";
+            format = "┌────────────────── Software ──────────────────┐";
+          }
+          {
+            type = "title";
+            key = "  Session";
+            format = "{user-name}@{host-name}";
+          }
+          {
+            type = "os";
+            key = "  Distro";
+            format = "{pretty-name}";
+          }
+          {
+            type = "host";
+            key = "  Device";
+            format = "{version}";
+          }
+          {
+            type = "kernel";
+            key = "  Kernel";
+          }
+          {
+            type = "shell";
+            key = "  Shell";
+          }
+          {
+            type = "terminal";
+            key = "  Terminal";
+          }
+          {
+            type = "wm";
+            key = "  WM";
+          }
+          {
+            type = "custom";
+            format = "└──────────────────────────────────────────────┘";
+          }
+          "break"
+          {
+            type = "custom";
+            format = "┌────────────────── Hardware ──────────────────┐";
+          }
+          {
+            type = "cpu";
+            key = "  CPU";
+            format = "{name}";
+          }
+          {
+            type = "memory";
+            key = "  RAM";
+            percent = {
+              green = 50;
+              yellow = 80;
+              type = 0;
+            };
+          }
+          {
+            type = "swap";
+            key = "  Swap";
+            percent = {
+              green = 50;
+              yellow = 80;
+              type = 0;
+            };
+            separate = false;
+          }
+          {
+            type = "disk";
+            key = "  Disk";
+            showRegular = true;
+            showExternal = false;
+            showHidden = false;
+            showSubvolumes = false;
+            showReadOnly = true;
+            ShowUnknown = false;
+            hideFolders = "/efi:/boot:/boot/*:/run/media/*";
+            useAvailable = false;
+            percent = {
+              green = 50;
+              yellow = 80;
+              type = 0;
+            };
+          }
+          {
+            type = "localip";
+            key = "  IP";
+            showIpv4 = true;
+            showIpv6 = false;
+            showMac = false;
+            showLoop = false;
+            showPrefixLen = true;
+            showMtu = false;
+            showSpeed = false;
+            showFlags = false;
+            compact = false;
+            defaultRouteOnly = true;
+            showAllIps = false;
+          }
+          {
+            type = "custom";
+            format = "└──────────────────────────────────────────────┘";
+          }
+          "break"
+          {
+            type = "custom";
+            format = "┌──────────────── Age + Uptime ────────────────┐";
+          }
+          {
+            type = "disk";
+            key = "  OS Age";
+            folders = "/";
+            format = "{create-time:10} ({days} days)";
+          }
+          {
+            type = "uptime";
+            key = "  Uptime";
+          }
+          {
+            type = "custom";
+            format = "└──────────────────────────────────────────────┘";
+          }
+        ];
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/kitagawa/home/kitty.nix b/modules/hosts/kitagawa/home/kitty.nix
new file mode 100644
index 0000000..e01e131
--- /dev/null
+++ b/modules/hosts/kitagawa/home/kitty.nix
@@ -0,0 +1,11 @@
+{ inputs, self, ... }: {
+  flake.homeModules.kitagawa = { pkgs, config, lib, ... }: {
+    programs.kitty = {
+      font = lib.mkForce {
+        name = "Iosevka Comfy";
+        package = pkgs.iosevka-comfy.comfy;
+        size = 12;
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/kitagawa/home/zsh.nix b/modules/hosts/kitagawa/home/zsh.nix
new file mode 100644
index 0000000..1f56847
--- /dev/null
+++ b/modules/hosts/kitagawa/home/zsh.nix
@@ -0,0 +1,12 @@
+{ inputs, self, ... }: {
+  flake.homeModules.kitagawa = { config, pkgs, ... }: {
+    programs.zsh.shellAliases = {
+      wake-takamaki = "ssh sakamoto .local/bin/wake-takamaki";
+      shutdown-takamaki = "ssh takamaki universal-shutdown";
+      reboot-takamaki = "ssh takamaki universal-reboot";
+      switch-takamaki-os = "ssh takamaki switch-os";
+      apply-config = "zsh -c 'cd /home/grey/nixos; git add .; nh os switch .'";
+      update-system = "zsh -c 'cd /home/grey/nixos; git add .; nh os switch -u .'";
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/kitagawa/kitagawa.nix b/modules/hosts/kitagawa/kitagawa.nix
new file mode 100644
index 0000000..3cdc3d3
--- /dev/null
+++ b/modules/hosts/kitagawa/kitagawa.nix
@@ -0,0 +1,194 @@
+{ inputs, self, ... }: {
+  flake.nixosConfigurations.kitagawa = inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      self.nixosModules.kitagawa
+    ];
+  };
+
+  flake.nixosModules.kitagawa = { config, pkgs, ... }: {
+    system.stateVersion = "26.05";
+
+    networking.hostName = "kitagawa";
+
+    imports = with self.nixosModules; [
+      global
+      home-manager
+      stylix
+      ly
+      niri
+      noctalia
+      zsh
+    ];
+
+    nix.buildMachines = [
+      {
+        hostName = "nixremote";
+        systems = [ "x86_64-linux" "i686-linux" ];
+        protocol = "ssh-ng";
+        maxJobs = 250;
+        speedFactor = 1000;
+        supportedFeatures = [ "benchmark" "kvm" "big-parallel" ];
+      }
+    ];
+
+    nix.distributedBuilds = true;
+    nix.settings.builders-use-substitutes = true;
+
+    services.blueman.enable = true;
+
+    services.tailscale = {
+      enable = true;
+      openFirewall = true;
+    };
+
+    environment.systemPackages = with pkgs; [
+      github-desktop
+      moonlight-qt
+    ];
+
+    hardware.steam-hardware.enable = true;
+
+    boot = {
+      # Enable "Silent boot"
+      consoleLogLevel = 3;
+      initrd.verbose = false;
+      kernelParams = [
+        "quiet"
+        "rd.udev.log_level=3"
+        "rd.systemd.show_status=auto"
+      ];
+
+      loader.limine = {
+        enable = true;
+        maxGenerations = 10;
+      };
+    };
+
+    stylix.enable = true;
+    stylix.image = ./wallpaper.jpg;
+    stylix.polarity = "dark";
+
+    home-manager.users.grey = self.homeModules.kitagawa;
+  };
+
+  flake.homeModules.kitagawa = { config, pkgs, inputs, lib, ... }: {
+    home.stateVersion = "26.05";
+
+    imports = with self.homeModules; [
+      global
+      niri
+      noctalia
+      vscode
+      kitty
+      zsh
+      floorp
+      equibop
+      spotify
+    ];
+
+    features.spicetify.enable = true;
+
+    /*
+    imports = [
+      #"${global-configs}/gnome.nix"
+      #./configs/fetch.nix
+    ];
+    */
+
+    home.packages = with pkgs; [
+      obsidian
+      thunderbird
+      jetbrains.clion
+      jetbrains.idea
+      proton-vpn
+      ente-auth
+      signal-desktop
+      xarchiver
+      kdePackages.filelight
+      remmina
+      freerdp
+      loupe
+    ];
+
+    stylix.targets.floorp.profileNames = [ "default" ];
+
+    dconf.settings = {
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+      };
+    };
+
+    gtk = {
+      enable = true;
+      gtk3.bookmarks = [
+        "file:///home/grey/nixos NixOS"
+        "file:///home/grey/Downloads Downloads"
+        "file:///home/grey/Documents Documents"
+        "file:///home/grey/Pictures Pictures"
+        "file:///home/grey/Music Music"
+        "file:///home/grey/Videos Videos"
+        "file:/// Root"
+      ];
+    };
+
+    services.udiskie = {
+      enable = true;
+      settings = {
+        # workaround for
+        # https://github.com/nix-community/home-manager/issues/632
+        program_options = {
+          # replace with your favorite file manager
+          file_manager = "${pkgs.nautilus}/bin/nautilus";
+        };
+      };
+    };
+
+    xdg = {
+      enable = true;
+      mimeApps.defaultApplications = {
+        "x-scheme-handler/x-github-client" = [ "github-desktop.desktop" ];
+        "x-scheme-handler/x-github-desktop-dev-auth" = [ "github-desktop.desktop" ];
+        "x-scheme-handler/http" = [ "floorp.desktop" ];
+        "text/html" = [ "floorp.desktop" ];
+        "application/xhtml+xml" = [ "floorp.desktop" ];
+        "x-scheme-handler/https" = [ "floorp.desktop" ];
+        "text/calendar" = [ "thunderbird.desktop" ];
+      };
+    };
+
+    programs.ssh = {
+      settings = {
+        "takamaki" = {
+          HostName = "greyweather.dev";
+          Port = "2222";
+          User = "grey";
+          IdentityFile = "~/.ssh/id_takamaki";
+        };
+        "sakamoto" = {
+          HostName = "greyweather.dev";
+          Port = "22";
+          User = "grey";
+          IdentityFile = "~/.ssh/id_sakamoto";
+        };
+        "nixremote" = {
+          HostName = "greyweather.dev";
+          Port = "2222";
+          User = "nixremote";
+          IdentityFile = "~/.ssh/id_takamaki";
+        };
+      };
+    };
+
+    /*
+    home.activation = {
+      linkRemminaPresets = lib.hm.dag.entryAfter ["writeBoundary"] ''
+        #!/bin/bash
+        if [ -d /home/grey/.local/share/remmina ]; then
+          rm -rf /home/grey/.local/share/remmina
+        fi
+        ln -s /home/grey/nixos/assets/dotfiles/remmina-presets /home/grey/.local/share/remmina
+      '';
+    };
+    */
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/kitagawa/nixos/hardware-configuration.nix b/modules/hosts/kitagawa/nixos/hardware-configuration.nix
new file mode 100644
index 0000000..c43b703
--- /dev/null
+++ b/modules/hosts/kitagawa/nixos/hardware-configuration.nix
@@ -0,0 +1,40 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.kitagawa = { config, lib, pkgs, modulesPath, ... }: {
+    imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+    boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
+    boot.initrd.kernelModules = [ ];
+    boot.kernelModules = [ ];
+    boot.extraModulePackages = [ ];
+
+    fileSystems."/" = {
+      device = "/dev/disk/by-uuid/b17296df-a72e-4b9d-a3b6-54fc0c97c685";
+      fsType = "btrfs";
+    };
+
+    fileSystems."/home" = {
+      device = "/dev/disk/by-uuid/b17296df-a72e-4b9d-a3b6-54fc0c97c685";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+    fileSystems."/nix" = {
+      device = "/dev/disk/by-uuid/b17296df-a72e-4b9d-a3b6-54fc0c97c685";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-uuid/68F7-4D8F";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+    swapDevices = [
+      { device = "/dev/disk/by-uuid/e85559e0-a039-4178-929a-8c5ec0328b64"; }
+    ];
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/kitagawa/nixos/hardware-fixes.nix b/modules/hosts/kitagawa/nixos/hardware-fixes.nix
new file mode 100644
index 0000000..93ad807
--- /dev/null
+++ b/modules/hosts/kitagawa/nixos/hardware-fixes.nix
@@ -0,0 +1,34 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.kitagawa = { pkgs, config, ... }: {
+    systemd.sleep.settings.Sleep = {
+      AllowSuspend = "no";
+      AllowHibernation = "yes";
+    };
+
+    services.logind.settings.Login.HandleLidSwitch = "ignore";
+
+    systemd.services.disable-lid-wakeup = {
+      wantedBy = [ "multi-user.target" ];
+      description = "Prevent the lid switch from waking laptop from hibernation";
+      serviceConfig = {
+        Type = "simple";
+        User = "root";
+        ExecStart = "/bin/sh -c \"if [ \\\"$(cat /proc/acpi/wakeup | grep 'LID' | grep 'enabled')\\\" != \\\"\\\" ]; then echo LID > /proc/acpi/wakeup; fi\"";
+      };
+    };
+
+    systemd.services.disable-tty-switch = {
+      wantedBy = [ "multi-user.target" ];
+      description = "Prevent alt+arrow keys from switching tty";
+      serviceConfig = {
+        Type = "simple";
+        User = "root";
+        ExecStart = "/bin/sh -c \"${pkgs.kbd}/bin/dumpkeys -k|grep -v Incr_Console|grep -v Decr_Console|${pkgs.kbd}/bin/loadkeys\"";
+      };
+    };
+
+    services.fprintd.enable = true;
+
+    services.iio-niri.enable = true;
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/kitagawa/nixos/plymouth.nix b/modules/hosts/kitagawa/nixos/plymouth.nix
new file mode 100644
index 0000000..9d05ecb
--- /dev/null
+++ b/modules/hosts/kitagawa/nixos/plymouth.nix
@@ -0,0 +1,18 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.kitagawa = { pkgs, config, ... }:
+  let
+    plymouthTheme = "double";
+  in {
+    stylix.targets.plymouth.enable = false;
+
+    boot.plymouth = {
+      enable = true;
+      theme = plymouthTheme;
+      themePackages = with pkgs; [
+        (adi1090x-plymouth-themes.override {
+          selected_themes = [ plymouthTheme ];
+        })
+      ];
+    };
+  };
+}
\ No newline at end of file
diff --git a/assets/wallpapers/kitagawa.jpg b/modules/hosts/kitagawa/wallpaper.jpg
similarity index 100%
rename from assets/wallpapers/kitagawa.jpg
rename to modules/hosts/kitagawa/wallpaper.jpg
diff --git a/modules/programs/equibop.nix b/modules/programs/equibop.nix
new file mode 100644
index 0000000..13713a5
--- /dev/null
+++ b/modules/programs/equibop.nix
@@ -0,0 +1,25 @@
+{ inputs, self, ... }: {
+  flake.homeModules.equibop = { pkgs, lib, osConfig, ... }: {
+    programs.equibop.enable = true;
+
+    home.activation = {
+      linkEquibopConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
+        #!/bin/bash
+        if [ -f /home/grey/.config/equibop/settings.json ]; then
+          rm /home/grey/.config/equibop/settings.json
+        fi
+        ln -s ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/equibop/settings.json /home/grey/.config/equibop/settings.json
+
+        if [ -f /home/grey/.config/equibop/settings/settings.json ]; then
+          rm /home/grey/.config/equibop/settings/settings.json
+        fi
+        ln -s ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/equibop/equicord-settings.json /home/grey/.config/equibop/settings/settings.json
+
+        if [ -f /home/grey/.config/equibop/settings/quickCss.css ]; then
+          rm /home/grey/.config/equibop/settings/quickCss.css
+        fi
+        ln -s ${osConfig.info.rootPath}/dotfiles/${osConfig.networking.hostName}/equibop/quickCss.css /home/grey/.config/equibop/settings/quickCss.css
+      '';
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/programs/floorp.nix b/modules/programs/floorp.nix
new file mode 100644
index 0000000..b5f3703
--- /dev/null
+++ b/modules/programs/floorp.nix
@@ -0,0 +1,207 @@
+{ inputs, self, ... }: {
+  flake.homeModules.floorp = { pkgs, ... }:
+  let
+    firefox-addons = with pkgs; inputs.firefox-addons.packages.${system};
+  in {
+    programs.floorp = {
+      enable = true;
+      nativeMessagingHosts = [
+        pkgs.firefoxpwa
+      ];
+      policies = {
+        AIControls.Default = {
+          Value = "blocked";
+          Locked = true;
+        };
+        AutofillAddressEnabled = false;
+        AutofillCreditCardEnabled = false;
+        DisableAppUpdate = true;
+        DisableFeedbackCommands = true;
+        DisableFirefoxStudies = true;
+        DisablePocket = true;
+        DisableTelemetry = true;
+        NoDefaultBookmarks = true;
+        EnableTrackingProtection = {
+          Value = true;
+          Locked = true;
+          Cryptomining = true;
+          Fingerprinting = true;
+        };
+      };
+      profiles.default = {
+        extensions = {
+          packages = with firefox-addons; [
+            adnauseam
+            bitwarden
+            indie-wiki-buddy
+            pwas-for-firefox
+            gnome-shell-integration
+          ];
+
+          settings = {
+            ${firefox-addons.adnauseam.addonId} = {
+              force = true;
+              settings = {
+                "firstInstall" = false;
+                "hidingAds" = true;
+                "clickingAds" = true;
+                "blockingMalware" = true;
+                "disableClickingForDNT" = true;
+                "clickProbability" = 0.75;
+                selectedFilterLists = [
+                  "user-filters"
+                  "adnauseam-filters"
+                  "eff-dnt-whitelist"
+                  "ublock-filters"
+                  "ublock-badware"
+                  "ublock-privacy"
+                  "ublock-quick-fixes"
+                  "ublock-unbreak"
+                  "easylist"
+                  "easyprivacy"
+                  "urlhaus-1"
+                  "fanboy-cookiemonster"
+                  "ublock-cookies-easylist"
+                  "adguard-cookies"
+                  "ublock-cookies-adguard"
+                  "fanboy-ai-suggestions"
+                  "easylist-chat"
+                  "easylist-newsletters"
+                  "easylist-notifications"
+                  "easylist-annoyances"
+                  "adguard-mobile-app-banners"
+                  "adguard-other-annoyances"
+                  "adguard-popup-overlays"
+                  "adguard-widgets"
+                  "ublock-annoyances"
+                ];
+              };
+            };
+          };
+        };
+
+
+        settings = {
+          "signon.rememberSignons" = false;
+          "signon.autofillForms" = false;
+          "floorp.panelSidebar.enabled" = false;
+          "floorp.workspaces.enabled" = false;
+          "browser.toolbars.bookmarks.visibility" = "newtab";
+          "floorp.browser.welcome.page.shown" = true;
+          "browser.newtabpage.activity-stream.feeds.topsites" = false;
+          "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+          "browser.newtabpage.activity-stream.feeds.adsfeed" = false;
+          "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+          "browser.newtabpage.activity-stream.feeds.weatherfeed" = false;
+          "browser.newtabpage.activity-stream.newtabWallpapers.user.enabled" = true;
+          "browser.newtabpage.activity-stream.widgets.enabled" = false;
+          "browser.newtabpage.activity-stream.discoverystream.enabled" = false;
+          "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "suspension-bridge";
+          "floorp.design.configs" = {
+            globalConfigs = {
+              userInterface = "proton";
+              uiCustomization = {
+                qrCode.disableButton = true;
+                disableFloorpStart = true;
+              };
+            };
+          };
+          "ui.key.menuAccessKeyFocuses" = false;
+          "floorp.keyboardshortcut.enabled" = true;
+          "floorp.keyboardshortcut.config" = {
+            enabled = true;
+            shortcuts = {
+              gecko-close-tab = {
+                modifiers = {
+                  alt = true;
+                  ctrl = false;
+                  meta = false;
+                  shift = false;
+                };
+                key = "Q";
+                action = "gecko-close-tab";
+              };
+              gecko-open-new-tab = {
+                modifiers = {
+                  alt = true;
+                  ctrl = false;
+                  meta = false;
+                  shift = false;
+                };
+                key = "Enter";
+                action = "gecko-open-new-tab";
+              };
+            };
+          };
+        };
+
+        search = {
+          force = true;
+          default = "ddg-noai";
+          engines = {
+            ddg-noai = {
+              name = "DuckDuckGo No-AI";
+              urls = [
+                {
+                  template = "https://noai.duckduckgo.com/?q={searchTerms}";
+                }
+              ];
+              icon = "https://duckduckgo.com/favicon.ico";
+              definedAliases = ["@noai"];
+            };
+            nixpkgs = {
+              name = "nixpkgs packages";
+              urls = [
+                {
+                  template = "https://search.nixos.org/packages?query={searchTerms}";
+                }
+              ];
+              icon = "https://wiki.nixos.org/favicon.ico";
+              definedAliases = ["@np"];
+            };
+            nixos-options = {
+              name = "NixOS options";
+              urls = [
+                {
+                  template = "https://search.nixos.org/options?query={searchTerms}";
+                }
+              ];
+              icon = "https://wiki.nixos.org/favicon.ico";
+              definedAliases = ["@no"];
+            };
+            nixos-wiki = {
+              name = "NixOS Wiki";
+              urls = [
+                {
+                  template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
+                }
+              ];
+              icon = "https://wiki.nixos.org/favicon.ico";
+              definedAliases = ["@nw"];
+            };
+            noogle = {
+              name = "Noogle";
+              urls = [
+                {
+                  template = "https://noogle.dev/q/?term={searchTerms}";
+                }
+              ];
+              icon = "https://noogle.dev/favicon.ico";
+              definedAliases = ["@ng"];
+            };
+            arch-wiki = {
+              name = "ArchWiki";
+              urls = [
+                {
+                  template = "https://wiki.archlinux.org/index.php?search={searchTerms}";
+                }
+              ];
+              icon = "https://wiki.archlinux.org/favicon.ico";
+              definedAliases = ["@aw"];
+            };
+          };
+        };
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
new file mode 100644
index 0000000..06ebfc6
--- /dev/null
+++ b/modules/programs/kitty.nix
@@ -0,0 +1,10 @@
+{ inputs, self, ... }: {
+  flake.homeModules.kitty = { pkgs, ... }: {
+    programs.kitty = {
+      enable = true;
+
+      shellIntegration.enableBashIntegration = true;
+      enableGitIntegration = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/programs/nautilus.nix b/modules/programs/nautilus.nix
new file mode 100644
index 0000000..0b95715
--- /dev/null
+++ b/modules/programs/nautilus.nix
@@ -0,0 +1,14 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.nautilus = { pkgs, config, ... }: {
+    environment.systemPackages = with pkgs; [
+      nautilus
+      code-nautilus
+      adwaita-icon-theme
+    ];
+
+    programs.nautilus-open-any-terminal = {
+      enable = true;
+      terminal = "kitty";
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/programs/spotify.nix b/modules/programs/spotify.nix
new file mode 100644
index 0000000..bd6cfd7
--- /dev/null
+++ b/modules/programs/spotify.nix
@@ -0,0 +1,41 @@
+{ inputs, self, ... }: {
+  flake.homeModules.spotify = { pkgs, config, lib, ... }: {
+    imports = [
+      inputs.spicetify.homeManagerModules.default
+    ];
+
+    options = {
+      features.spicetify.enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+      };
+    };
+
+    config = {
+      home.packages = with pkgs; lib.mkIf (config.features.spicetify.enable == false) [
+        spotfify
+      ];
+
+      programs.spicetify =
+      let
+        spicePkgs = inputs.spicetify.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+      in lib.mkIf (config.features.spicetify.enable) {
+        enable = true;
+        enabledExtensions = with spicePkgs.extensions; [
+          hidePodcasts
+        ];
+        enabledSnippets = with spicePkgs.snippets; [
+          spinningCdCoverArt
+          oneko
+          hideMiniPlayerButton
+          hideFullScreenButton
+          declutterNowPlayingBar
+          modernScrollbar
+        ];
+        enabledCustomApps = with spicePkgs.apps; [
+          # marketplace
+        ];
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
new file mode 100644
index 0000000..7cc01ee
--- /dev/null
+++ b/modules/programs/vscode.nix
@@ -0,0 +1,20 @@
+{ inputs, self, ... }: {
+  flake.homeModules.vscode = { osConfig, pkgs, lib, ... }: {
+    home.packages = [ pkgs.vscode ];
+
+    home.activation = {
+      linkVsCodeConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
+        #!/bin/bash
+        if [ -f /home/grey/.config/Code/User/settings.json ]; then
+          rm /home/grey/.config/Code/User/settings.json
+        fi
+        ln -s ${osConfig.info.rootPath}/dotfiles/global/vscode/settings.json /home/grey/.config/Code/User/settings.json
+
+        if [ -f /home/grey/.config/Code/User/keybindings.json ]; then
+          rm /home/grey/.config/Code/User/keybindings.json
+        fi
+        ln -s ${osConfig.info.rootPath}/dotfiles/global/vscode/keybindings.json /home/grey/.config/Code/User/keybindings.json
+      '';
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
new file mode 100644
index 0000000..312f097
--- /dev/null
+++ b/modules/programs/zsh.nix
@@ -0,0 +1,29 @@
+{ inputs, self, ... }: {
+  flake.nixosModules.zsh = { config, pkgs, ... }: {
+    programs.zsh.enable = true;
+    users.defaultUserShell = pkgs.zsh;
+    users.users."grey".shell = pkgs.zsh;
+  };
+
+  flake.homeModules.zsh = { pkgs, ... }: {
+    home.shell.enableZshIntegration = true;
+
+    programs.kitty.shellIntegration.enableZshIntegration = true;
+
+    programs.zsh = {
+      enable = true;
+      completionInit = "";
+      antidote = {
+        enable = true;
+        plugins = [
+          "getantidote/use-omz"
+          "ohmyzsh/ohmyzsh path:lib"
+          "ohmyzsh/ohmyzsh path:plugins/command-not-found"
+          "ohmyzsh/ohmyzsh path:themes/nanotech.zsh-theme"
+          "zsh-users/zsh-autosuggestions"
+          "zdharma-continuum/fast-syntax-highlighting"
+        ];
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/old-config/assets/dotfiles/equibop-config/equicord-settings.json b/old-config/assets/dotfiles/equibop-config/equicord-settings.json
new file mode 100644
index 0000000..cb85824
--- /dev/null
+++ b/old-config/assets/dotfiles/equibop-config/equicord-settings.json
@@ -0,0 +1,1238 @@
+{
+    "autoUpdate": true,
+    "cloud": {
+        "authenticated": false,
+        "settingsSync": false,
+        "url": "https://cloud.equicord.org/",
+        "settingsSyncVersion": 1787543449308
+    },
+    "enableOnlineThemes": true,
+    "enabledThemeLinks": [
+        "https://raw.githubusercontent.com/refact0r/midnight-discord/refs/heads/master/themes/midnight.theme.css"
+    ],
+    "plugins": {
+        "AltKrispSwitch": {
+            "enabled": true
+        },
+        "BetterAudioPlayer": {
+            "enabled": true,
+            "oscilloscope": true,
+            "oscilloscopeColor": "255, 255, 255",
+            "oscilloscopeSolidColor": false,
+            "spectrograph": true,
+            "spectrographColor": "33, 150, 243",
+            "spectrographSolidColor": false
+        },
+        "BetterCommands": {
+            "allowNewlinesInCommands": true,
+            "autoFillArguments": true,
+            "enabled": true
+        },
+        "BetterGifPicker": {
+            "enabled": true,
+            "keepOpen": false
+        },
+        "BetterSettings": {
+            "disableFade": true,
+            "eagerLoad": true,
+            "enabled": true,
+            "organizeMenu": true
+        },
+        "BetterUploadButton": {
+            "enabled": true
+        },
+        "ClearURLs": {
+            "enabled": true
+        },
+        "Declutter": {
+            "alwaysShowUsername": true,
+            "enabled": true,
+            "removeAvatarDecoration": false,
+            "removeClanTag": false,
+            "removeNameplate": false,
+            "removeProfileEffect": false,
+            "removeQuestsAboveDms": true,
+            "removeShopAboveDms": true,
+            "removeButtonTooltips": false,
+            "removeAudioMenus": true,
+            "removeServerBoostInfo": true,
+            "removeBillingSettings": true,
+            "removeGiftButton": true,
+            "removeUnavailableEmojiPicker": true,
+            "removeProfileFrame": true,
+            "removeLibraryAboveDms": false,
+            "removeFamilyCenterAboveDms": false
+        },
+        "DisableCallIdle": {
+            "enabled": true
+        },
+        "EquicordHelper": {
+            "accountStandingButton": false,
+            "disableAdoptTagPrompt": false,
+            "enabled": true,
+            "forceRoleIcon": false,
+            "hideVoiceIndicatorForMutedChannels": false,
+            "jsonGateway": false,
+            "noBulletPoints": false,
+            "noMirroredCamera": false,
+            "noModalAnimation": false,
+            "removeActivitySection": false,
+            "restoreFileDownloadButton": false,
+            "showYourOwnActivityButtons": false
+        },
+        "FakeNitro": {
+            "disableEmbedPermissionCheck": false,
+            "emojiSize": 48,
+            "enableEmojiBypass": true,
+            "enableStickerBypass": true,
+            "enableStreamQualityBypass": true,
+            "enabled": true,
+            "hyperLinkText": "{{NAME}}",
+            "stickerSize": 160,
+            "transformCompoundSentence": false,
+            "transformEmojis": true,
+            "transformStickers": true,
+            "useEmojiHyperLinks": true,
+            "useStickerHyperLinks": true
+        },
+        "FixYoutubeEmbeds": {
+            "enabled": true,
+            "youtubeDescription": false
+        },
+        "ForceOwnerCrown": {
+            "enabled": true
+        },
+        "FullUserInChatbox": {
+            "enabled": true
+        },
+        "NewPluginsManager": {
+            "enabled": true
+        },
+        "NoTrack": {
+            "disableAnalytics": true,
+            "enabled": true
+        },
+        "Settings": {
+            "enabled": true,
+            "includeVencordInfoWhenCopying": true,
+            "settingsLocation": "aboveNitro"
+        },
+        "WebKeybinds": {
+            "enabled": true
+        },
+        "WebScreenShareFixes": {
+            "enabled": true
+        },
+        "YoutubeAdblock": {
+            "enabled": true
+        },
+        "ChatInputButtonAPI": {
+            "enabled": true
+        },
+        "CommandsAPI": {
+            "enabled": true
+        },
+        "DynamicImageModalAPI": {
+            "enabled": false
+        },
+        "MemberListDecoratorsAPI": {
+            "enabled": false
+        },
+        "MessageAccessoriesAPI": {
+            "enabled": true
+        },
+        "MessageDecorationsAPI": {
+            "enabled": false
+        },
+        "MessageEventsAPI": {
+            "enabled": true
+        },
+        "MessagePopoverAPI": {
+            "enabled": true
+        },
+        "MessageUpdaterAPI": {
+            "enabled": false
+        },
+        "NicknameIconsAPI": {
+            "enabled": false
+        },
+        "ServerListAPI": {
+            "enabled": false
+        },
+        "UserSettingsAPI": {
+            "enabled": true
+        },
+        "AccountPanelServerProfile": {
+            "enabled": false
+        },
+        "AlwaysAnimate": {
+            "enabled": false
+        },
+        "AlwaysExpandRoles": {
+            "enabled": false
+        },
+        "AlwaysTrust": {
+            "enabled": false
+        },
+        "AnonymiseFileNames": {
+            "enabled": false
+        },
+        "AppleMusicRichPresence": {
+            "enabled": false
+        },
+        "WebRichPresence": {
+            "enabled": false
+        },
+        "BetterFolders": {
+            "enabled": false
+        },
+        "BetterGifAltText": {
+            "enabled": false
+        },
+        "BetterRoleContext": {
+            "enabled": false
+        },
+        "BetterRoleDot": {
+            "enabled": false
+        },
+        "BetterSessions": {
+            "enabled": false
+        },
+        "BiggerStreamPreview": {
+            "enabled": false
+        },
+        "BlurNSFW": {
+            "enabled": false
+        },
+        "CallTimer": {
+            "enabled": false
+        },
+        "CharacterCounter": {
+            "enabled": false
+        },
+        "ClientTheme": {
+            "enabled": false
+        },
+        "ColorSighted": {
+            "enabled": false
+        },
+        "ConsoleJanitor": {
+            "enabled": false
+        },
+        "ConsoleShortcuts": {
+            "enabled": false
+        },
+        "CopyEmojiMarkdown": {
+            "enabled": false
+        },
+        "CopyFileContents": {
+            "enabled": false
+        },
+        "CopyStickerLinks": {
+            "enabled": false
+        },
+        "CopyUserURLs": {
+            "enabled": false
+        },
+        "CrashHandler": {
+            "enabled": true
+        },
+        "CustomCommands": {
+            "enabled": false
+        },
+        "CustomIdle": {
+            "enabled": false
+        },
+        "CustomRPC": {
+            "enabled": false
+        },
+        "Dearrow": {
+            "enabled": false
+        },
+        "Decor": {
+            "enabled": false
+        },
+        "DontRoundMyTimestamps": {
+            "enabled": false
+        },
+        "Experiments": {
+            "enabled": false
+        },
+        "ExpressionCloner": {
+            "enabled": false
+        },
+        "F8Break": {
+            "enabled": false
+        },
+        "FakeProfileThemes": {
+            "enabled": false
+        },
+        "FavoriteEmojiFirst": {
+            "enabled": false
+        },
+        "FavoriteGifSearch": {
+            "enabled": false
+        },
+        "FixCodeblockGap": {
+            "enabled": false
+        },
+        "FixImagesQuality": {
+            "enabled": false
+        },
+        "FixSpotifyEmbeds": {
+            "enabled": false
+        },
+        "FriendInvites": {
+            "enabled": false
+        },
+        "FullSearchContext": {
+            "enabled": false
+        },
+        "GameActivityToggle": {
+            "enabled": false
+        },
+        "GifPaste": {
+            "enabled": false
+        },
+        "GreetStickerPicker": {
+            "enabled": false
+        },
+        "HideMedia": {
+            "enabled": false
+        },
+        "ILoveSpam": {
+            "enabled": false
+        },
+        "IgnoreActivities": {
+            "enabled": false
+        },
+        "ImageFilename": {
+            "enabled": false
+        },
+        "ImageLink": {
+            "enabled": false
+        },
+        "ImageZoom": {
+            "enabled": false
+        },
+        "ImplicitRelationships": {
+            "enabled": false
+        },
+        "IrcColors": {
+            "enabled": false
+        },
+        "KeepCurrentChannel": {
+            "enabled": false
+        },
+        "LoadingQuotes": {
+            "enabled": false
+        },
+        "MemberCount": {
+            "enabled": false
+        },
+        "MentionAvatars": {
+            "enabled": false
+        },
+        "MessageClickActions": {
+            "enabled": false
+        },
+        "MessageLatency": {
+            "enabled": false
+        },
+        "MessageLinkEmbeds": {
+            "enabled": false
+        },
+        "MessageLogger": {
+            "enabled": false
+        },
+        "MoreQuickReactions": {
+            "enabled": false
+        },
+        "MutualGroupDMs": {
+            "enabled": false
+        },
+        "NewGuildSettings": {
+            "enabled": false
+        },
+        "NoBlockedMessages": {
+            "enabled": false
+        },
+        "NoDevtoolsWarning": {
+            "enabled": false
+        },
+        "NoF1": {
+            "enabled": false
+        },
+        "NoMaskedUrlPaste": {
+            "enabled": false
+        },
+        "NoMiddleClickPaste": {
+            "enabled": false
+        },
+        "NoMosaic": {
+            "enabled": false
+        },
+        "NoOnboardingDelay": {
+            "enabled": false
+        },
+        "NoPendingCount": {
+            "enabled": false
+        },
+        "NoProfileThemes": {
+            "enabled": false
+        },
+        "NoReplyMention": {
+            "enabled": false
+        },
+        "NoServerEmojis": {
+            "enabled": false
+        },
+        "NoTypingAnimation": {
+            "enabled": false
+        },
+        "NoUnblockToJump": {
+            "enabled": false
+        },
+        "NotificationVolume": {
+            "enabled": false
+        },
+        "OnePingPerDM": {
+            "enabled": false
+        },
+        "OpenInApp": {
+            "enabled": false
+        },
+        "OverrideForumDefaults": {
+            "enabled": false
+        },
+        "PauseInvitesForever": {
+            "enabled": false
+        },
+        "PermissionFreeWill": {
+            "enabled": false
+        },
+        "PermissionsViewer": {
+            "enabled": false
+        },
+        "PetPet": {
+            "enabled": false
+        },
+        "PictureInPicture": {
+            "enabled": false
+        },
+        "PinDMs": {
+            "enabled": false
+        },
+        "PlainFolderIcon": {
+            "enabled": false
+        },
+        "PlatformIndicators": {
+            "enabled": false
+        },
+        "PreviewMessage": {
+            "enabled": false
+        },
+        "QuickMention": {
+            "enabled": false
+        },
+        "QuickReply": {
+            "enabled": false
+        },
+        "ReactErrorDecoder": {
+            "enabled": false
+        },
+        "ReadAllNotificationsButton": {
+            "enabled": false
+        },
+        "RelationshipNotifier": {
+            "enabled": false
+        },
+        "ReplaceGoogleSearch": {
+            "enabled": false
+        },
+        "ReplyTimestamp": {
+            "enabled": false
+        },
+        "RevealAllSpoilers": {
+            "enabled": false
+        },
+        "ReverseImageSearch": {
+            "enabled": false
+        },
+        "ReviewDB": {
+            "enabled": false
+        },
+        "RoleColorEverywhere": {
+            "enabled": false
+        },
+        "SecretRingToneEnabler": {
+            "enabled": false
+        },
+        "Summaries": {
+            "enabled": false
+        },
+        "SendTimestamps": {
+            "enabled": false
+        },
+        "ServerInfo": {
+            "enabled": false
+        },
+        "ServerListIndicators": {
+            "enabled": false
+        },
+        "ShikiCodeblocks": {
+            "enabled": false
+        },
+        "ShowAllMessageButtons": {
+            "enabled": false
+        },
+        "ShowConnections": {
+            "enabled": false
+        },
+        "ShowHiddenChannels": {
+            "enabled": false
+        },
+        "ShowHiddenThings": {
+            "enabled": false
+        },
+        "ShowMeYourName": {
+            "enabled": false
+        },
+        "ShowTimeoutDuration": {
+            "enabled": false
+        },
+        "SilentMessageToggle": {
+            "enabled": false
+        },
+        "SilentTyping": {
+            "enabled": false
+        },
+        "SortFriends": {
+            "enabled": false
+        },
+        "SpotifyCrack": {
+            "enabled": false
+        },
+        "SpotifyShareCommands": {
+            "enabled": false
+        },
+        "StartupTimings": {
+            "enabled": false
+        },
+        "StickerPaste": {
+            "enabled": false
+        },
+        "StreamerModeOn": {
+            "enabled": false
+        },
+        "SuperReactionTweaks": {
+            "enabled": false
+        },
+        "TextReplace": {
+            "enabled": false
+        },
+        "ThemeAttributes": {
+            "enabled": false
+        },
+        "Translate": {
+            "enabled": false
+        },
+        "TypingIndicator": {
+            "enabled": false
+        },
+        "TypingTweaks": {
+            "enabled": false
+        },
+        "Unindent": {
+            "enabled": false
+        },
+        "UnlockedAvatarZoom": {
+            "enabled": false
+        },
+        "UnsuppressEmbeds": {
+            "enabled": false
+        },
+        "UserMessagesPronouns": {
+            "enabled": false
+        },
+        "UserVoiceShow": {
+            "enabled": false
+        },
+        "USRBG": {
+            "enabled": false
+        },
+        "ValidReply": {
+            "enabled": false
+        },
+        "ValidUser": {
+            "enabled": false
+        },
+        "VoiceChatDoubleClick": {
+            "enabled": false
+        },
+        "VcNarrator": {
+            "enabled": false
+        },
+        "ViewIcons": {
+            "enabled": false
+        },
+        "ViewRaw": {
+            "enabled": false
+        },
+        "VoiceDownload": {
+            "enabled": false
+        },
+        "VoiceMessages": {
+            "enabled": false
+        },
+        "VolumeBooster": {
+            "enabled": false
+        },
+        "WhoReacted": {
+            "enabled": false
+        },
+        "XSOverlay": {
+            "enabled": false
+        },
+        "AudioPlayerAPI": {
+            "enabled": false
+        },
+        "HeaderBarAPI": {
+            "enabled": true
+        },
+        "ProfileCollectionsAPI": {
+            "enabled": false
+        },
+        "ProfileSectionsAPI": {
+            "enabled": false
+        },
+        "SurfaceClassesAPI": {
+            "enabled": true
+        },
+        "UserAreaAPI": {
+            "enabled": false
+        },
+        "ConcatenatedModules": {
+            "enabled": false
+        },
+        "AdvancedPermissions": {
+            "enabled": false
+        },
+        "AlwaysExpandProfiles": {
+            "enabled": false
+        },
+        "Animalese": {
+            "enabled": false
+        },
+        "AtSomeone": {
+            "enabled": false
+        },
+        "AutoZipper": {
+            "enabled": false
+        },
+        "BannersEverywhere": {
+            "enabled": false
+        },
+        "DecodeBase64": {
+            "enabled": false
+        },
+        "BetterActivities": {
+            "enabled": false
+        },
+        "BetterBanReasons": {
+            "enabled": false
+        },
+        "BetterBlockedUsers": {
+            "enabled": false
+        },
+        "BetterForwards": {
+            "enabled": false
+        },
+        "BetterInvites": {
+            "enabled": false
+        },
+        "BetterPlusReacts": {
+            "enabled": false
+        },
+        "BlockKeywords": {
+            "enabled": false
+        },
+        "BlockKrisp": {
+            "enabled": false
+        },
+        "BypassPinPrompt": {
+            "enabled": false
+        },
+        "BypassStatus": {
+            "enabled": false
+        },
+        "ChannelBadges": {
+            "enabled": false
+        },
+        "ChannelTabs": {
+            "enabled": false
+        },
+        "CleanChannelName": {
+            "enabled": false
+        },
+        "CleanerChannelGroups": {
+            "enabled": false
+        },
+        "ClickableRoles": {
+            "enabled": false
+        },
+        "ClientSideBlock": {
+            "enabled": false
+        },
+        "ClipUpload": {
+            "enabled": false
+        },
+        "CollapsibleUI": {
+            "enabled": true
+        },
+        "CommandPalette": {
+            "enabled": false
+        },
+        "ContentWarning": {
+            "enabled": false
+        },
+        "CopyProfileColors": {
+            "enabled": false
+        },
+        "CopyStatusUrls": {
+            "enabled": false
+        },
+        "CopyUserMention": {
+            "enabled": false
+        },
+        "CursorBuddy": {
+            "enabled": false
+        },
+        "CustomFolderIcons": {
+            "enabled": false
+        },
+        "CustomSounds": {
+            "enabled": false
+        },
+        "CustomStatusTimeouts": {
+            "enabled": false
+        },
+        "CustomTimestamps": {
+            "enabled": false
+        },
+        "CustomUserColors": {
+            "enabled": false
+        },
+        "DisableCameras": {
+            "enabled": false
+        },
+        "DiscordDevBanner": {
+            "enabled": false
+        },
+        "DownloadAllAttachments": {
+            "enabled": true
+        },
+        "DragFavoriteEmotes": {
+            "enabled": false
+        },
+        "Dragify": {
+            "enabled": false
+        },
+        "EquibopStreamFixes": {
+            "enabled": false
+        },
+        "EquicordToolbox": {
+            "enabled": false
+        },
+        "Equissant": {
+            "enabled": false
+        },
+        "ExitSounds": {
+            "enabled": false
+        },
+        "ExportMessages": {
+            "enabled": false
+        },
+        "FastDeleteChannels": {
+            "enabled": false
+        },
+        "FavouriteAnything": {
+            "enabled": false
+        },
+        "FileUpload": {
+            "enabled": false
+        },
+        "FindReply": {
+            "enabled": false
+        },
+        "FixFileExtensions": {
+            "enabled": false
+        },
+        "FollowVoiceUser": {
+            "enabled": false
+        },
+        "FontLoader": {
+            "enabled": false
+        },
+        "FrequentQuickSwitcher": {
+            "enabled": false
+        },
+        "FriendCodes": {
+            "enabled": false
+        },
+        "FriendTags": {
+            "enabled": false
+        },
+        "FriendshipRanks": {
+            "enabled": false
+        },
+        "FullVCPFP": {
+            "enabled": false
+        },
+        "Ghosted": {
+            "enabled": false
+        },
+        "GifCollections": {
+            "enabled": false
+        },
+        "GifMaker": {
+            "enabled": false
+        },
+        "GitHubRepos": {
+            "enabled": false
+        },
+        "GlobalBadges": {
+            "enabled": false
+        },
+        "GoogleThat": {
+            "enabled": false
+        },
+        "GuildPickerDumper": {
+            "enabled": false
+        },
+        "HideChatButtons": {
+            "enabled": false
+        },
+        "HideMessages": {
+            "enabled": false
+        },
+        "HideServers": {
+            "enabled": false
+        },
+        "HomeTyping": {
+            "enabled": false
+        },
+        "HopOn": {
+            "enabled": false
+        },
+        "Husk": {
+            "enabled": false
+        },
+        "IRememberYou": {
+            "enabled": false
+        },
+        "IconViewer": {
+            "enabled": false
+        },
+        "IdleAutoRestart": {
+            "enabled": false
+        },
+        "IgnoreCalls": {
+            "enabled": false
+        },
+        "InRole": {
+            "enabled": false
+        },
+        "Ingtoninator": {
+            "enabled": false
+        },
+        "InstantScreenshare": {
+            "enabled": false
+        },
+        "InvisibleChat": {
+            "enabled": false
+        },
+        "InviteDefaults": {
+            "enabled": false
+        },
+        "JumpTo": {
+            "enabled": false
+        },
+        "KeyboardNavigation": {
+            "enabled": false
+        },
+        "KeyboardSounds": {
+            "enabled": false
+        },
+        "KeywordNotify": {
+            "enabled": false
+        },
+        "LastActive": {
+            "enabled": false
+        },
+        "LimitlessScreenshare": {
+            "enabled": false
+        },
+        "LoginWithQR": {
+            "enabled": false
+        },
+        "MarkdownTables": {
+            "enabled": false
+        },
+        "MediaPlaybackSpeed": {
+            "enabled": false
+        },
+        "MessageBurst": {
+            "enabled": false
+        },
+        "MessageColors": {
+            "enabled": false
+        },
+        "MessageFetchTimer": {
+            "enabled": false
+        },
+        "MessageLinkTooltip": {
+            "enabled": false
+        },
+        "MessageLoggerEnhanced": {
+            "enabled": false
+        },
+        "MessageNotifier": {
+            "enabled": false
+        },
+        "MessagePeek": {
+            "enabled": false
+        },
+        "MessageTranslate": {
+            "enabled": false
+        },
+        "MicLoopbackTester": {
+            "enabled": false
+        },
+        "MiddleClickTweaks": {
+            "enabled": false
+        },
+        "MoreCommands": {
+            "enabled": false
+        },
+        "MoreStickers": {
+            "enabled": false
+        },
+        "MoreUserTags": {
+            "enabled": false
+        },
+        "Moyai": {
+            "enabled": false
+        },
+        "MusicControls": {
+            "enabled": false
+        },
+        "NeverPausePreviews": {
+            "enabled": false
+        },
+        "NoNitroUpsell": {
+            "enabled": false
+        },
+        "NoPushToTalk": {
+            "enabled": false
+        },
+        "NoRoleHeaders": {
+            "enabled": false
+        },
+        "NormalizeMessageLinks": {
+            "enabled": false
+        },
+        "OrbolayBridge": {
+            "enabled": false
+        },
+        "PartyMode": {
+            "enabled": false
+        },
+        "CancelFriendRequest": {
+            "enabled": false
+        },
+        "PinIcon": {
+            "enabled": false
+        },
+        "PingNotifications": {
+            "enabled": false
+        },
+        "PlatformSpoofer": {
+            "enabled": false
+        },
+        "PolishWording": {
+            "enabled": false
+        },
+        "ProfileSets": {
+            "enabled": false
+        },
+        "Questify": {
+            "enabled": false,
+            "migrationVersion": 1
+        },
+        "Quoter": {
+            "enabled": false
+        },
+        "RandomVoice": {
+            "enabled": false
+        },
+        "RecentDMSwitcher": {
+            "enabled": false
+        },
+        "RemixRevived": {
+            "enabled": false
+        },
+        "RepeatMessages": {
+            "enabled": false
+        },
+        "ReplyPingControl": {
+            "enabled": false
+        },
+        "RichMagnetLinks": {
+            "enabled": false
+        },
+        "RichPresence": {
+            "enabled": false
+        },
+        "RPCEditor": {
+            "enabled": false
+        },
+        "SaveFavoriteGIFs": {
+            "enabled": false
+        },
+        "ScheduledMessages": {
+            "enabled": false
+        },
+        "ScreenRecorder": {
+            "enabled": false
+        },
+        "SearchFix": {
+            "enabled": false
+        },
+        "SedEnhanced": {
+            "enabled": false
+        },
+        "SekaiStickers": {
+            "enabled": false
+        },
+        "ServerSearch": {
+            "enabled": false
+        },
+        "ShowBadgesInChat": {
+            "enabled": false
+        },
+        "ShowMessageEmbeds": {
+            "enabled": false
+        },
+        "ShowResourceChannels": {
+            "enabled": false
+        },
+        "ShowSongName": {
+            "enabled": false
+        },
+        "Signature": {
+            "enabled": false
+        },
+        "SilenceUsers": {
+            "enabled": false
+        },
+        "Snowfall": {
+            "enabled": false
+        },
+        "Soggy": {
+            "enabled": false
+        },
+        "SongLink": {
+            "enabled": false
+        },
+        "SongSpotlight": {
+            "enabled": false
+        },
+        "SplitLargeMessages": {
+            "enabled": true
+        },
+        "SpotifyActivityToggle": {
+            "enabled": false
+        },
+        "StatusPresets": {
+            "enabled": false
+        },
+        "StatusWhileActive": {
+            "enabled": false
+        },
+        "SteamStatusSync": {
+            "enabled": false
+        },
+        "StickerBlocker": {
+            "enabled": false
+        },
+        "StopAutoUnread": {
+            "enabled": false
+        },
+        "Streaks": {
+            "enabled": false
+        },
+        "StreamingCodecDisabler": {
+            "enabled": false
+        },
+        "TalkInReverse": {
+            "enabled": false
+        },
+        "ThemeLibrary": {
+            "enabled": false
+        },
+        "TidalEmbeds": {
+            "enabled": false
+        },
+        "TiktokTTS": {
+            "enabled": false
+        },
+        "Timezones": {
+            "enabled": false
+        },
+        "Title": {
+            "enabled": false
+        },
+        "ToastNotifications": {
+            "enabled": false
+        },
+        "ToggleVideoBind": {
+            "enabled": false
+        },
+        "ToneIndicators": {
+            "enabled": false
+        },
+        "Translate+": {
+            "enabled": false
+        },
+        "TriviaAI": {
+            "enabled": false
+        },
+        "UnitConverter": {
+            "enabled": false
+        },
+        "UniversalMention": {
+            "enabled": false
+        },
+        "UnlimitedAccounts": {
+            "enabled": false
+        },
+        "UnreadCountBadge": {
+            "enabled": false
+        },
+        "UrlHighlighter": {
+            "enabled": false
+        },
+        "UserPFP": {
+            "enabled": false
+        },
+        "VcNarratorCustom": {
+            "enabled": false
+        },
+        "VCPanelSettings": {
+            "enabled": false
+        },
+        "VoiceButtons": {
+            "enabled": false
+        },
+        "VoiceChannelLog": {
+            "enabled": false
+        },
+        "VoiceChatUtilities": {
+            "enabled": false
+        },
+        "VoiceJoinMessages": {
+            "enabled": false
+        },
+        "VoiceMessageTranscriber": {
+            "enabled": false
+        },
+        "VoiceRejoin": {
+            "enabled": false
+        },
+        "VoiceStats": {
+            "enabled": false
+        },
+        "WaitForSlot": {
+            "enabled": false
+        },
+        "WebpackTarball": {
+            "enabled": false
+        },
+        "WhitelistedEmojis": {
+            "enabled": false
+        },
+        "WhosWatching": {
+            "enabled": false
+        },
+        "WigglyText": {
+            "enabled": false
+        },
+        "WriteUpperCase": {
+            "enabled": false
+        },
+        "ZipPreview": {
+            "enabled": false
+        },
+        "ConcatenatedComponentExtractor": {
+            "enabled": true
+        },
+        "DisableDeepLinks": {
+            "enabled": true
+        },
+        "SupportHelper": {
+            "enabled": true
+        },
+        "WebContextMenus": {
+            "enabled": true
+        },
+        "Jumpscare": {
+            "enabled": false
+        },
+        "MusicRichPresence": {
+            "enabled": false
+        },
+        "TenorGifSearch": {
+            "enabled": false
+        },
+        "AutoJumpToMessage": {
+            "enabled": false,
+            "onlyWhenUnfocused": true
+        },
+        "ShowRolesInChat": {
+            "enabled": false
+        },
+        "SidebarChat": {
+            "enabled": false
+        }
+    },
+    "useQuickCss": true,
+    "autoUpdateNotification": true,
+    "themeLinks": [],
+    "eagerPatches": false,
+    "enabledThemes": [],
+    "pinnedThemes": [],
+    "themeNames": {},
+    "themeActivationModes": {},
+    "enableReactDevtools": false,
+    "mainWindowFrameless": false,
+    "frameless": false,
+    "transparent": false,
+    "winCtrlQ": false,
+    "windowsMaterial": "none",
+    "disableMinSize": false,
+    "winNativeTitleBar": false,
+    "uiElements": {
+        "chatBarButtons": {},
+        "messagePopoverButtons": {}
+    },
+    "notifications": {
+        "timeout": 5000,
+        "position": "bottom-right",
+        "useNative": "not-focused",
+        "missed": true,
+        "logLimit": 50
+    },
+    "ignoreResetWarning": false,
+    "userCssVars": {}
+}
\ No newline at end of file
diff --git a/old-config/assets/dotfiles/equibop-config/quickCss.css b/old-config/assets/dotfiles/equibop-config/quickCss.css
new file mode 100644
index 0000000..744cb21
--- /dev/null
+++ b/old-config/assets/dotfiles/equibop-config/quickCss.css
@@ -0,0 +1,12 @@
+/* color options */
+:root {
+    --colors: on; /* off: discord default colors, on: midnight custom colors */
+
+    /* text colors */
+    --text-0: var(--bg-4); /* text on colored elements */
+    --text-1: hsl(220, 45%, 95%); /* other normally white text */
+    --text-2: hsl(220, 25%, 75%); /* headings and important text */
+    --text-3: hsl(220, 20%, 65%); /* normal text */
+    --text-4: hsl(220, 15%, 55%); /* icon buttons and channels */
+    --text-5: hsl(220, 15%, 45%); /* muted channels/chats and timestamps */
+};
diff --git a/old-config/assets/dotfiles/equibop-config/settings.json b/old-config/assets/dotfiles/equibop-config/settings.json
new file mode 100644
index 0000000..a16ce09
--- /dev/null
+++ b/old-config/assets/dotfiles/equibop-config/settings.json
@@ -0,0 +1,16 @@
+{
+    "appBadge": true,
+    "arRPC": true,
+    "autoStartMinimized": false,
+    "customTitleBar": true,
+    "discordBranch": "stable",
+    "enableMenu": false,
+    "enableSplashScreen": true,
+    "hardwareAcceleration": true,
+    "minimizeToTray": false,
+    "tray": false,
+    "splashColor": "rgb(148, 160, 184)",
+    "splashBackground": "rgb(22, 24, 29)",
+    "hardwareVideoAcceleration": true,
+    "clickTrayToShowHide": true
+}
\ No newline at end of file
diff --git a/old-config/assets/dotfiles/niri.kdl b/old-config/assets/dotfiles/niri.kdl
new file mode 100644
index 0000000..c77b89a
--- /dev/null
+++ b/old-config/assets/dotfiles/niri.kdl
@@ -0,0 +1,161 @@
+include "./noctalia.kdl"
+
+input {
+    keyboard {
+        xkb {
+            layout "gb"
+            model ""
+            rules ""
+            variant ""
+        }
+        repeat-delay 600
+        repeat-rate 25
+        track-layout "global"
+    }
+    touchpad {
+        tap
+        dwt
+        natural-scroll
+        accel-speed 0.8
+        accel-profile "flat"
+        click-method "clickfinger"
+    }
+    mouse {
+        accel-speed -1
+        accel-profile "flat"
+    }
+}
+screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+prefer-no-csd
+overview { zoom 0.666; }
+layout {
+    gaps 12
+    struts {
+        left 8
+        right 8
+        top -4
+        bottom 6
+    }
+    focus-ring {
+        width 1.25
+    }
+    border { off; }
+    shadow {
+        on
+        offset x=0 y=5
+        softness 15
+        spread 2
+        draw-behind-window false
+        color "#00000070"
+    }
+    center-focused-column "never"
+}
+cursor {
+    xcursor-theme "Bibata-Modern-Ice"
+    xcursor-size 22
+}
+hotkey-overlay { skip-at-startup; }
+binds {
+    Mod+B hotkey-overlay-title="Open web browser (Floorp)" { spawn "floorp"; }
+    Mod+C hotkey-overlay-title="Open calculator (Qalculate)" { spawn "qalculate-qt"; }
+    Mod+D hotkey-overlay-title="Application launcher" { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
+    Mod+E hotkey-overlay-title="Open file manager (Nautilus)" { spawn "nautilus" "-w"; }
+    Mod+Return hotkey-overlay-title="Open terminal (Kitty)" { spawn "kitty"; }
+    Mod+O hotkey-overlay-title="Open Obsidian" { spawn "obsidian"; }
+
+    Mod+Z hotkey-overlay-title="Apply NixOS config" { spawn "kitty" "zsh" "-i" "-c" "apply-config"; }
+
+    Mod+K { show-hotkey-overlay; }
+    
+    Mod+Space { toggle-overview; }
+    Mod+Q { close-window; }
+    Mod+F { maximize-window-to-edges; }
+    Mod+Shift+F { fullscreen-window; }
+    Mod+Shift+E { quit; }
+    
+    Mod+L hotkey-overlay-title="Lock session" { spawn "noctalia" "msg" "session" "lock"; }
+    Mod+Shift+D hotkey-overlay-title="Edit desktop widgets" { spawn "noctalia" "msg" "desktop-widgets-edit"; }
+    Mod+Shift+B hotkey-overlay-title="Open bar settings" { spawn "noctalia" "msg" "settings-open" "bar"; }
+    Mod+Shift+S hotkey-overlay-title="Open settings" { spawn "noctalia" "msg" "settings-open"; }
+    Mod+Period hotkey-overlay-title="Open control center" { spawn "noctalia" "msg" "panel-toggle" "control-center"; }
+    Mod+Shift+P hotkey-overlay-title="Open power menu" { spawn "noctalia" "msg" "panel-toggle" "session"; }
+    Mod+V hotkey-overlay-title="Show clipboard helper" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
+    Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; }
+    Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; }
+
+    Mod+TouchpadScrollUp cooldown-ms=250 { focus-workspace-up; }
+    Mod+TouchpadScrollDown cooldown-ms=250 { focus-workspace-down; }
+    Mod+TouchpadScrollLeft cooldown-ms=150 { focus-column-left; }
+    Mod+TouchpadScrollRight cooldown-ms=150 { focus-column-right; }
+
+    Mod+Up { focus-workspace-up; }
+    Mod+Down { focus-workspace-down; }
+    Mod+Left { focus-column-left; }
+    Mod+Right { focus-column-right; }
+
+    Mod+Shift+Up { move-window-to-workspace-up; }
+    Mod+Shift+Down { move-window-to-workspace-down; }
+    Mod+Shift+Left { move-column-left; }
+    Mod+Shift+Right { move-column-right; }
+
+    Mod+equal { set-column-width "+2%"; }
+    Mod+minus { set-column-width "-2%"; }
+
+    XF86AudioLowerVolume { spawn "noctalia" "msg" "volume-down" "5"; }
+    XF86AudioRaiseVolume { spawn "noctalia" "msg" "volume-up" "5"; }
+    XF86AudioMute { spawn "noctalia" "msg" "volume-mute"; }
+    XF86AudioMicMute { spawn "noctalia" "msg" "mic-mute"; }
+    XF86MonBrightnessDown { spawn "noctalia" "msg" "brightness-down" "5"; }
+    XF86MonBrightnessUp { spawn "noctalia" "msg" "brightness-up" "5"; }
+    XF86WLAN { spawn-sh "rfkill toggle 0 || rfkill toggle 1"; }
+    XF86NotificationCenter { spawn "noctalia" "msg" "panel-toggle" "control-center" "notifications"; }
+    XF86Display { toggle-overview; }
+    XF86Favorites { spawn-sh "niri msg action toggle-dwt && noctalia msg notification-show \"Touchpad DWT toggled\""; }
+    Print { screenshot; }
+    Shift+Print { screenshot-window; }
+}
+spawn-at-startup "noctalia"
+window-rule {
+    draw-border-with-background false
+    geometry-corner-radius 2
+    clip-to-geometry true
+}
+window-rule {
+    match app-id="^floorp$"
+    match app-id="^code$"
+    match app-id="^obsidian$"
+    match title="^takamaki$" app-id="^.*\\.Remmina$"
+    open-maximized-to-edges true
+}
+window-rule {
+    match app-id="^kitty$"
+    default-column-width { proportion 0.58; }
+}
+gestures { hot-corners { off; }; }
+switch-events {
+    lid-close { spawn "bash" "-c" "noctalia msg session lock && systemctl hibernate"; }
+}
+animations {
+    on
+    slowdown 1.0
+    workspace-switch {
+        spring damping-ratio=0.95 stiffness=600 epsilon=0.0001
+    }
+    window-open {
+        duration-ms 125
+        curve "ease-out-expo"
+    }
+    window-close {
+        duration-ms 125
+        curve "ease-out-quad"
+    }
+    horizontal-view-movement {
+        spring damping-ratio=0.95 stiffness=600 epsilon=0.0001
+    }
+    window-movement {
+        spring damping-ratio=0.9 stiffness=750 epsilon=0.0001
+    }
+    window-resize {
+        spring damping-ratio=0.8 stiffness=650 epsilon=0.0001
+    }
+}
\ No newline at end of file
diff --git a/assets/dotfiles/noctalia-state/settings.toml b/old-config/assets/dotfiles/noctalia-state/settings.toml
similarity index 100%
rename from assets/dotfiles/noctalia-state/settings.toml
rename to old-config/assets/dotfiles/noctalia-state/settings.toml
diff --git a/assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina b/old-config/assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina
similarity index 100%
rename from assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina
rename to old-config/assets/dotfiles/remmina-presets/group_rdp_takamaki_greyweather-dev.remmina
diff --git a/assets/dotfiles/takamaki/OxygenDarkEdit.colors b/old-config/assets/dotfiles/takamaki/OxygenDarkEdit.colors
similarity index 100%
rename from assets/dotfiles/takamaki/OxygenDarkEdit.colors
rename to old-config/assets/dotfiles/takamaki/OxygenDarkEdit.colors
diff --git a/assets/dotfiles/takamaki/autostart-config/com.valvesoftware.Steam.desktop b/old-config/assets/dotfiles/takamaki/autostart-config/com.valvesoftware.Steam.desktop
similarity index 100%
rename from assets/dotfiles/takamaki/autostart-config/com.valvesoftware.Steam.desktop
rename to old-config/assets/dotfiles/takamaki/autostart-config/com.valvesoftware.Steam.desktop
diff --git a/assets/dotfiles/takamaki/autostart-config/equibop.desktop b/old-config/assets/dotfiles/takamaki/autostart-config/equibop.desktop
similarity index 100%
rename from assets/dotfiles/takamaki/autostart-config/equibop.desktop
rename to old-config/assets/dotfiles/takamaki/autostart-config/equibop.desktop
diff --git a/assets/dotfiles/takamaki/easyeffects-config/deepfilternetrc b/old-config/assets/dotfiles/takamaki/easyeffects-config/deepfilternetrc
similarity index 100%
rename from assets/dotfiles/takamaki/easyeffects-config/deepfilternetrc
rename to old-config/assets/dotfiles/takamaki/easyeffects-config/deepfilternetrc
diff --git a/assets/dotfiles/takamaki/easyeffects-config/deesserrc b/old-config/assets/dotfiles/takamaki/easyeffects-config/deesserrc
similarity index 100%
rename from assets/dotfiles/takamaki/easyeffects-config/deesserrc
rename to old-config/assets/dotfiles/takamaki/easyeffects-config/deesserrc
diff --git a/assets/dotfiles/takamaki/easyeffects-config/easyeffectsrc b/old-config/assets/dotfiles/takamaki/easyeffects-config/easyeffectsrc
similarity index 100%
rename from assets/dotfiles/takamaki/easyeffects-config/easyeffectsrc
rename to old-config/assets/dotfiles/takamaki/easyeffects-config/easyeffectsrc
diff --git a/assets/dotfiles/takamaki/easyeffects-config/equalizerrc b/old-config/assets/dotfiles/takamaki/easyeffects-config/equalizerrc
similarity index 100%
rename from assets/dotfiles/takamaki/easyeffects-config/equalizerrc
rename to old-config/assets/dotfiles/takamaki/easyeffects-config/equalizerrc
diff --git a/assets/dotfiles/takamaki/easyeffects-config/gaterc b/old-config/assets/dotfiles/takamaki/easyeffects-config/gaterc
similarity index 100%
rename from assets/dotfiles/takamaki/easyeffects-config/gaterc
rename to old-config/assets/dotfiles/takamaki/easyeffects-config/gaterc
diff --git a/assets/dotfiles/takamaki/easyeffects-config/limiterrc b/old-config/assets/dotfiles/takamaki/easyeffects-config/limiterrc
similarity index 100%
rename from assets/dotfiles/takamaki/easyeffects-config/limiterrc
rename to old-config/assets/dotfiles/takamaki/easyeffects-config/limiterrc
diff --git a/assets/dotfiles/takamaki/kde-config/dolphinrc b/old-config/assets/dotfiles/takamaki/kde-config/dolphinrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/dolphinrc
rename to old-config/assets/dotfiles/takamaki/kde-config/dolphinrc
diff --git a/assets/dotfiles/takamaki/kde-config/katerc b/old-config/assets/dotfiles/takamaki/kde-config/katerc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/katerc
rename to old-config/assets/dotfiles/takamaki/kde-config/katerc
diff --git a/assets/dotfiles/takamaki/kde-config/kdeglobals b/old-config/assets/dotfiles/takamaki/kde-config/kdeglobals
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/kdeglobals
rename to old-config/assets/dotfiles/takamaki/kde-config/kdeglobals
diff --git a/assets/dotfiles/takamaki/kde-config/kglobalshortcutsrc b/old-config/assets/dotfiles/takamaki/kde-config/kglobalshortcutsrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/kglobalshortcutsrc
rename to old-config/assets/dotfiles/takamaki/kde-config/kglobalshortcutsrc
diff --git a/assets/dotfiles/takamaki/kde-config/krdpserverrc b/old-config/assets/dotfiles/takamaki/kde-config/krdpserverrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/krdpserverrc
rename to old-config/assets/dotfiles/takamaki/kde-config/krdpserverrc
diff --git a/assets/dotfiles/takamaki/kde-config/kwinrc b/old-config/assets/dotfiles/takamaki/kde-config/kwinrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/kwinrc
rename to old-config/assets/dotfiles/takamaki/kde-config/kwinrc
diff --git a/assets/dotfiles/takamaki/kde-config/kwinrulesrc b/old-config/assets/dotfiles/takamaki/kde-config/kwinrulesrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/kwinrulesrc
rename to old-config/assets/dotfiles/takamaki/kde-config/kwinrulesrc
diff --git a/assets/dotfiles/takamaki/kde-config/oxygenrc b/old-config/assets/dotfiles/takamaki/kde-config/oxygenrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/oxygenrc
rename to old-config/assets/dotfiles/takamaki/kde-config/oxygenrc
diff --git a/assets/dotfiles/takamaki/kde-config/plasma-org.kde.plasma.desktop-appletsrc b/old-config/assets/dotfiles/takamaki/kde-config/plasma-org.kde.plasma.desktop-appletsrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/plasma-org.kde.plasma.desktop-appletsrc
rename to old-config/assets/dotfiles/takamaki/kde-config/plasma-org.kde.plasma.desktop-appletsrc
diff --git a/assets/dotfiles/takamaki/kde-config/plasmarc b/old-config/assets/dotfiles/takamaki/kde-config/plasmarc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/plasmarc
rename to old-config/assets/dotfiles/takamaki/kde-config/plasmarc
diff --git a/assets/dotfiles/takamaki/kde-config/plasmashellrc b/old-config/assets/dotfiles/takamaki/kde-config/plasmashellrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/plasmashellrc
rename to old-config/assets/dotfiles/takamaki/kde-config/plasmashellrc
diff --git a/assets/dotfiles/takamaki/kde-config/powerdevilrc b/old-config/assets/dotfiles/takamaki/kde-config/powerdevilrc
similarity index 100%
rename from assets/dotfiles/takamaki/kde-config/powerdevilrc
rename to old-config/assets/dotfiles/takamaki/kde-config/powerdevilrc
diff --git a/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.easyeffects-toggle.sh.desktop b/old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.easyeffects-toggle.sh.desktop
similarity index 100%
rename from assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.easyeffects-toggle.sh.desktop
rename to old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.easyeffects-toggle.sh.desktop
diff --git a/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop-2.desktop b/old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop-2.desktop
similarity index 100%
rename from assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop-2.desktop
rename to old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop-2.desktop
diff --git a/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop.desktop b/old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop.desktop
similarity index 100%
rename from assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop.desktop
rename to old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.equibop.desktop
diff --git a/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.kitty.desktop b/old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.kitty.desktop
similarity index 100%
rename from assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.kitty.desktop
rename to old-config/assets/dotfiles/takamaki/kde-custom-shortcuts/net.local.kitty.desktop
diff --git a/old-config/assets/dotfiles/vscode-config/keybindings.json b/old-config/assets/dotfiles/vscode-config/keybindings.json
new file mode 100644
index 0000000..7184bc4
--- /dev/null
+++ b/old-config/assets/dotfiles/vscode-config/keybindings.json
@@ -0,0 +1,10 @@
+[
+  {
+    "command": "workbench.action.closeActiveEditor",
+    "key": "alt+q"
+  },
+  {
+    "command": "workbench.action.files.newFile",
+    "key": "alt+enter"
+  }
+]
diff --git a/old-config/assets/dotfiles/vscode-config/settings.json b/old-config/assets/dotfiles/vscode-config/settings.json
new file mode 100644
index 0000000..2229d6b
--- /dev/null
+++ b/old-config/assets/dotfiles/vscode-config/settings.json
@@ -0,0 +1,59 @@
+{
+  "[nix]": {
+    "editor.tabSize": 2
+  },
+  "chat.disableAIFeatures": true,
+  "patternStore.savedPatterns": [
+    {
+      "label": "convert JSON pairs to Nix format",
+      "find": "\"(\\w+)\": (.+?),?$",
+      "replace": "$1 = $2;",
+      "flags": {
+        "isRegex": true,
+        "isCaseSensitive": false,
+        "matchWholeWord": false,
+        "isMultiline": false
+      },
+      "filesToInclude": "*.nix",
+      "filesToExclude": "*.json",
+      "scope": "global"
+    },
+    {
+      "label": "convert JSON opening bracket to Nix format",
+      "find": "(\"\\w+\"): \\{$",
+      "replace": "$1 = {",
+      "flags": {
+        "isRegex": true,
+        "isCaseSensitive": false,
+        "matchWholeWord": false,
+        "isMultiline": false
+      },
+      "filesToInclude": "*.nix",
+      "filesToExclude": "*.json",
+      "scope": "global"
+    },
+    {
+      "label": "convert JSON closing bracket to Nix format",
+      "find": "\\},?$",
+      "replace": "};",
+      "flags": {
+        "isRegex": true,
+        "isCaseSensitive": false,
+        "matchWholeWord": false,
+        "isMultiline": false
+      },
+      "filesToInclude": "*.nix",
+      "filesToExclude": "*.json",
+      "scope": "global"
+    }
+  ],
+  "search.exclude": {
+    "**/assets/**": true,
+    "**/flake.lock": true
+  },
+  "update.mode": "none",
+  "workbench.welcomePage.walkthroughs.openOnInstall": false,
+  "explorer.confirmDelete": false,
+  "update.showReleaseNotes": false,
+  "explorer.confirmDragAndDrop": false
+}
diff --git a/assets/dotfiles/zen-config/.gitignore b/old-config/assets/dotfiles/zen-config/.gitignore
similarity index 100%
rename from assets/dotfiles/zen-config/.gitignore
rename to old-config/assets/dotfiles/zen-config/.gitignore
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-26_31_K2fmEM8Do61MohmG7jNSEWaHVf9KSSD7_bsvwyAkKXM=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-26_31_K2fmEM8Do61MohmG7jNSEWaHVf9KSSD7_bsvwyAkKXM=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-26_31_K2fmEM8Do61MohmG7jNSEWaHVf9KSSD7_bsvwyAkKXM=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-26_31_K2fmEM8Do61MohmG7jNSEWaHVf9KSSD7_bsvwyAkKXM=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-29_31_kWYSnvwMqG5Lb-Ajw3W7V40yCyQF6CdkDJ4GXxcMbg8=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-29_31_kWYSnvwMqG5Lb-Ajw3W7V40yCyQF6CdkDJ4GXxcMbg8=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-29_31_kWYSnvwMqG5Lb-Ajw3W7V40yCyQF6CdkDJ4GXxcMbg8=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-04-29_31_kWYSnvwMqG5Lb-Ajw3W7V40yCyQF6CdkDJ4GXxcMbg8=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-06_33_AYrQi7W4KFU7CYLpim91jLbiG8kz4TZETbIVMs9Lr4w=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-06_33_AYrQi7W4KFU7CYLpim91jLbiG8kz4TZETbIVMs9Lr4w=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-06_33_AYrQi7W4KFU7CYLpim91jLbiG8kz4TZETbIVMs9Lr4w=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-06_33_AYrQi7W4KFU7CYLpim91jLbiG8kz4TZETbIVMs9Lr4w=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-08_33_FWRNz846YYPLPYv69GxppvkqypjLzOjK5g_sa-zHeAE=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-08_33_FWRNz846YYPLPYv69GxppvkqypjLzOjK5g_sa-zHeAE=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-08_33_FWRNz846YYPLPYv69GxppvkqypjLzOjK5g_sa-zHeAE=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-08_33_FWRNz846YYPLPYv69GxppvkqypjLzOjK5g_sa-zHeAE=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-16_33_0DXmGTnOdfco_1EcB0Kr_g5wWOIf9KRK5Zlrw8YGww8=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-16_33_0DXmGTnOdfco_1EcB0Kr_g5wWOIf9KRK5Zlrw8YGww8=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-16_33_0DXmGTnOdfco_1EcB0Kr_g5wWOIf9KRK5Zlrw8YGww8=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-16_33_0DXmGTnOdfco_1EcB0Kr_g5wWOIf9KRK5Zlrw8YGww8=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-20_33_jFjpaNVgz_7Reb1GN5aQrRzjIEDBqXdxdDvgqNNj7vc=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-20_33_jFjpaNVgz_7Reb1GN5aQrRzjIEDBqXdxdDvgqNNj7vc=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-20_33_jFjpaNVgz_7Reb1GN5aQrRzjIEDBqXdxdDvgqNNj7vc=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-20_33_jFjpaNVgz_7Reb1GN5aQrRzjIEDBqXdxdDvgqNNj7vc=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-21_34_24z3uyV1iF6g0CsMVyaV_X5yekK8njOxGvgKkcFwqLw=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-21_34_24z3uyV1iF6g0CsMVyaV_X5yekK8njOxGvgKkcFwqLw=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-21_34_24z3uyV1iF6g0CsMVyaV_X5yekK8njOxGvgKkcFwqLw=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-21_34_24z3uyV1iF6g0CsMVyaV_X5yekK8njOxGvgKkcFwqLw=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-25_33_sv0b8E2xSbxp86LMH6qU8qvjW6A9xxZEeRkCBfZM2Kc=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-25_33_sv0b8E2xSbxp86LMH6qU8qvjW6A9xxZEeRkCBfZM2Kc=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-25_33_sv0b8E2xSbxp86LMH6qU8qvjW6A9xxZEeRkCBfZM2Kc=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-05-25_33_sv0b8E2xSbxp86LMH6qU8qvjW6A9xxZEeRkCBfZM2Kc=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-03_33_O82JPsNibwAxTH-hwXsClVJ4asaAo0XQHEhQUc16gwU=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-03_33_O82JPsNibwAxTH-hwXsClVJ4asaAo0XQHEhQUc16gwU=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-03_33_O82JPsNibwAxTH-hwXsClVJ4asaAo0XQHEhQUc16gwU=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-03_33_O82JPsNibwAxTH-hwXsClVJ4asaAo0XQHEhQUc16gwU=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-09_34_7exk61xvJEBFJ_CJvmnp0ioCoaJ5PcYzwueQOjKwZ4Q=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-09_34_7exk61xvJEBFJ_CJvmnp0ioCoaJ5PcYzwueQOjKwZ4Q=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-09_34_7exk61xvJEBFJ_CJvmnp0ioCoaJ5PcYzwueQOjKwZ4Q=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-09_34_7exk61xvJEBFJ_CJvmnp0ioCoaJ5PcYzwueQOjKwZ4Q=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-16_34_tEfDxknt3snCZccXfEDYcUT0mq2Ts7YUcQ6xL00JHZY=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-16_34_tEfDxknt3snCZccXfEDYcUT0mq2Ts7YUcQ6xL00JHZY=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-16_34_tEfDxknt3snCZccXfEDYcUT0mq2Ts7YUcQ6xL00JHZY=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-06-16_34_tEfDxknt3snCZccXfEDYcUT0mq2Ts7YUcQ6xL00JHZY=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-02_34_OOwZlDRkdYs-YqaL8Z-LSPv4KuU_Z_XKHWWPYIwh3PA=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-02_34_OOwZlDRkdYs-YqaL8Z-LSPv4KuU_Z_XKHWWPYIwh3PA=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-02_34_OOwZlDRkdYs-YqaL8Z-LSPv4KuU_Z_XKHWWPYIwh3PA=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-02_34_OOwZlDRkdYs-YqaL8Z-LSPv4KuU_Z_XKHWWPYIwh3PA=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-07_25_TF42OKPANCSABzGvz-ze7Aql-p1Te5N-T17HpsRtSg4=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-07_25_TF42OKPANCSABzGvz-ze7Aql-p1Te5N-T17HpsRtSg4=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-07_25_TF42OKPANCSABzGvz-ze7Aql-p1Te5N-T17HpsRtSg4=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-07_25_TF42OKPANCSABzGvz-ze7Aql-p1Te5N-T17HpsRtSg4=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-16_24_V8WUHjlkfJ0ZetcbVw32RDMwZs6CYQAIxYxdW-ATqSY=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-16_24_V8WUHjlkfJ0ZetcbVw32RDMwZs6CYQAIxYxdW-ATqSY=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-16_24_V8WUHjlkfJ0ZetcbVw32RDMwZs6CYQAIxYxdW-ATqSY=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-07-16_24_V8WUHjlkfJ0ZetcbVw32RDMwZs6CYQAIxYxdW-ATqSY=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-08-05_24_vOxGDGYxhUa3SNcO-EoGzr0lY7J-L4ApPpMx9EO7kgk=.jsonlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-08-05_24_vOxGDGYxhUa3SNcO-EoGzr0lY7J-L4ApPpMx9EO7kgk=.jsonlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-08-05_24_vOxGDGYxhUa3SNcO-EoGzr0lY7J-L4ApPpMx9EO7kgk=.jsonlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/bookmarkbackups/bookmarks-2026-08-05_24_vOxGDGYxhUa3SNcO-EoGzr0lY7J-L4ApPpMx9EO7kgk=.jsonlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/containers.json b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/containers.json
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/containers.json
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/containers.json
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/content-prefs.sqlite b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/content-prefs.sqlite
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/content-prefs.sqlite
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/content-prefs.sqlite
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-preferences.json b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-preferences.json
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-preferences.json
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-preferences.json
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-settings.json b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-settings.json
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-settings.json
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extension-settings.json
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions.json b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions.json
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions.json
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions.json
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/adnauseam@rednoise.org.xpi b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/adnauseam@rednoise.org.xpi
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/adnauseam@rednoise.org.xpi
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/adnauseam@rednoise.org.xpi
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/firefoxpwa@filips.si.xpi b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/firefoxpwa@filips.si.xpi
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/firefoxpwa@filips.si.xpi
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/firefoxpwa@filips.si.xpi
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/uBlock0@raymondhill.net.xpi b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/uBlock0@raymondhill.net.xpi
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/uBlock0@raymondhill.net.xpi
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/uBlock0@raymondhill.net.xpi
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{446900e4-71c2-419f-a6a7-df9c091e268b}.xpi b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{446900e4-71c2-419f-a6a7-df9c091e268b}.xpi
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{446900e4-71c2-419f-a6a7-df9c091e268b}.xpi
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{446900e4-71c2-419f-a6a7-df9c091e268b}.xpi
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{cb31ec5d-c49a-4e5a-b240-16c767444f62}.xpi b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{cb31ec5d-c49a-4e5a-b240-16c767444f62}.xpi
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{cb31ec5d-c49a-4e5a-b240-16c767444f62}.xpi
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/extensions/{cb31ec5d-c49a-4e5a-b240-16c767444f62}.xpi
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/favicons.sqlite b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/favicons.sqlite
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/favicons.sqlite
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/favicons.sqlite
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/permissions.sqlite b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/permissions.sqlite
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/permissions.sqlite
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/permissions.sqlite
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/places.sqlite b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/places.sqlite
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/places.sqlite
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/places.sqlite
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/prefs.js b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/prefs.js
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/prefs.js
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/prefs.js
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/search.json.mozlz4 b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/search.json.mozlz4
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/search.json.mozlz4
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/search.json.mozlz4
diff --git a/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/zen-keyboard-shortcuts.json b/old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/zen-keyboard-shortcuts.json
similarity index 100%
rename from assets/dotfiles/zen-config/8o3fztws.Default (release)-3/zen-keyboard-shortcuts.json
rename to old-config/assets/dotfiles/zen-config/8o3fztws.Default (release)-3/zen-keyboard-shortcuts.json
diff --git a/assets/dotfiles/zen-config/installs.ini b/old-config/assets/dotfiles/zen-config/installs.ini
similarity index 100%
rename from assets/dotfiles/zen-config/installs.ini
rename to old-config/assets/dotfiles/zen-config/installs.ini
diff --git a/assets/dotfiles/zen-config/profiles.ini b/old-config/assets/dotfiles/zen-config/profiles.ini
similarity index 100%
rename from assets/dotfiles/zen-config/profiles.ini
rename to old-config/assets/dotfiles/zen-config/profiles.ini
diff --git a/assets/geo-whitelist.ipset b/old-config/assets/geo-whitelist.ipset
similarity index 100%
rename from assets/geo-whitelist.ipset
rename to old-config/assets/geo-whitelist.ipset
diff --git a/assets/jiji.jpg b/old-config/assets/jiji.jpg
similarity index 100%
rename from assets/jiji.jpg
rename to old-config/assets/jiji.jpg
diff --git a/old-config/assets/wallpapers/kitagawa.jpg b/old-config/assets/wallpapers/kitagawa.jpg
new file mode 100644
index 0000000..7599dfb
Binary files /dev/null and b/old-config/assets/wallpapers/kitagawa.jpg differ
diff --git a/global-configs/equibop.nix b/old-config/global-configs/equibop.nix
similarity index 100%
rename from global-configs/equibop.nix
rename to old-config/global-configs/equibop.nix
diff --git a/global-configs/floorp.nix b/old-config/global-configs/floorp.nix
similarity index 100%
rename from global-configs/floorp.nix
rename to old-config/global-configs/floorp.nix
diff --git a/global-configs/gnome.nix b/old-config/global-configs/gnome.nix
similarity index 100%
rename from global-configs/gnome.nix
rename to old-config/global-configs/gnome.nix
diff --git a/global-configs/kitty.nix b/old-config/global-configs/kitty.nix
similarity index 100%
rename from global-configs/kitty.nix
rename to old-config/global-configs/kitty.nix
diff --git a/global-configs/niri.nix b/old-config/global-configs/niri.nix
similarity index 100%
rename from global-configs/niri.nix
rename to old-config/global-configs/niri.nix
diff --git a/global-configs/plasma.nix b/old-config/global-configs/plasma.nix
similarity index 100%
rename from global-configs/plasma.nix
rename to old-config/global-configs/plasma.nix
diff --git a/global-configs/spicetify.nix b/old-config/global-configs/spicetify.nix
similarity index 100%
rename from global-configs/spicetify.nix
rename to old-config/global-configs/spicetify.nix
diff --git a/global-configs/vscode.nix b/old-config/global-configs/vscode.nix
similarity index 100%
rename from global-configs/vscode.nix
rename to old-config/global-configs/vscode.nix
diff --git a/global-configs/zen-browser.nix b/old-config/global-configs/zen-browser.nix
similarity index 100%
rename from global-configs/zen-browser.nix
rename to old-config/global-configs/zen-browser.nix
diff --git a/global-configs/zsh.nix b/old-config/global-configs/zsh.nix
similarity index 100%
rename from global-configs/zsh.nix
rename to old-config/global-configs/zsh.nix
index 81b3ccb..569e0f2 100644
--- a/global-configs/zsh.nix
+++ b/old-config/global-configs/zsh.nix
@@ -7,8 +7,8 @@
   programs.kitty.shellIntegration.enableZshIntegration = true;
 
   programs.zsh = {
-    completionInit = "";
     enable = true;
+    completionInit = "";
     antidote = {
       enable = true;
       plugins = [
diff --git a/global-default.nix b/old-config/global-default.nix
similarity index 100%
rename from global-default.nix
rename to old-config/global-default.nix
diff --git a/global-home.nix b/old-config/global-home.nix
similarity index 100%
rename from global-home.nix
rename to old-config/global-home.nix
diff --git a/hosts/kitagawa/configs/fastfetch.nix b/old-config/hosts/kitagawa/configs/fastfetch.nix
similarity index 100%
rename from hosts/kitagawa/configs/fastfetch.nix
rename to old-config/hosts/kitagawa/configs/fastfetch.nix
diff --git a/hosts/kitagawa/configs/fetch.nix b/old-config/hosts/kitagawa/configs/fetch.nix
similarity index 100%
rename from hosts/kitagawa/configs/fetch.nix
rename to old-config/hosts/kitagawa/configs/fetch.nix
diff --git a/hosts/kitagawa/configs/flatpak.nix b/old-config/hosts/kitagawa/configs/flatpak.nix
similarity index 100%
rename from hosts/kitagawa/configs/flatpak.nix
rename to old-config/hosts/kitagawa/configs/flatpak.nix
diff --git a/hosts/kitagawa/configs/kitty.nix b/old-config/hosts/kitagawa/configs/kitty.nix
similarity index 100%
rename from hosts/kitagawa/configs/kitty.nix
rename to old-config/hosts/kitagawa/configs/kitty.nix
diff --git a/hosts/kitagawa/configs/zsh.nix b/old-config/hosts/kitagawa/configs/zsh.nix
similarity index 100%
rename from hosts/kitagawa/configs/zsh.nix
rename to old-config/hosts/kitagawa/configs/zsh.nix
diff --git a/hosts/kitagawa/default.nix b/old-config/hosts/kitagawa/default.nix
similarity index 100%
rename from hosts/kitagawa/default.nix
rename to old-config/hosts/kitagawa/default.nix
diff --git a/hosts/kitagawa/hardware-configuration.nix b/old-config/hosts/kitagawa/hardware-configuration.nix
similarity index 100%
rename from hosts/kitagawa/hardware-configuration.nix
rename to old-config/hosts/kitagawa/hardware-configuration.nix
diff --git a/hosts/kitagawa/home.nix b/old-config/hosts/kitagawa/home.nix
similarity index 100%
rename from hosts/kitagawa/home.nix
rename to old-config/hosts/kitagawa/home.nix
diff --git a/hosts/kitagawa/modules/hardware-fixes.nix b/old-config/hosts/kitagawa/modules/hardware-fixes.nix
similarity index 100%
rename from hosts/kitagawa/modules/hardware-fixes.nix
rename to old-config/hosts/kitagawa/modules/hardware-fixes.nix
diff --git a/hosts/kitagawa/modules/plymouth.nix b/old-config/hosts/kitagawa/modules/plymouth.nix
similarity index 100%
rename from hosts/kitagawa/modules/plymouth.nix
rename to old-config/hosts/kitagawa/modules/plymouth.nix
diff --git a/hosts/takamaki/configs/easyeffects.nix b/old-config/hosts/takamaki/configs/easyeffects.nix
similarity index 100%
rename from hosts/takamaki/configs/easyeffects.nix
rename to old-config/hosts/takamaki/configs/easyeffects.nix
diff --git a/hosts/takamaki/configs/fastfetch.nix b/old-config/hosts/takamaki/configs/fastfetch.nix
similarity index 100%
rename from hosts/takamaki/configs/fastfetch.nix
rename to old-config/hosts/takamaki/configs/fastfetch.nix
diff --git a/hosts/takamaki/configs/flatpak.nix b/old-config/hosts/takamaki/configs/flatpak.nix
similarity index 100%
rename from hosts/takamaki/configs/flatpak.nix
rename to old-config/hosts/takamaki/configs/flatpak.nix
diff --git a/hosts/takamaki/configs/kitty.nix b/old-config/hosts/takamaki/configs/kitty.nix
similarity index 100%
rename from hosts/takamaki/configs/kitty.nix
rename to old-config/hosts/takamaki/configs/kitty.nix
diff --git a/hosts/takamaki/default.nix b/old-config/hosts/takamaki/default.nix
similarity index 100%
rename from hosts/takamaki/default.nix
rename to old-config/hosts/takamaki/default.nix
diff --git a/hosts/takamaki/hardware-configuration.nix b/old-config/hosts/takamaki/hardware-configuration.nix
similarity index 100%
rename from hosts/takamaki/hardware-configuration.nix
rename to old-config/hosts/takamaki/hardware-configuration.nix
diff --git a/hosts/takamaki/home.nix b/old-config/hosts/takamaki/home.nix
similarity index 100%
rename from hosts/takamaki/home.nix
rename to old-config/hosts/takamaki/home.nix
diff --git a/hosts/takamaki/modules/openssh.nix b/old-config/hosts/takamaki/modules/openssh.nix
similarity index 100%
rename from hosts/takamaki/modules/openssh.nix
rename to old-config/hosts/takamaki/modules/openssh.nix
diff --git a/hosts/takamaki/modules/remote-builder.nix b/old-config/hosts/takamaki/modules/remote-builder.nix
similarity index 100%
rename from hosts/takamaki/modules/remote-builder.nix
rename to old-config/hosts/takamaki/modules/remote-builder.nix
diff --git a/hosts/takamaki/modules/sudo.nix b/old-config/hosts/takamaki/modules/sudo.nix
similarity index 100%
rename from hosts/takamaki/modules/sudo.nix
rename to old-config/hosts/takamaki/modules/sudo.nix
diff --git a/hosts/takamaki/modules/virt-manager.nix b/old-config/hosts/takamaki/modules/virt-manager.nix
similarity index 100%
rename from hosts/takamaki/modules/virt-manager.nix
rename to old-config/hosts/takamaki/modules/virt-manager.nix
diff --git a/modules/desktop-environments/gnome.nix b/old-config/modules/desktop-environments/gnome.nix
similarity index 100%
rename from modules/desktop-environments/gnome.nix
rename to old-config/modules/desktop-environments/gnome.nix
diff --git a/modules/desktop-environments/plasma6.nix b/old-config/modules/desktop-environments/plasma6.nix
similarity index 100%
rename from modules/desktop-environments/plasma6.nix
rename to old-config/modules/desktop-environments/plasma6.nix
diff --git a/modules/display-managers/gdm.nix b/old-config/modules/display-managers/gdm.nix
similarity index 100%
rename from modules/display-managers/gdm.nix
rename to old-config/modules/display-managers/gdm.nix
diff --git a/modules/display-managers/lightdm.nix b/old-config/modules/display-managers/lightdm.nix
similarity index 100%
rename from modules/display-managers/lightdm.nix
rename to old-config/modules/display-managers/lightdm.nix
diff --git a/modules/display-managers/ly.nix b/old-config/modules/display-managers/ly.nix
similarity index 100%
rename from modules/display-managers/ly.nix
rename to old-config/modules/display-managers/ly.nix
diff --git a/modules/display-managers/sddm.nix b/old-config/modules/display-managers/sddm.nix
similarity index 100%
rename from modules/display-managers/sddm.nix
rename to old-config/modules/display-managers/sddm.nix
diff --git a/modules/home-manager.nix b/old-config/modules/home-manager.nix
similarity index 100%
rename from modules/home-manager.nix
rename to old-config/modules/home-manager.nix
diff --git a/modules/nautilus.nix b/old-config/modules/nautilus.nix
similarity index 100%
rename from modules/nautilus.nix
rename to old-config/modules/nautilus.nix
diff --git a/modules/nh.nix b/old-config/modules/nh.nix
similarity index 100%
rename from modules/nh.nix
rename to old-config/modules/nh.nix
diff --git a/modules/window-managers/niri.nix b/old-config/modules/window-managers/niri.nix
similarity index 100%
rename from modules/window-managers/niri.nix
rename to old-config/modules/window-managers/niri.nix
diff --git a/modules/zsh.nix b/old-config/modules/zsh.nix
similarity index 100%
rename from modules/zsh.nix
rename to old-config/modules/zsh.nix
diff --git a/packages/fluxer-canary.nix b/old-config/packages/fluxer-canary.nix
similarity index 100%
rename from packages/fluxer-canary.nix
rename to old-config/packages/fluxer-canary.nix
diff --git a/packages/fluxer.nix b/old-config/packages/fluxer.nix
similarity index 100%
rename from packages/fluxer.nix
rename to old-config/packages/fluxer.nix