diff --git a/flake.nix b/flake.nix
index afe72045..7aa18512 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,86 +18,89 @@
     };
   };
 
-  outputs = inputs: let
-    waybar-experimental-overlay = final: prev: {
-      waybar = prev.waybar.overrideAttrs (oldAttrs: {
-        mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
-      });
-    };
-    system = "x86_64-linux";
-    specialArgs = {inputs = inputs;};
-    pkgs = import inputs.nixpkgs {
-      system = system;
-      config.allowUnfree = true;
-      overlays = [
-        waybar-experimental-overlay
-        inputs.neovim-nightly-overlay.overlay
-      ];
-    };
-  in {
-    nixosConfigurations = {
-      Legion = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = specialArgs;
-        pkgs = pkgs;
-        modules = [./hosts/Legion];
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    ...
+  } @ inputs: {
+    nixosConfigurations = let
+      topLevel = ./.;
+      userConfig = {
+        isNormalUser = true;
+        description = "Evie Litherland-Smith";
+        extraGroups = ["networkmanager" "wheel"];
+        shell = pkgs.fish;
+        openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix;
       };
-      Vanguard = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = specialArgs;
-        pkgs = pkgs;
-        modules = [./hosts/Vanguard];
+      specialArgs = {inherit inputs topLevel userConfig;};
+      waybar-experimental-overlay = final: prev: {
+        waybar = prev.waybar.overrideAttrs (oldAttrs: {
+          mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
+        });
       };
-      Ronin = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = specialArgs;
-        pkgs = pkgs;
-        modules = [./hosts/Ronin];
-      };
-    };
-    homeConfigurations = {
-      "tux@Monarch" = inputs.home-manager.lib.homeManagerConfiguration {
-        pkgs = inputs.nixpkgs.legacyPackages."aarch64-darwin";
-        modules = [
-          ({pkgs, ...}: {
-            imports = [./home/personal.nix ./home/gui/wezterm];
-            home = {
-              username = "tux";
-              homeDirectory = "/Users/tux";
-              stateVersion = "23.05";
-              packages = [pkgs.gcc];
-            };
-            programs = {
-              home-manager.enable = true;
-              zsh = {
-                sessionVariables.CC = "${pkgs.gcc}/bin/gcc";
-                envExtra = ''
-                  eval "$(/opt/homebrew/bin/brew shellenv)"
-                '';
-              };
-            };
-            services.syncthing.enable = true;
-          })
-        ];
-      };
-      "xenia@Northstar" = inputs.home-manager.lib.homeManagerConfiguration {
-        pkgs = inputs.nixpkgs.legacyPackages."aarch64-linux";
-        modules = [
-          {
-            imports = [./home/personal.nix];
-            home = {
-              username = "xenia";
-              homeDirectory = "/home/xenia";
-              stateVersion = "22.11";
-            };
-            programs = {
-              home-manager.enable = true;
-              bash.bashrcExtra = ''
-                source $HOME/.nix-profile/etc/profile.d/nix.sh
-              '';
-            };
-            services.syncthing.enable = true;
-            fonts.fontconfig.enable = true;
-          }
+      system = "x86_64-linux";
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+        overlays = [
+          waybar-experimental-overlay
+          inputs.neovim-nightly-overlay.overlay
         ];
       };
+    in {
+      Legion = let
+        hostname = "Legion";
+      in
+        nixpkgs.lib.nixosSystem {
+          inherit pkgs specialArgs;
+          modules = [./hosts/${hostname}/configuration.nix];
+        };
+      Vanguard = let
+        hostname = "Vanguard";
+      in
+        nixpkgs.lib.nixosSystem {
+          inherit pkgs specialArgs;
+          modules = [./hosts/${hostname}/configuration.nix];
+        };
+      Ronin = let
+        hostname = "Ronin";
+      in
+        nixpkgs.lib.nixosSystem {
+          inherit pkgs specialArgs;
+          modules = [./hosts/${hostname}/configuration.nix];
+        };
+    };
+    homeConfigurations = let
+      extraSpecialArgs = {inherit inputs;};
+    in {
+      # NixOS home configurations
+      "xenia@Vanguard" = let
+        hostname = "Vanguard";
+        pkgs = self.nixosConfigurations.${hostname}.pkgs;
+      in
+        home-manager.lib.homeManagerConfiguration {
+          inherit pkgs extraSpecialArgs;
+          modules = [./hosts/${hostname}/home.nix];
+        };
+      "elitherl@Ronin" = let
+        hostname = "Ronin";
+        pkgs = self.nixosConfigurations.${hostname}.pkgs;
+      in
+        home-manager.lib.homeManagerConfiguration {
+          inherit pkgs extraSpecialArgs;
+          modules = [./hosts/${hostname}/home.nix];
+        };
+      # Legacy home configurations
+      "tux@Monarch" = let
+        hostname = "Monarch";
+        system = "aarch64-darwin";
+        pkgs = inputs.nixpkgs.legacyPackages.${system};
+      in
+        home-manager.lib.homeManagerConfiguration {
+          inherit pkgs extraSpecialArgs;
+          modules = [./hosts/${hostname}/home.nix];
+        };
     };
   };
 }
diff --git a/home/default.nix b/home/default.nix
deleted file mode 100644
index 0cf753a8..00000000
--- a/home/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{...}: {imports = [./env ./tui];}
diff --git a/home/desktop/awesome/default.nix b/home/desktop/awesome/default.nix
deleted file mode 100644
index 1f0e4a5b..00000000
--- a/home/desktop/awesome/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  xdg.configFile."awesome/rc.lua".source = ./rc.lua;
-  xsession.windowManager.awesome = {
-    enable = true;
-    luaModules = [pkgs.luaPackages.vicious];
-  };
-}
diff --git a/home/desktop/awesome/rc.lua b/home/desktop/awesome/rc.lua
deleted file mode 100644
index 368c30c9..00000000
--- a/home/desktop/awesome/rc.lua
+++ /dev/null
@@ -1,584 +0,0 @@
--- If LuaRocks is installed, make sure that packages installed through it are
--- found (e.g. lgi). If LuaRocks is not installed, do nothing.
-pcall(require, "luarocks.loader")
-
--- Standard awesome library
-local awesome = require "awesome"
-local root = require "root"
-local gears = require "gears"
-local awful = require "awful"
-require "awful.autofocus"
--- Widget and layout library
-local wibox = require "wibox"
--- Theme handling library
-local beautiful = require "beautiful"
--- Notification library
-local naughty = require "naughty"
-local menubar = require "menubar"
-local hotkeys_popup = require "awful.hotkeys_popup"
--- Enable hotkeys help widget for VIM and other apps
--- when client with a matching name is opened:
-require "awful.hotkeys_popup.keys"
-
--- {{{ Error handling
--- Check if awesome encountered an error during startup and fell back to
--- another config (This code will only ever execute for the fallback config)
-if awesome.startup_errors then
-    naughty.notify {
-        preset = naughty.config.presets.critical,
-        title = "Oops, there were errors during startup!",
-        text = awesome.startup_errors,
-    }
-end
-
--- Handle runtime errors after startup
-do
-    local in_error = false
-    awesome.connect_signal("debug::error", function(err)
-        -- Make sure we don't go into an endless error loop
-        if in_error then return end
-        in_error = true
-
-        naughty.notify {
-            preset = naughty.config.presets.critical,
-            title = "Oops, an error happened!",
-            text = tostring(err),
-        }
-        in_error = false
-    end)
-end
--- }}}
-
--- {{{ Variable definitions
--- Themes define colours, icons, font and wallpapers.
-beautiful.init(gears.filesystem.get_themes_dir() .. "gtk/theme.lua")
-
--- This is used later as the default terminal and editor to run.
-local terminal = "wezterm"
-local editor = "nvim"
-local editor_cmd = terminal .. " -e " .. editor
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-local modkey = "Mod4"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-awful.layout.layouts = {
-    awful.layout.suit.tile,
-    awful.layout.suit.fair,
-    awful.layout.suit.max,
-    awful.layout.suit.magnifier,
-    awful.layout.suit.floating,
-}
--- }}}
-
--- {{{ Menu
--- Create a launcher widget and a main menu
-local menuitems = {
-    { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
-    { "manual", terminal .. " -e man awesome" },
-    { "edit config", editor_cmd .. " " .. awesome.conffile },
-    { "restart", awesome.restart },
-    { "quit", function() awesome.quit() end },
-}
-
-local mainmenu = awful.menu {
-    items = {
-        { "awesome", menuitems, beautiful.awesome_icon },
-        { "open terminal", terminal },
-        { "open" .. editor, editor_cmd },
-    },
-}
-
-local launcher = awful.widget.launcher { image = beautiful.awesome_icon, menu = mainmenu }
-
--- Menubar configuration
-menubar.utils.terminal = terminal -- Set the terminal for applications that require it
--- }}}
-
--- Keyboard map indicator and switcher
-local keyboard_layout = awful.widget.keyboardlayout()
-
--- {{{ Wibar
--- Create a textclock widget
-local mytextclock = wibox.widget.textclock()
-
--- Create a wibox for each screen and add it
-local taglist_buttons = gears.table.join(
-    awful.button({}, 1, function(t) t:view_only() end),
-    awful.button({ modkey }, 1, function(t)
-        if client.focus then client.focus:move_to_tag(t) end
-    end),
-    awful.button({}, 3, awful.tag.viewtoggle),
-    awful.button({ modkey }, 3, function(t)
-        if client.focus then client.focus:toggle_tag(t) end
-    end),
-    awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end),
-    awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end)
-)
-
-local tasklist_buttons = gears.table.join(
-    awful.button({}, 1, function(c)
-        if c == client.focus then
-            c.minimized = true
-        else
-            c:emit_signal("request::activate", "tasklist", { raise = true })
-        end
-    end),
-    awful.button({}, 3, function() awful.menu.client_list { theme = { width = 250 } } end),
-    awful.button({}, 4, function() awful.client.focus.byidx(1) end),
-    awful.button({}, 5, function() awful.client.focus.byidx(-1) end)
-)
-
-local function set_wallpaper(s)
-    -- Wallpaper
-    if beautiful.wallpaper then
-        local wallpaper = beautiful.wallpaper
-        -- If wallpaper is a function, call it with the screen
-        if type(wallpaper) == "function" then wallpaper = wallpaper(s) end
-        gears.wallpaper.maximized(wallpaper, s, true)
-    end
-end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
-screen.connect_signal("property::geometry", set_wallpaper)
-
-awful.screen.connect_for_each_screen(function(s)
-    -- Wallpaper
-    set_wallpaper(s)
-
-    -- Each screen has its own tag table.
-    awful.tag({ "main", "dev", "browser", "files", "chat", "remote" }, s, {
-        awful.layout.suit.tile,
-        awful.layout.suit.tile,
-        awful.layout.suit.tile,
-        awful.layout.suit.tile,
-        awful.layout.suit.tile,
-        awful.layout.suit.max,
-    })
-
-    -- Create a promptbox for each screen
-    s.mypromptbox = awful.widget.prompt()
-    -- Create an imagebox widget which will contain an icon indicating which layout we're using.
-    -- We need one layoutbox per screen.
-    s.mylayoutbox = awful.widget.layoutbox(s)
-    s.mylayoutbox:buttons(
-        gears.table.join(
-            awful.button({}, 1, function() awful.layout.inc(1) end),
-            awful.button({}, 3, function() awful.layout.inc(-1) end),
-            awful.button({}, 4, function() awful.layout.inc(1) end),
-            awful.button({}, 5, function() awful.layout.inc(-1) end)
-        )
-    )
-    -- Create a taglist widget
-    s.mytaglist = awful.widget.taglist {
-        screen = s,
-        filter = awful.widget.taglist.filter.all,
-        buttons = taglist_buttons,
-    }
-
-    -- Create a tasklist widget
-    s.mytasklist = awful.widget.tasklist {
-        screen = s,
-        filter = awful.widget.tasklist.filter.currenttags,
-        buttons = tasklist_buttons,
-    }
-
-    -- Create the wibox
-    s.mywibox = awful.wibar { position = "top", screen = s }
-
-    -- Add widgets to the wibox
-    s.mywibox:setup {
-        layout = wibox.layout.align.horizontal,
-        { -- Left widgets
-            layout = wibox.layout.fixed.horizontal,
-            launcher,
-            s.mytaglist,
-            s.mypromptbox,
-        },
-        s.mytasklist, -- Middle widget
-        { -- Right widgets
-            layout = wibox.layout.fixed.horizontal,
-            keyboard_layout,
-            wibox.widget.systray(),
-            mytextclock,
-            s.mylayoutbox,
-        },
-    }
-end)
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(
-    gears.table.join(
-        awful.button({}, 3, function() mainmenu:toggle() end),
-        awful.button({}, 4, awful.tag.viewnext),
-        awful.button({}, 5, awful.tag.viewprev)
-    )
-)
--- }}}
-
--- {{{ Key bindings
-local globalkeys = gears.table.join(
-    awful.key({ modkey }, "s", hotkeys_popup.show_help, { description = "show help", group = "awesome" }),
-    awful.key({ modkey }, "w", function() mainmenu:show() end, { description = "show main menu", group = "awesome" }),
-    awful.key({ modkey }, ",", awful.tag.viewprev, { description = "view previous", group = "tag" }),
-    awful.key({ modkey }, ".", awful.tag.viewnext, { description = "view next", group = "tag" }),
-    awful.key({ modkey }, "`", awful.tag.history.restore, { description = "go back", group = "tag" }),
-    awful.key(
-        { modkey },
-        "[",
-        function() awful.screen.focus_relative(-1) end,
-        { description = "focus the previous screen", group = "screen" }
-    ),
-    awful.key(
-        { modkey },
-        "]",
-        function() awful.screen.focus_relative(1) end,
-        { description = "focus the next screen", group = "screen" }
-    ),
-
-    awful.key(
-        { modkey },
-        "j",
-        function() awful.client.focus.byidx(1) end,
-        { description = "focus next by index", group = "client" }
-    ),
-    awful.key(
-        { modkey },
-        "k",
-        function() awful.client.focus.byidx(-1) end,
-        { description = "focus previous by index", group = "client" }
-    ),
-    awful.key(
-        { modkey, "Shift" },
-        "j",
-        function() awful.client.swap.byidx(1) end,
-        { description = "swap with next client by index", group = "client" }
-    ),
-    awful.key(
-        { modkey, "Shift" },
-        "k",
-        function() awful.client.swap.byidx(-1) end,
-        { description = "swap with previous client by index", group = "client" }
-    ),
-
-    -- Layout manipulation
-    awful.key({ modkey }, "u", awful.client.urgent.jumpto, { description = "jump to urgent client", group = "client" }),
-    awful.key({ modkey }, "Tab", function()
-        awful.client.focus.history.previous()
-        if client.focus then client.focus:raise() end
-    end, { description = "go back", group = "client" }),
-
-    -- Standard program
-    awful.key(
-        { modkey },
-        "Return",
-        function() awful.spawn(terminal) end,
-        { description = "open a terminal", group = "launcher" }
-    ),
-    awful.key({ modkey, "Control" }, "r", awesome.restart, { description = "reload awesome", group = "awesome" }),
-    awful.key({ modkey, "Shift" }, "q", awesome.quit, { description = "quit awesome", group = "awesome" }),
-
-    awful.key(
-        { modkey },
-        "l",
-        function() awful.tag.incmwfact(0.05) end,
-        { description = "increase master width factor", group = "layout" }
-    ),
-    awful.key(
-        { modkey },
-        "h",
-        function() awful.tag.incmwfact(-0.05) end,
-        { description = "decrease master width factor", group = "layout" }
-    ),
-    awful.key(
-        { modkey, "Shift" },
-        "h",
-        function() awful.tag.incnmaster(1, nil, true) end,
-        { description = "increase the number of master clients", group = "layout" }
-    ),
-    awful.key(
-        { modkey, "Shift" },
-        "l",
-        function() awful.tag.incnmaster(-1, nil, true) end,
-        { description = "decrease the number of master clients", group = "layout" }
-    ),
-    awful.key(
-        { modkey, "Control" },
-        "h",
-        function() awful.tag.incncol(1, nil, true) end,
-        { description = "increase the number of columns", group = "layout" }
-    ),
-    awful.key(
-        { modkey, "Control" },
-        "l",
-        function() awful.tag.incncol(-1, nil, true) end,
-        { description = "decrease the number of columns", group = "layout" }
-    ),
-    awful.key(
-        { modkey },
-        "space",
-        function() awful.layout.inc(1) end,
-        { description = "select next", group = "layout" }
-    ),
-    awful.key(
-        { modkey, "Shift" },
-        "space",
-        function() awful.layout.inc(-1) end,
-        { description = "select previous", group = "layout" }
-    ),
-
-    awful.key({ modkey, "Control" }, "n", function()
-        local c = awful.client.restore()
-        -- Focus restored client
-        if c then c:emit_signal("request::activate", "key.unminimize", { raise = true }) end
-    end, { description = "restore minimized", group = "client" }),
-
-    -- Prompt
-    awful.key(
-        { modkey },
-        "r",
-        function() awful.screen.focused().mypromptbox:run() end,
-        { description = "run prompt", group = "launcher" }
-    ),
-
-    awful.key(
-        { modkey },
-        "x",
-        function()
-            awful.prompt.run {
-                prompt = "Run Lua code: ",
-                textbox = awful.screen.focused().mypromptbox.widget,
-                exe_callback = awful.util.eval,
-                history_path = awful.util.get_cache_dir() .. "/history_eval",
-            }
-        end,
-        { description = "lua execute prompt", group = "awesome" }
-    ),
-    -- Menubar
-    awful.key({ modkey }, "p", function() menubar.show() end, { description = "show the menubar", group = "launcher" })
-)
-
-local clientkeys = gears.table.join(
-    awful.key({ modkey }, "f", function(c)
-        c.fullscreen = not c.fullscreen
-        c:raise()
-    end, { description = "toggle fullscreen", group = "client" }),
-    awful.key({ modkey, "Shift" }, "c", function(c) c:kill() end, { description = "close", group = "client" }),
-    awful.key(
-        { modkey, "Control" },
-        "space",
-        awful.client.floating.toggle,
-        { description = "toggle floating", group = "client" }
-    ),
-    awful.key(
-        { modkey, "Control" },
-        "Return",
-        function(c) c:swap(awful.client.getmaster()) end,
-        { description = "move to master", group = "client" }
-    ),
-    awful.key({ modkey }, "o", function(c) c:move_to_screen() end, { description = "move to screen", group = "client" }),
-    awful.key(
-        { modkey },
-        "t",
-        function(c) c.ontop = not c.ontop end,
-        { description = "toggle keep on top", group = "client" }
-    ),
-    awful.key({ modkey }, "n", function(c)
-        -- The client currently has the input focus, so it cannot be
-        -- minimized, since minimized clients can't have the focus.
-        c.minimized = true
-    end, { description = "minimize", group = "client" }),
-    awful.key({ modkey }, "m", function(c)
-        c.maximized = not c.maximized
-        c:raise()
-    end, { description = "(un)maximize", group = "client" }),
-    awful.key({ modkey, "Control" }, "m", function(c)
-        c.maximized_vertical = not c.maximized_vertical
-        c:raise()
-    end, { description = "(un)maximize vertically", group = "client" }),
-    awful.key({ modkey, "Shift" }, "m", function(c)
-        c.maximized_horizontal = not c.maximized_horizontal
-        c:raise()
-    end, { description = "(un)maximize horizontally", group = "client" })
-)
-
--- Bind all key numbers to tags.
--- Be careful: we use keycodes to make it work on any keyboard layout.
--- This should map on the top row of your keyboard, usually 1 to 9.
-for i = 1, 9 do
-    globalkeys = gears.table.join(
-        globalkeys,
-        -- View tag only.
-        awful.key({ modkey }, "#" .. i + 9, function()
-            local screen = awful.screen.focused()
-            local tag = screen.tags[i]
-            if tag then tag:view_only() end
-        end, { description = "view tag #" .. i, group = "tag" }),
-        -- Toggle tag display.
-        awful.key({ modkey, "Control" }, "#" .. i + 9, function()
-            local screen = awful.screen.focused()
-            local tag = screen.tags[i]
-            if tag then awful.tag.viewtoggle(tag) end
-        end, { description = "toggle tag #" .. i, group = "tag" }),
-        -- Move client to tag.
-        awful.key({ modkey, "Shift" }, "#" .. i + 9, function()
-            if client.focus then
-                local tag = client.focus.screen.tags[i]
-                if tag then client.focus:move_to_tag(tag) end
-            end
-        end, { description = "move focused client to tag #" .. i, group = "tag" }),
-        -- Toggle tag on focused client.
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function()
-            if client.focus then
-                local tag = client.focus.screen.tags[i]
-                if tag then client.focus:toggle_tag(tag) end
-            end
-        end, { description = "toggle focused client on tag #" .. i, group = "tag" })
-    )
-end
-
-local clientbuttons = gears.table.join(
-    awful.button({}, 1, function(c) c:emit_signal("request::activate", "mouse_click", { raise = true }) end),
-    awful.button({ modkey }, 1, function(c)
-        c:emit_signal("request::activate", "mouse_click", { raise = true })
-        awful.mouse.client.move(c)
-    end),
-    awful.button({ modkey }, 3, function(c)
-        c:emit_signal("request::activate", "mouse_click", { raise = true })
-        awful.mouse.client.resize(c)
-    end)
-)
-
--- Set keys
-root.keys(globalkeys)
--- }}}
-
--- {{{ Rules
--- Rules to apply to new clients (through the "manage" signal).
-awful.rules.rules = {
-    -- All clients will match this rule.
-    {
-        rule = {},
-        properties = {
-            border_width = beautiful.border_width,
-            border_color = beautiful.border_normal,
-            focus = awful.client.focus.filter,
-            raise = true,
-            keys = clientkeys,
-            buttons = clientbuttons,
-            screen = awful.screen.preferred,
-            placement = awful.placement.no_overlap + awful.placement.no_offscreen,
-        },
-    },
-
-    -- Floating clients.
-    {
-        rule_any = {
-            instance = {
-                "DTA", -- Firefox addon DownThemAll.
-                "copyq", -- Includes session name in class.
-                "pinentry",
-            },
-            class = {
-                "Arandr",
-                "Blueman-manager",
-                "Gpick",
-                "Kruler",
-                "MessageWin", -- kalarm.
-                "Sxiv",
-                "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
-                "Wpa_gui",
-                "veromix",
-                "xtightvncviewer",
-            },
-
-            -- Note that the name property shown in xprop might be set slightly after creation of the client
-            -- and the name shown there might not match defined rules here.
-            name = {
-                "Event Tester", -- xev.
-            },
-            role = {
-                "AlarmWindow", -- Thunderbird's calendar.
-                "ConfigManager", -- Thunderbird's about:config.
-                "pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
-            },
-        },
-        properties = { floating = true },
-    },
-
-    -- Add titlebars to normal clients and dialogs
-    { rule_any = { type = { "normal", "dialog" } }, properties = { titlebars_enabled = true } },
-
-    -- Set Firefox to always map on the tag named "2" on screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { screen = 1, tag = "2" } },
-}
--- }}}
-
--- {{{ Signals
--- Signal function to execute when a new client appears.
-client.connect_signal("manage", function(c)
-    -- Set the windows at the slave,
-    -- i.e. put it at the end of others instead of setting it master.
-    -- if not awesome.startup then awful.client.setslave(c) end
-
-    if awesome.startup and not c.size_hints.user_position and not c.size_hints.program_position then
-        -- Prevent clients from being unreachable after screen count changes.
-        awful.placement.no_offscreen(c)
-    end
-end)
-
--- Add a titlebar if titlebars_enabled is set to true in the rules.
-client.connect_signal("request::titlebars", function(c)
-    -- buttons for the titlebar
-    local buttons = gears.table.join(
-        awful.button({}, 1, function()
-            c:emit_signal("request::activate", "titlebar", { raise = true })
-            awful.mouse.client.move(c)
-        end),
-        awful.button({}, 3, function()
-            c:emit_signal("request::activate", "titlebar", { raise = true })
-            awful.mouse.client.resize(c)
-        end)
-    )
-
-    awful.titlebar(c):setup {
-        { -- Left
-            awful.titlebar.widget.iconwidget(c),
-            buttons = buttons,
-            layout = wibox.layout.fixed.horizontal,
-        },
-        { -- Middle
-            { -- Title
-                align = "center",
-                widget = awful.titlebar.widget.titlewidget(c),
-            },
-            buttons = buttons,
-            layout = wibox.layout.flex.horizontal,
-        },
-        { -- Right
-            awful.titlebar.widget.floatingbutton(c),
-            awful.titlebar.widget.maximizedbutton(c),
-            awful.titlebar.widget.stickybutton(c),
-            awful.titlebar.widget.ontopbutton(c),
-            awful.titlebar.widget.closebutton(c),
-            layout = wibox.layout.fixed.horizontal(),
-        },
-        layout = wibox.layout.align.horizontal,
-    }
-end)
-
--- Enable sloppy focus, so that focus follows mouse.
-client.connect_signal(
-    "mouse::enter",
-    function(c) c:emit_signal("request::activate", "mouse_enter", { raise = false }) end
-)
-
-client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
-client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
--- }}}
diff --git a/home/desktop/bspwm.nix b/home/desktop/bspwm.nix
deleted file mode 100644
index c33064a3..00000000
--- a/home/desktop/bspwm.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{...}: {
-  imports = [./xfce.nix];
-  xsession.windowManager.bspwm = {
-    enable = true;
-    settings = {
-      window_gap = 12;
-      border_width = 2;
-      split_ratio = 0.5;
-      borderless_monocle = false;
-      gapless_monocle = false;
-      pointer_modifier = "mod4";
-      pointer_action1 = "move";
-      pointer_action2 = "resize_side";
-      pointer_action3 = "resize_corner";
-      focus_follows_pointer = true;
-    };
-    monitors."primary" = ["main" "dev" "browser" "files" "chat" "remote" "steam" "misc"];
-    rules = {
-      "Xfce4-terminal".state = "floating";
-      "Nm-connection-editor".state = "floating";
-      "Qemu-system-x86_64".state = "floating";
-      "Pavucontrol".state = "floating";
-      "Otpclient".state = "floating";
-      ".blueman-manager-wrapped".state = "floating";
-      "neovide".desktop = "dev";
-      "firefox".desktop = "browser";
-      "Thunar".desktop = "files";
-      "Element".desktop = "chat";
-      "Signal".desktop = "chat";
-      "teams-for-linux".desktop = "chat";
-      "Nxplayer.bin".desktop = "remote";
-    };
-    extraConfig = ''
-      xsetroot -cursor_name left_ptr
-      polybar-msg cmd quit
-      echo "---" | tee -a /tmp/polybar.log
-      polybar 2>&1 | tee -a /tmp/polybar.log & disown
-      echo "Bars launched..."
-    '';
-  };
-  services.sxhkd = {
-    enable = true;
-    keybindings = {
-      # Terminal emulators
-      "super + Return" = "wezterm";
-      "super + shift + Return" = "xfce4-terminal --drop-down";
-      # Launcher
-      "super + @space" = "rofi -show drun";
-      # Shortcuts
-      "super + shift + q" = "xfce4-session-logout";
-      "super + F1" = "xfce4-screensaver-command --lock";
-      "super + r" = "bspc desktop -f files && wezterm -e ranger";
-      "super + n" = "bspc desktop -f dev && neovide --multigrid --maximized";
-      # bspwm hotkeys
-      "super + Escape" = "pkill -USR1 -x sxhkd";
-      "super + alt + {q,r}" = "bspc {quit,wm -r}";
-      "super + {_,shift + }q" = "bspc node -{c,k}";
-      "super + m" = "bspc desktop -l next";
-      # State/Flags
-      "super + {t,shift + t,v,shift + m}" = "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}";
-      # Focus/Scap
-      "super + {_,shift + }{h,j,k,l}" = "bspc node -{f,s} {west,south,north,east}";
-      "super + {_,shift + }{Left,Down,Up,Right}" = "bspc node -{f,s} {west,south,north,east}";
-      "super + {_,shift + }{comma,period}" = "bspc {desktop -f,node -d} {prev,next}.local.occupied --follow";
-      "super + {_,shift + }c" = "bspc node -f {next,prev}.local.!hidden.window";
-      "super + {_,shift + }bracket{left,right}" = "bspc {monitor -f,node -m} {prev,next} --follow";
-      "super + {grave,Tab}" = "bspc {node,desktop} -f last";
-      "super + {_,shift + }{a,s,d,f,u,i,o,p}" = "bspc {desktop -f,node -d} '{main,dev,browser,files,chat,remote,steam,misc}' --follow";
-      # Preselect
-      "super + ctrl + {h,j,k,l}" = "bspc node -p {west,south,north,east}";
-      "super + ctrl + space" = "bspc node -p cancel";
-      "super + ctrl + shift + space" = "bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel";
-      # Screenshot
-      "Print" = "flameshot gui";
-      # Volume control keys
-      "XF86AudioMute" = "pamixer -t";
-      "XF86AudioRaiseVolume" = "pamixer -i 2";
-      "XF86AudioLowerVolume" = "pamixer -d 2";
-      "XF86MonBrightnessUp" = "xbacklight +10";
-      "XF86MonBrightnessDown" = "xbacklight -10";
-    };
-  };
-}
diff --git a/home/desktop/eww/config/eww.scss b/home/desktop/eww/config/eww.scss
deleted file mode 100644
index 0e373714..00000000
--- a/home/desktop/eww/config/eww.scss
+++ /dev/null
@@ -1 +0,0 @@
-// vim:ft=scss
diff --git a/home/desktop/eww/config/eww.yuck b/home/desktop/eww/config/eww.yuck
deleted file mode 100644
index 66b0c508..00000000
--- a/home/desktop/eww/config/eww.yuck
+++ /dev/null
@@ -1,24 +0,0 @@
-(deflisten workspaces :initial "[]" "bash ~/.config/eww/scripts/get-workspaces")
-(deflisten current_workspace :initial "1" "bash ~/.config/eww/scripts/get-active-workspace")
-(defwidget workspaces []
-(eventbox :onscroll "bash ~/.config/eww/scripts/change-active-workspace {} ${current_workspace}" :class "workspaces-widget"
-    (box :space-evenly true
-        (label :text "${workspaces}${current_workspace}" :visible false)
-        (for workspace in workspaces
-            (eventbox :onclick "hyprctl dispatch workspace ${workspace.id}"
-                (box :class "workspace-entry ${workspace.id == current_workspace ? "current" : ""} ${workspace.windows > 0 ? "occupied" : "empty"}"
-                    (label :text "${workspace.id}")
-                    )
-                )
-            )
-        )
-    )
-)
-(deflisten window :initial "..." "sh ~/.config/eww/scripts/get-window-title")
-(defwidget window_w []
-  (box
-    (label :text "${window}"
-    )
-  )
-)
-;; vim:ft=yuck
diff --git a/home/desktop/eww/config/scripts/change-active-workspace b/home/desktop/eww/config/scripts/change-active-workspace
deleted file mode 100644
index 6b09eb9e..00000000
--- a/home/desktop/eww/config/scripts/change-active-workspace
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/bash
-function clamp {
-    min=$1
-    max=$2
-    val=$3
-    python -c "print(max($min, min($val, $max)))"
-}
-
-direction=$1
-current=$2
-if test "$direction" = "down"
-then
-    target=$(clamp 1 10 $(($current+1)))
-    echo "jumping to $target"
-    hyprctl dispatch workspace "$target"
-elif test "$direction" = "up"
-then
-    target=$(clamp 1 10 $(($current-1)))
-    echo "jumping to $target"
-    hyprctl dispatch workspace "$target"
-fi
diff --git a/home/desktop/eww/config/scripts/get-active-workspace b/home/desktop/eww/config/scripts/get-active-workspace
deleted file mode 100644
index a8886566..00000000
--- a/home/desktop/eww/config/scripts/get-active-workspace
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id'
-
-socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - |\
-    stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}'
diff --git a/home/desktop/eww/config/scripts/get-window-title b/home/desktop/eww/config/scripts/get-window-title
deleted file mode 100644
index 15a3ba45..00000000
--- a/home/desktop/eww/config/scripts/get-window-title
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-hyprctl activewindow -j | jq --raw-output .title
-socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}'
diff --git a/home/desktop/eww/config/scripts/get-workspaces b/home/desktop/eww/config/scripts/get-workspaces
deleted file mode 100644
index e62d9500..00000000
--- a/home/desktop/eww/config/scripts/get-workspaces
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-spaces (){
-    WORKSPACE_WINDOWS=$(hyprctl workspaces -j | jq 'map({key: .id | tostring, value: .windows}) | from_entries')
-    seq 1 10 | jq --argjson windows "$WORKSPACE_WINDOWS" --slurp -Mc 'map(tostring) | map({id: ., windows: ($windows[.]//0)})'
-}
-
-spaces
-socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | while read -r line; do
-    spaces
-done
diff --git a/home/desktop/eww/default.nix b/home/desktop/eww/default.nix
deleted file mode 100644
index ac8442b8..00000000
--- a/home/desktop/eww/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    jq
-    socat
-  ];
-  programs.eww = {
-    enable = true;
-    package = pkgs.eww-wayland;
-    configDir = ./config;
-  };
-}
diff --git a/home/desktop/picom.nix b/home/desktop/picom.nix
deleted file mode 100644
index dd1ed424..00000000
--- a/home/desktop/picom.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{...}: {
-  services.picom = {
-    enable = true;
-    backend = "glx";
-    activeOpacity = 1.0;
-    inactiveOpacity = 1.0;
-    menuOpacity = 1.0;
-    settings = {
-      blur = {
-        method = "dual_kawase";
-        strength = 5;
-      };
-      corner-radius = 10;
-    };
-  };
-}
diff --git a/home/desktop/polybar/default.nix b/home/desktop/polybar/default.nix
deleted file mode 100644
index 44959ae8..00000000
--- a/home/desktop/polybar/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [bluez];
-  services.polybar = {
-    enable = true;
-    config = ./polybar.ini;
-    script = "${pkgs.polybar}/bin/polybar &";
-  };
-}
diff --git a/home/desktop/polybar/polybar.ini b/home/desktop/polybar/polybar.ini
deleted file mode 100644
index ed1e7481..00000000
--- a/home/desktop/polybar/polybar.ini
+++ /dev/null
@@ -1,229 +0,0 @@
-;==========================================================
-;
-;
-;   ██████╗  ██████╗ ██╗  ██╗   ██╗██████╗  █████╗ ██████╗
-;   ██╔══██╗██╔═══██╗██║  ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
-;   ██████╔╝██║   ██║██║   ╚████╔╝ ██████╔╝███████║██████╔╝
-;   ██╔═══╝ ██║   ██║██║    ╚██╔╝  ██╔══██╗██╔══██║██╔══██╗
-;   ██║     ╚██████╔╝███████╗██║   ██████╔╝██║  ██║██║  ██║
-;   ╚═╝      ╚═════╝ ╚══════╝╚═╝   ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝
-;
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/polybar/polybar
-;
-;   The README contains a lot of information
-;
-;==========================================================
-
-[colors]
-base = #24273a
-mantle = #1e2030
-crust = #181926
-
-text = #cad3f5
-subtext0 = #a5adcb
-subtext1 = #b8c0e0
-
-surface0 = #363a4f
-surface1 = #494d64
-surface2 = #5b6078
-
-overlay0 = #6e738d
-overlay1 = #8087a2
-overlay2 = #939ab7
-
-
-blue = #8aadf4
-lavender = #b7bdf8
-sapphire = #7dc4e4
-sky = #91d7e3
-teal = #8bd5ca
-green = #a6da95
-yellow = #eed49f
-peach = #f5a97f
-maroon = #ee99a0
-red = #ed8796
-mauve = #c6a0f6
-pink = #f5bde6
-flamingo = #f0c6c6
-rosewater = #f4dbd6
-
-transparent = #00000000
-
-background = ${colors.base}
-background-alt = ${colors.crust}
-foreground = ${colors.text}
-primary = ${colors.lavender}
-secondary = ${colors.mauve}
-alert = ${colors.red}
-disabled = ${colors.surface0}
-
-[common]
-height = 24pt
-radius = 6
-dpi = 0
-font-0 = FiraCode Nerd Font;size=12
-font-1 = Noto Sans;size=12
-line-size = 3pt
-background = ${colors.background}
-foreground = ${colors.foreground}
-padding = 1
-module-margin = 1
-border-size = 4pt
-border-color = ${colors.background}
-wm-restack = generic
-override-redirect = false
-separator = |
-separator-foreground = ${colors.disabled}
-enable-ipc = true
-
-[settings]
-screenchange-reload = true
-pseudo-transparency = false
-
-[bar/main]
-inherit = common
-width = 100%
-
-modules-left = launcher time date cpu memory
-modules-center = xworkspaces
-modules-right = pulseaudio wlan eth backlight battery power-menu
-
-[module/launcher]
-type = custom/text
-content = " "
-click-left = "rofi -show drun &"
-
-[module/power-menu]
-type = custom/text
-content = " "
-click-left = "powermenu"
-
-[module/xworkspaces]
-type = internal/xworkspaces
-
-icon-0 = "main;[a] 󰟀 "
-icon-1 = "dev;[s] 󰅴 "
-icon-2 = "browser;[d] 󰈹 "
-icon-3 = "files;[f] 󰝰 "
-icon-4 = "chat;[u] 󰭹 "
-icon-5 = "remote;[i]  "
-icon-6 = "steam;[o] 󰓓 "
-icon-7 = "misc;[p] 󰣙 "
-icon-default = "󰣘 "
-
-label-active = %icon%
-label-active-background = ${colors.background-alt}
-label-active-underline= ${colors.primary}
-label-active-padding = 1
-
-label-occupied = %icon%
-label-occupied-padding = 1
-
-label-urgent = %icon%
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 1
-
-label-empty = %icon%
-label-empty-foreground = ${colors.disabled}
-label-empty-padding = 1
-
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = "󰍛 "
-format-prefix-foreground = ${colors.primary}
-label = %percentage_used:2%%
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-format-prefix = "󰻠 "
-format-prefix-foreground = ${colors.primary}
-label = %percentage:2%%
-
-[network-base]
-type = internal/network
-interval = 5
-format-connected = <label-connected>
-format-disconnected = <label-disconnected>
-
-[module/wlan]
-inherit = network-base
-interface-type = wireless
-label-connected = "󰖩 %essid%"
-label-disconnected = "󰖪 "
-
-[module/eth]
-inherit = network-base
-interface-type = wired
-label-connected = "󰈁 "
-label-disconnected = "󰈂 "
-
-[module/date]
-type = internal/date
-interval = 3600
-date = %A %Y-%m-%d
-label = %date%
-label-foreground = ${colors.primary}
-
-[module/time]
-type = internal/date
-interval = 30
-time = %R
-label = %time%
-label-foreground = ${colors.primary}
-
-[module/backlight]
-type = internal/backlight
-card = intel_backlight
-format = <ramp> <label>
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-3 = 
-ramp-4 = 
-ramp-5 = 
-ramp-6 = 
-ramp-7 = 
-ramp-8 = 
-
-[module/battery]
-type = internal/battery
-battery = BAT0
-adapter = AC
-format-charging = <animation-charging> <label-charging>
-format-discharging = <ramp-capacity> <label-discharging>
-format-full = <label-full>
-format-low = <animation-low> <label-low>
-label-charging = %percentage%% %time% %consumption%W
-label-discharging = %percentage%% %time% %consumption%W
-label-full = 󱟢
-label-low = %percentage%% %time%
-ramp-capacity-0 = 󰁺
-ramp-capacity-1 = 󰁻
-ramp-capacity-2 = 󰁼
-ramp-capacity-3 = 󰁽
-ramp-capacity-4 = 󰁾
-ramp-capacity-5 = 󰁿
-ramp-capacity-6 = 󰂀
-ramp-capacity-7 = 󰂁
-ramp-capacity-8 = 󰂂
-ramp-capacity-9 = 󰁹
-animation-low-0 = 󰂎
-animation-low-1 = 󰂃
-animation-low-framerate = 200
-animation-charging-0 = 󰢜
-animation-charging-1 = 󰂆
-animation-charging-2 = 󰂇
-animation-charging-3 = 󰂈
-animation-charging-4 = 󰢝
-animation-charging-5 = 󰂉
-animation-charging-6 = 󰢞
-animation-charging-7 = 󰂊
-animation-charging-8 = 󰂋
-animation-charging-9 = 󰂅
-animation-charging-framerate = 750
-
-; vim:ft=dosini
diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix
deleted file mode 100644
index 48519a63..00000000
--- a/home/desktop/sway.nix
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: let
-  modifier = config.wayland.windowManager.sway.config.modifier;
-  term = config.wayland.windowManager.sway.config.terminal;
-  # currently, there is some friction between sway and gtk:
-  # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
-  # the suggested way to set gtk settings is with gsettings
-  # for gsettings to work, we need to tell it where the schemas are
-  # using the XDG_DATA_DIR environment variable
-  # run at the end of sway config
-  configure-gtk = pkgs.writeTextFile {
-    name = "configure-gtk";
-    destination = "/bin/configure-gtk";
-    executable = true;
-    text = let
-      schema = pkgs.gsettings-desktop-schemas;
-      datadir = "${schema}/share/gsettings-schemas/${schema.name}";
-      gtk-theme = config.gtk.theme.name;
-      icon-theme = config.gtk.iconTheme.name;
-      cursor-theme = config.gtk.cursorTheme.name;
-    in ''
-      export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
-      gnome_schema=org.gnome.desktop.interface
-      gsettings set $gnome_schema gtk-theme '${gtk-theme}'
-      gsettings set $gnome_schema icon-theme '${icon-theme}'
-      gsettings set $gnome_schema cursor-theme '${cursor-theme}'
-    '';
-  };
-in {
-  imports = [
-    ./swaylock.nix
-    ./waybar.nix
-    ./gtk.nix
-    ./dunst.nix
-    ./rofi.nix
-  ];
-  home.packages = with pkgs; [
-    configure-gtk
-    pipewire
-    wireplumber
-    wl-clipboard
-    swayimg
-    brightnessctl
-  ];
-  programs.rofi.package = pkgs.rofi-wayland;
-  wayland.windowManager.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-    xwayland = true;
-    extraSessionCommands = ''
-      export GDK_BACKEND=wayland,x11
-      export QT_QPA_PLATFORM=wayland
-      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"'';
-    config = {
-      input."*".xkb_layout = "gb";
-      fonts = {
-        names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"];
-        size = 12.0;
-      };
-      gaps = {
-        inner = lib.mkDefault 5;
-        outer = lib.mkDefault 20;
-      };
-      bars = [{command = "${pkgs.waybar}/bin/waybar";}];
-      assigns = {
-        "2" = [{app_id = "firefox";}];
-        "3" = [
-          {class = "Signal";}
-          {app_id = "fractal";}
-          {app_id = "discord";}
-          {class = "teams-for-linux";}
-        ];
-        "4" = [{class = "Nxplayer.bin";}];
-      };
-      floating.criteria = [
-        {app_id = "pavucontrol";}
-        {app_id = ".blueman-manager-wrapped";}
-        {app_id = "otpclient";}
-        {app_id = "thunar";}
-        {app_id = "^swayimg.*$";}
-      ];
-      startup = [
-        {
-          command = "dbus-sway-environment";
-          always = true;
-        }
-        {
-          command = "configure-gtk";
-          always = true;
-        }
-        {command = "dunst";}
-      ];
-      modifier = lib.mkDefault "Mod1";
-      terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
-      window.titlebar = false;
-      workspaceAutoBackAndForth = true;
-      keybindings = lib.mkOptionDefault {
-        "${modifier}+Return" = "exec ${term}";
-        "${modifier}+space" = "exec ${pkgs.rofi}/bin/rofi -show drun";
-        "${modifier}+F1" = "exec ${pkgs.swaylock}/bin/swaylock";
-        "${modifier}+w" = "exec ${pkgs.firefox}/bin/firefox";
-        "${modifier}+f" = "exec ${pkgs.xfce.thunar}/bin/thunar";
-        "${modifier}+p" = "exec powermenu";
-      };
-      colors = {
-        focused = {
-          border = "#4c7899";
-          background = "#285577";
-          text = "#ffffff";
-          indicator = "#2e9ef4";
-          childBorder = "#285577";
-        };
-        focusedInactive = {
-          border = "#333333";
-          background = "#5f676a";
-          text = "#ffffff";
-          indicator = "#484e50";
-          childBorder = "#5f676a";
-        };
-        unfocused = {
-          border = "#333333";
-          background = "#222222";
-          text = "#888888";
-          indicator = "#292d2e";
-          childBorder = "#222222";
-        };
-        urgent = {
-          border = "#2f343a";
-          background = "#900000";
-          text = "#ffffff";
-          indicator = "#900000";
-          childBorder = "#900000";
-        };
-        placeholder = {
-          border = "#000000";
-          background = "#0c0c0c";
-          text = "#ffffff";
-          indicator = "#000000";
-          childBorder = "#0c0c0c";
-        };
-        background = "#ffffff";
-      };
-    };
-  };
-}
diff --git a/home/desktop/swayfx.nix b/home/desktop/swayfx.nix
deleted file mode 100644
index f801a2ba..00000000
--- a/home/desktop/swayfx.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{pkgs, ...}: {
-  imports = [./sway.nix];
-  wayland.windowManager.sway = {
-    package = pkgs.swayfx;
-    extraConfig = ''
-      corner_radius 10
-      blur enable
-      blur_xray disable
-      blur_passes 3
-      blur_radius 5
-      shadows enable
-      shadow_blur_radius 4
-      scratchpad_minimize disable
-    '';
-  };
-}
diff --git a/home/desktop/xfce.nix b/home/desktop/xfce.nix
deleted file mode 100644
index 019e65ca..00000000
--- a/home/desktop/xfce.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./gtk.nix
-    ./picom.nix
-    ./rofi.nix
-    ./polybar.nix
-  ];
-  xfconf.settings.xsettings."Gtk/MonospaceFontName" = "FiraCode Nerd Font 12";
-  xdg.configFile."xfce4/terminal/colorschemes/tokyonight_night".source =
-    pkgs.fetchFromGitHub {
-      owner = "folke";
-      repo = "tokyonight.nvim";
-      rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
-      sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
-    }
-    + "/extras/xfceterm/tokyonight_night.theme";
-  xdg.configFile."xfce4/terminal/terminalrc".text = ''
-    [Configuration]
-    BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
-    BackgroundDarkness=0.8
-    ColorForeground=#c0caf5
-    ColorBackground=#1a1b26
-    ColorSelection=#c0caf5
-    ColorSelectionBackground=#283457
-    ColorPalette=#15161e;#f7768e;#9ece6a;#e0af68;#7aa2f7;#bb9af7;#7dcfff;#a9b1d6;#414868;#f7768e;#9ece6a;#e0af68;#7aa2f7;#bb9af7;#7dcfff;#c0caf5
-  '';
-}
diff --git a/home/desktop/xresources.nix b/home/desktop/xresources.nix
deleted file mode 100644
index c9409465..00000000
--- a/home/desktop/xresources.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{pkgs, ...}: {
-  xresources.extraConfig =
-    builtins.readFile
-    (
-      pkgs.fetchFromGitHub
-      {
-        owner = "catppuccin";
-        repo = "xresources";
-        rev = "d82c02323e05158ad35f302771e3695affafab78";
-        sha256 = "irRQPjvcTH6AUC07Sm2l77CkrZQNHNJXxBDBSIhl1Fg=";
-      }
-      + "/macchiato.Xresources"
-    )
-    + "\n"
-    + builtins.readFile (
-      pkgs.fetchFromGitHub
-      {
-        owner = "catppuccin";
-        repo = "urxvt";
-        rev = "ccd8eb763edd0a382b5e9bbfbd9697c4d4129edf";
-        sha256 = "YFlSGJzWWB57eSXiUY4l/mSBbOY0an+qej6//YLSiuE=";
-      }
-      + "/macchiato.Xresources"
-    );
-}
diff --git a/home/env/bat.nix b/home/env/bat.nix
deleted file mode 100644
index 998dce9e..00000000
--- a/home/env/bat.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{pkgs, ...}: {
-  programs.bat = {
-    enable = true;
-    config = {
-      theme = "tokyonight";
-    };
-    themes = {
-      tokyonight = builtins.readFile (pkgs.fetchFromGitHub
-        {
-          owner = "folke";
-          repo = "tokyonight.nvim";
-          rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
-          sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
-        }
-        + "/extras/sublime/tokyonight_night.tmTheme");
-      Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
-        {
-          owner = "catppuccin";
-          repo = "bat";
-          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-          sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-        }
-        + "/Catppuccin-macchiato.tmTheme");
-    };
-  };
-}
diff --git a/home/env/default.nix b/home/env/default.nix
deleted file mode 100644
index cc4488ed..00000000
--- a/home/env/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./bash.nix
-    ./bat.nix
-    ./direnv.nix
-    ./fish.nix
-    ./keychain.nix
-    ./nushell.nix
-    ./starship.nix
-    ./zsh.nix
-  ];
-  home.packages = with pkgs; [
-    dig
-    file
-    gnumake
-    zip
-    unzip
-    neofetch
-    silver-searcher
-    distrobox
-  ];
-}
diff --git a/home/env/direnv.nix b/home/env/direnv.nix
deleted file mode 100644
index 3a7b8add..00000000
--- a/home/env/direnv.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-}
diff --git a/home/env/fzf.nix b/home/env/fzf.nix
deleted file mode 100644
index d7a83c15..00000000
--- a/home/env/fzf.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{...}: {
-  programs.fzf = {
-    enable = true;
-    colors = {
-      fg = "-1";
-      bg = "-1";
-      hl = "#c678dd";
-      "fg+" = "#ffffff";
-      "bg+" = "#4b5263";
-      "hl+" = "#d858fe";
-      info = "#98c379";
-      prompt = "#61afef";
-      pointer = "#be5046";
-      marker = "#e5c07b";
-      spinner = "#61afef";
-      header = "#61afef";
-    };
-  };
-}
diff --git a/home/env/keychain.nix b/home/env/keychain.nix
deleted file mode 100644
index 2428d440..00000000
--- a/home/env/keychain.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{...}: {
-  programs.keychain = {
-    enable = true;
-    extraFlags = ["--quiet" "--noask" "--ignore-missing"];
-    keys = ["id_rsa" "id_ed25519"];
-    enableXsessionIntegration = true;
-  };
-}
diff --git a/home/env/nushell.nix b/home/env/nushell.nix
deleted file mode 100644
index 27e25f06..00000000
--- a/home/env/nushell.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  programs.nushell.enable = true;
-  programs.keychain.enableNushellIntegration = true;
-  programs.starship.enableNushellIntegration = true;
-  programs.direnv.enableNushellIntegration = true;
-}
diff --git a/home/env/starship.nix b/home/env/starship.nix
deleted file mode 100644
index 2119b956..00000000
--- a/home/env/starship.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
-  xdg.configFile."starship.toml".source = ./config/starship.toml;
-  programs.starship.enable = true;
-}
diff --git a/home/gui/firefox.nix b/home/firefox/default.nix
similarity index 100%
rename from home/gui/firefox.nix
rename to home/firefox/default.nix
diff --git a/home/personal.nix b/home/firefox/personal.nix
similarity index 95%
rename from home/personal.nix
rename to home/firefox/personal.nix
index 8e059002..f469f83c 100644
--- a/home/personal.nix
+++ b/home/firefox/personal.nix
@@ -1,5 +1,5 @@
 {...}: {
-  imports = [./default.nix ./git/personal.nix ./ssh/personal.nix];
+  imports = [./default.nix];
   programs.firefox.profiles.default = {
     settings."browser.startup.homepage" = "https://cloud.xenia.me.uk";
     bookmarks = [
diff --git a/home/work.nix b/home/firefox/work.nix
similarity index 85%
rename from home/work.nix
rename to home/firefox/work.nix
index 89930e74..4e4d803b 100644
--- a/home/work.nix
+++ b/home/firefox/work.nix
@@ -1,19 +1,5 @@
-{pkgs, ...}: {
-  imports = [./default.nix ./git/work.nix ./ssh/work.nix];
-  home.packages = with pkgs; [
-    zotero
-    openfortivpn
-    nomachine-client
-    teams-for-linux
-    zoom-us
-  ];
-  programs.fish.functions.fsync = ''
-    rsync -avz --copy-links --filter=':- .gitignore' --exclude='.git*'\
-      --delete-during --delete-excluded\
-      $HOME/.config/nvim/ freia:.config/nvim
-    rsync -avz --copy-links --delete-during --delete-excluded\
-      $HOME/.config/starship.toml freia:.config/starship.toml
-  '';
+{...}: {
+  imports = [./default.nix];
   programs.firefox.profiles.default = {
     settings."browser.startup.homepage" = "https://nucleus.ukaea.uk";
     bookmarks = [
diff --git a/home/git/default.nix b/home/git/default.nix
index 00c2a31b..4e6566d1 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  imports = [../env/bat.nix];
   xdg.configFile."git/tokyonight_night.gitconfig".source =
     pkgs.fetchFromGitHub
     {
diff --git a/home/gui/alacritty.nix b/home/gui/alacritty.nix
deleted file mode 100644
index 7f1c1769..00000000
--- a/home/gui/alacritty.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{pkgs, ...}: {
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      font = {
-        normal.family = "FiraCode Nerd Font";
-        size = 14;
-      };
-      window.opacity = 0.8;
-      import = [
-        (pkgs.fetchFromGitHub {
-            owner = "folke";
-            repo = "tokyonight.nvim";
-            rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
-            sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
-          }
-          + "/extras/alacritty/tokyonight_night.yml")
-      ];
-    };
-  };
-}
diff --git a/home/gui/chromium.nix b/home/gui/chromium.nix
deleted file mode 100644
index aba121a4..00000000
--- a/home/gui/chromium.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  programs.chromium = {
-    enable = true;
-    commandLineArgs = ["--ozone-platform-hint=auto"];
-  };
-}
diff --git a/home/gui/default.nix b/home/gui/default.nix
deleted file mode 100644
index 424ec9e6..00000000
--- a/home/gui/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./firefox.nix
-    ./chromium.nix
-    ./wezterm
-  ];
-  home.packages = with pkgs; [
-    neovide
-    bitwarden
-    otpclient
-    signal-desktop
-    fractal
-    libreoffice
-  ];
-}
diff --git a/home/gui/foot.nix b/home/gui/foot.nix
deleted file mode 100644
index 1697ccec..00000000
--- a/home/gui/foot.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
-  programs.foot = {
-    enable = true;
-    settings = {
-      main = {
-        term = "xterm-256color";
-        font = "FiraCode Nerd Font:size=12";
-        dpi-aware = "yes";
-      };
-      colors = {
-        # Catppuccin Macchiato
-        foreground = "cad3f5"; # Text
-        background = "24273a"; # Base
-        regular0 = "494d64"; # Surface 1
-        regular1 = "ed8796"; # red
-        regular2 = "a6da95"; # green
-        regular3 = "eed49f"; # yellow
-        regular4 = "8aadf4"; # blue
-        regular5 = "f5bde6"; # pink
-        regular6 = "8bd5ca"; # teal
-        regular7 = "b8c0e0"; # Subtext 1
-        bright0 = "5b6078"; # Surface 2
-        bright1 = "ed8796"; # red
-        bright2 = "a6da95"; # green
-        bright3 = "eed49f"; # yellow
-        bright4 = "8aadf4"; # blue
-        bright5 = "f5bde6"; # pink
-        bright6 = "8bd5ca"; # teal
-        bright7 = "a5adcb"; # Subtext 0
-      };
-    };
-  };
-}
diff --git a/home/gui/kdeconnect.nix b/home/gui/kdeconnect.nix
deleted file mode 100644
index cff771e6..00000000
--- a/home/gui/kdeconnect.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
-}
diff --git a/home/gui/kitty.nix b/home/gui/kitty.nix
deleted file mode 100644
index 9fe0ac4c..00000000
--- a/home/gui/kitty.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{pkgs, ...}: {
-  programs.kitty = {
-    enable = true;
-    font = {
-      package = with pkgs; (nerdfonts.override {fonts = ["FiraCode"];});
-      name = "Fira Code Nerd Font";
-      size = 14;
-    };
-    settings = {
-      background_opacity = "0.80";
-      disable_ligatures = "cursor";
-      show_hyperlink_targets = true;
-      copy_on_select = true;
-      paste_actions = "confirm";
-      enable_audio_bell = false;
-      window_border_width = 5;
-      window_margin_width = 5;
-      tab_bar_edge = "top";
-      tab_bar_style = "powerline";
-      tab_powerline_style = "round";
-      tab_bar_min_tabs = 2;
-      update_check_interval = 0;
-    };
-    theme = "Tokyo Night";
-  };
-}
diff --git a/home/gui/nextcloud-client.nix b/home/gui/nextcloud-client.nix
deleted file mode 100644
index 411b663c..00000000
--- a/home/gui/nextcloud-client.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
-}
diff --git a/home/gui/urxvt.nix b/home/gui/urxvt.nix
deleted file mode 100644
index d9ae8505..00000000
--- a/home/gui/urxvt.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
-  programs.urxvt = {
-    enable = true;
-    fonts = ["xft:FiraCode Nerd Font Mono:pixelsize=16"];
-  };
-}
diff --git a/home/gui/vscode.nix b/home/gui/vscode.nix
deleted file mode 100644
index a59240ad..00000000
--- a/home/gui/vscode.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{pkgs, ...}: {
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-    enableExtensionUpdateCheck = false;
-    enableUpdateCheck = false;
-    mutableExtensionsDir = false;
-    extensions = with pkgs.vscode-extensions; [
-      asvetliakov.vscode-neovim
-      catppuccin.catppuccin-vsc
-      ms-vscode-remote.remote-ssh
-      ms-vsliveshare.vsliveshare
-      eamodio.gitlens
-      bbenoist.nix
-      sumneko.lua
-      ms-python.python
-      ms-python.vscode-pylance
-      ms-pyright.pyright
-    ];
-    userSettings = {
-      "[nix]"."editor.tabSize" = 2;
-      "workbench.colorTheme" = "Catppuccin Macchiato";
-      "editor.fontSize" = 16;
-      "editor.fontFamily" = "FiraCode Nerd Font";
-      "editor.fontLigatures" = true;
-      "git.confirmSync" = false;
-    };
-  };
-}
diff --git a/home/desktop/hyprland/default.nix b/home/hyprland/default.nix
similarity index 89%
rename from home/desktop/hyprland/default.nix
rename to home/hyprland/default.nix
index 1c5f37ac..716a904b 100644
--- a/home/desktop/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -25,12 +25,12 @@
   };
 in {
   imports = [
-    # ../eww
-    ../waybar
-    ../rofi
-    ../swaylock.nix
-    ../gtk.nix
-    ../dunst.nix
+    inputs.hyprland.homeManagerModules.default
+    ./waybar
+    ./rofi
+    ./swaylock.nix
+    ./gtk.nix
+    ./dunst.nix
   ];
   home.packages = with pkgs; [
     hyprpaper
@@ -43,7 +43,6 @@ in {
   ];
   programs = {
     firefox.package = pkgs.firefox-wayland;
-    chromium.commandLineArgs = ["--enable-features=UseOzonePlatform" "--ozone-platform=wayland"];
     rofi.package = pkgs.rofi-wayland;
   };
   wayland.windowManager.hyprland = {
diff --git a/home/desktop/dunst.nix b/home/hyprland/dunst.nix
similarity index 100%
rename from home/desktop/dunst.nix
rename to home/hyprland/dunst.nix
diff --git a/home/desktop/gtk.nix b/home/hyprland/gtk.nix
similarity index 100%
rename from home/desktop/gtk.nix
rename to home/hyprland/gtk.nix
diff --git a/home/desktop/hyprland/hyprland.conf b/home/hyprland/hyprland.conf
similarity index 100%
rename from home/desktop/hyprland/hyprland.conf
rename to home/hyprland/hyprland.conf
diff --git a/home/desktop/hyprland/macchiato.conf b/home/hyprland/macchiato.conf
similarity index 100%
rename from home/desktop/hyprland/macchiato.conf
rename to home/hyprland/macchiato.conf
diff --git a/home/desktop/pkgs/candy-icon-theme/default.nix b/home/hyprland/pkgs/candy-icon-theme/default.nix
similarity index 100%
rename from home/desktop/pkgs/candy-icon-theme/default.nix
rename to home/hyprland/pkgs/candy-icon-theme/default.nix
diff --git a/home/desktop/pkgs/delta-icon-theme/default.nix b/home/hyprland/pkgs/delta-icon-theme/default.nix
similarity index 100%
rename from home/desktop/pkgs/delta-icon-theme/default.nix
rename to home/hyprland/pkgs/delta-icon-theme/default.nix
diff --git a/home/desktop/pkgs/rot8/default.nix b/home/hyprland/pkgs/rot8/default.nix
similarity index 100%
rename from home/desktop/pkgs/rot8/default.nix
rename to home/hyprland/pkgs/rot8/default.nix
diff --git a/home/desktop/pkgs/sweet-folder-theme/default.nix b/home/hyprland/pkgs/sweet-folder-theme/default.nix
similarity index 100%
rename from home/desktop/pkgs/sweet-folder-theme/default.nix
rename to home/hyprland/pkgs/sweet-folder-theme/default.nix
diff --git a/home/desktop/rofi/catppuccin-macchiato.rasi b/home/hyprland/rofi/catppuccin-macchiato.rasi
similarity index 100%
rename from home/desktop/rofi/catppuccin-macchiato.rasi
rename to home/hyprland/rofi/catppuccin-macchiato.rasi
diff --git a/home/desktop/rofi/default.nix b/home/hyprland/rofi/default.nix
similarity index 100%
rename from home/desktop/rofi/default.nix
rename to home/hyprland/rofi/default.nix
diff --git a/home/desktop/scripts/power-profiles b/home/hyprland/scripts/power-profiles
similarity index 100%
rename from home/desktop/scripts/power-profiles
rename to home/hyprland/scripts/power-profiles
diff --git a/home/desktop/scripts/powermenu b/home/hyprland/scripts/powermenu
similarity index 95%
rename from home/desktop/scripts/powermenu
rename to home/hyprland/scripts/powermenu
index 111eec7c..e4600ef2 100644
--- a/home/desktop/scripts/powermenu
+++ b/home/hyprland/scripts/powermenu
@@ -113,12 +113,12 @@ typeset -A menu
 # Menu with keys/commands
 
 menu=(
-[ Shutdown]="systemctl poweroff"
-[ Reboot]="systemctl reboot"
-[ Suspend]="systemctl suspend"
-[ Hibernate]="systemctl hibernate"
-[ Lock]="xfce4-screensaver-command --lock"
-[ Logout]="xfce4-session-logout"
+[ Shutdown]="shutdown now"
+[ Reboot]="reboot"
+[ Suspend]=""  # TODO
+[ Hibernate]=""  # TODO
+[ Lock]="swaylock"
+[ Logout]="hyprctl dispatch exit"
 [ Cancel]=""
 )
 
diff --git a/home/desktop/swaylock.nix b/home/hyprland/swaylock.nix
similarity index 100%
rename from home/desktop/swaylock.nix
rename to home/hyprland/swaylock.nix
diff --git a/home/desktop/waybar/default.nix b/home/hyprland/waybar/default.nix
similarity index 100%
rename from home/desktop/waybar/default.nix
rename to home/hyprland/waybar/default.nix
diff --git a/home/desktop/waybar/modules/backlight.nix b/home/hyprland/waybar/modules/backlight.nix
similarity index 100%
rename from home/desktop/waybar/modules/backlight.nix
rename to home/hyprland/waybar/modules/backlight.nix
diff --git a/home/desktop/waybar/modules/battery.compact.nix b/home/hyprland/waybar/modules/battery.compact.nix
similarity index 100%
rename from home/desktop/waybar/modules/battery.compact.nix
rename to home/hyprland/waybar/modules/battery.compact.nix
diff --git a/home/desktop/waybar/modules/battery.nix b/home/hyprland/waybar/modules/battery.nix
similarity index 100%
rename from home/desktop/waybar/modules/battery.nix
rename to home/hyprland/waybar/modules/battery.nix
diff --git a/home/desktop/waybar/modules/bluetooth.compact.nix b/home/hyprland/waybar/modules/bluetooth.compact.nix
similarity index 100%
rename from home/desktop/waybar/modules/bluetooth.compact.nix
rename to home/hyprland/waybar/modules/bluetooth.compact.nix
diff --git a/home/desktop/waybar/modules/bluetooth.nix b/home/hyprland/waybar/modules/bluetooth.nix
similarity index 100%
rename from home/desktop/waybar/modules/bluetooth.nix
rename to home/hyprland/waybar/modules/bluetooth.nix
diff --git a/home/desktop/waybar/modules/cava.nix b/home/hyprland/waybar/modules/cava.nix
similarity index 100%
rename from home/desktop/waybar/modules/cava.nix
rename to home/hyprland/waybar/modules/cava.nix
diff --git a/home/desktop/waybar/modules/clock.compact.nix b/home/hyprland/waybar/modules/clock.compact.nix
similarity index 100%
rename from home/desktop/waybar/modules/clock.compact.nix
rename to home/hyprland/waybar/modules/clock.compact.nix
diff --git a/home/desktop/waybar/modules/clock.nix b/home/hyprland/waybar/modules/clock.nix
similarity index 100%
rename from home/desktop/waybar/modules/clock.nix
rename to home/hyprland/waybar/modules/clock.nix
diff --git a/home/desktop/waybar/modules/cpu.nix b/home/hyprland/waybar/modules/cpu.nix
similarity index 100%
rename from home/desktop/waybar/modules/cpu.nix
rename to home/hyprland/waybar/modules/cpu.nix
diff --git a/home/desktop/waybar/modules/hyprland_window.nix b/home/hyprland/waybar/modules/hyprland_window.nix
similarity index 100%
rename from home/desktop/waybar/modules/hyprland_window.nix
rename to home/hyprland/waybar/modules/hyprland_window.nix
diff --git a/home/desktop/waybar/modules/keyboard-state.nix b/home/hyprland/waybar/modules/keyboard-state.nix
similarity index 100%
rename from home/desktop/waybar/modules/keyboard-state.nix
rename to home/hyprland/waybar/modules/keyboard-state.nix
diff --git a/home/desktop/waybar/modules/memory.nix b/home/hyprland/waybar/modules/memory.nix
similarity index 100%
rename from home/desktop/waybar/modules/memory.nix
rename to home/hyprland/waybar/modules/memory.nix
diff --git a/home/desktop/waybar/modules/network.compact.nix b/home/hyprland/waybar/modules/network.compact.nix
similarity index 100%
rename from home/desktop/waybar/modules/network.compact.nix
rename to home/hyprland/waybar/modules/network.compact.nix
diff --git a/home/desktop/waybar/modules/network.nix b/home/hyprland/waybar/modules/network.nix
similarity index 100%
rename from home/desktop/waybar/modules/network.nix
rename to home/hyprland/waybar/modules/network.nix
diff --git a/home/desktop/waybar/modules/pulseaudio.compact.nix b/home/hyprland/waybar/modules/pulseaudio.compact.nix
similarity index 100%
rename from home/desktop/waybar/modules/pulseaudio.compact.nix
rename to home/hyprland/waybar/modules/pulseaudio.compact.nix
diff --git a/home/desktop/waybar/modules/pulseaudio.nix b/home/hyprland/waybar/modules/pulseaudio.nix
similarity index 100%
rename from home/desktop/waybar/modules/pulseaudio.nix
rename to home/hyprland/waybar/modules/pulseaudio.nix
diff --git a/home/desktop/waybar/modules/separator.nix b/home/hyprland/waybar/modules/separator.nix
similarity index 100%
rename from home/desktop/waybar/modules/separator.nix
rename to home/hyprland/waybar/modules/separator.nix
diff --git a/home/desktop/waybar/modules/temperature.nix b/home/hyprland/waybar/modules/temperature.nix
similarity index 100%
rename from home/desktop/waybar/modules/temperature.nix
rename to home/hyprland/waybar/modules/temperature.nix
diff --git a/home/desktop/waybar/modules/tray.nix b/home/hyprland/waybar/modules/tray.nix
similarity index 100%
rename from home/desktop/waybar/modules/tray.nix
rename to home/hyprland/waybar/modules/tray.nix
diff --git a/home/desktop/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix
similarity index 100%
rename from home/desktop/waybar/modules/wlr_workspaces.nix
rename to home/hyprland/waybar/modules/wlr_workspaces.nix
diff --git a/home/desktop/waybar/style.css b/home/hyprland/waybar/style.css
similarity index 100%
rename from home/desktop/waybar/style.css
rename to home/hyprland/waybar/style.css
diff --git a/home/desktop/waybar/styles/colourful_bubbles.css b/home/hyprland/waybar/styles/colourful_bubbles.css
similarity index 100%
rename from home/desktop/waybar/styles/colourful_bubbles.css
rename to home/hyprland/waybar/styles/colourful_bubbles.css
diff --git a/home/env/bash.nix b/home/shell/bash.nix
similarity index 92%
rename from home/env/bash.nix
rename to home/shell/bash.nix
index 4a764d53..e150c94c 100644
--- a/home/env/bash.nix
+++ b/home/shell/bash.nix
@@ -1,4 +1,5 @@
 {...}: {
+  imports = [./default.nix];
   programs = {
     bash.enable = true;
     readline = {
@@ -8,9 +9,9 @@
         set completion-ignore-case On
       '';
     };
-    keychain.enableBashIntegration = true;
-    starship.enableBashIntegration = true;
     direnv.enableBashIntegration = true;
     fzf.enableBashIntegration = true;
+    keychain.enableBashIntegration = true;
+    starship.enableBashIntegration = true;
   };
 }
diff --git a/home/env/config/pypoetry/config.toml b/home/shell/config/pypoetry/config.toml
similarity index 100%
rename from home/env/config/pypoetry/config.toml
rename to home/shell/config/pypoetry/config.toml
diff --git a/home/shell/default.nix b/home/shell/default.nix
new file mode 100644
index 00000000..148b4674
--- /dev/null
+++ b/home/shell/default.nix
@@ -0,0 +1,34 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
+  programs = {
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+    fzf = {
+      enable = true;
+      colors = {
+        fg = "-1";
+        bg = "-1";
+        hl = "#c678dd";
+        "fg+" = "#ffffff";
+        "bg+" = "#4b5263";
+        "hl+" = "#d858fe";
+        info = "#98c379";
+        prompt = "#61afef";
+        pointer = "#be5046";
+        marker = "#e5c07b";
+        spinner = "#61afef";
+        header = "#61afef";
+      };
+    };
+    keychain = {
+      enable = true;
+      extraFlags = ["--quiet" "--noask" "--ignore-missing"];
+      keys = ["id_rsa" "id_ed25519"];
+      enableXsessionIntegration = true;
+    };
+    starship.enable = true;
+  };
+  xdg.configFile."starship.toml".source = ./starship.toml;
+}
diff --git a/home/env/fish.nix b/home/shell/fish.nix
similarity index 90%
rename from home/env/fish.nix
rename to home/shell/fish.nix
index 5c97ee75..3e445bd7 100644
--- a/home/env/fish.nix
+++ b/home/shell/fish.nix
@@ -1,4 +1,5 @@
 {pkgs, ...}: {
+  imports = [./default.nix];
   programs = {
     fish = {
       enable = true;
@@ -17,8 +18,9 @@
         }
       ];
     };
+    direnv.enableFishIntegration = true;
+    fzf.enableFishIntegration = true;
     keychain.enableFishIntegration = true;
     starship.enableFishIntegration = true;
-    fzf.enableFishIntegration = true;
   };
 }
diff --git a/home/shell/nushell.nix b/home/shell/nushell.nix
new file mode 100644
index 00000000..0e5a7721
--- /dev/null
+++ b/home/shell/nushell.nix
@@ -0,0 +1,9 @@
+{...}: {
+  imports = [./default.nix];
+  programs = {
+    nushell.enable = true;
+    direnv.enableNushellIntegration = true;
+    keychain.enableNushellIntegration = true;
+    starship.enableNushellIntegration = true;
+  };
+}
diff --git a/home/env/config/starship.toml b/home/shell/starship.toml
similarity index 100%
rename from home/env/config/starship.toml
rename to home/shell/starship.toml
diff --git a/home/env/zsh.nix b/home/shell/zsh.nix
similarity index 94%
rename from home/env/zsh.nix
rename to home/shell/zsh.nix
index 53b6edd3..9f443738 100644
--- a/home/env/zsh.nix
+++ b/home/shell/zsh.nix
@@ -1,4 +1,5 @@
 {config, ...}: {
+  imports = [./default.nix];
   programs = {
     zsh = {
       enable = true;
@@ -11,9 +12,9 @@
       historySubstringSearch.enable = true;
       history.path = "${config.xdg.dataHome}/zsh/history";
     };
-    keychain.enableZshIntegration = true;
-    starship.enableZshIntegration = true;
     direnv.enableZshIntegration = true;
     fzf.enableZshIntegration = true;
+    keychain.enableZshIntegration = true;
+    starship.enableZshIntegration = true;
   };
 }
diff --git a/home/tui/default.nix b/home/tui/default.nix
index c4929cd4..b354fad4 100644
--- a/home/tui/default.nix
+++ b/home/tui/default.nix
@@ -1 +1,95 @@
-{...}: {imports = [./neovim.nix ./lazygit.nix];}
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    git
+    curl
+    gnutar
+    gnumake
+    gnused
+    gcc
+    fzf
+    ripgrep
+    tree-sitter
+  ];
+  programs = {
+    neovim = {
+      enable = true;
+      package = pkgs.neovim-nightly;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      withNodeJs = true;
+      withRuby = true;
+      withPython3 = true;
+      extraPackages = with pkgs; [
+        # Language servers
+        nil
+        lua-language-server
+        fortls
+        nodePackages.pyright
+        nodePackages.yaml-language-server
+        nodePackages.vim-language-server
+        nodePackages.bash-language-server
+
+        # Null LSP formatters
+        alejandra
+        beautysh
+        black
+        nodePackages.fixjson
+        fprettify
+        isort
+        python3Packages.mdformat
+        shellharden
+        stylua
+      ];
+    };
+    lazygit = {
+      enable = true;
+      settings = {
+        gui = {
+          showFileTree = true;
+          showCommandLog = false;
+          showIcons = true;
+          theme = {
+            lightTheme = false;
+            activeBorderColor = ["#a6da95" "bold"];
+            inactiveBorderColor = ["#cad3f5"];
+            optionsTextColor = ["#8aadf4"];
+            selectedLineBgColor = ["#363a4f"];
+            selectedRangeBgColor = ["#363a4f"];
+            cherryPickedCommitBgColor = ["#8bd5ca"];
+            cherryPickedCommitFgColor = ["#8aadf4"];
+            unstagedChangesColor = ["red"];
+          };
+        };
+        update.method = "never";
+        promptToReturnFromSubprocess = false;
+        notARepository = "quit";
+      };
+    };
+    bat = {
+      enable = true;
+      config = {
+        theme = "tokyonight";
+      };
+      themes = {
+        tokyonight = builtins.readFile (pkgs.fetchFromGitHub
+          {
+            owner = "folke";
+            repo = "tokyonight.nvim";
+            rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
+            sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
+          }
+          + "/extras/sublime/tokyonight_night.tmTheme");
+        Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
+          {
+            owner = "catppuccin";
+            repo = "bat";
+            rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+            sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+          }
+          + "/Catppuccin-macchiato.tmTheme");
+      };
+    };
+  };
+}
diff --git a/home/tui/lazygit.nix b/home/tui/lazygit.nix
deleted file mode 100644
index fc9def34..00000000
--- a/home/tui/lazygit.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{...}: {
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      gui = {
-        showFileTree = true;
-        showCommandLog = false;
-        showIcons = true;
-        theme = {
-          lightTheme = false;
-          activeBorderColor = ["#a6da95" "bold"];
-          inactiveBorderColor = ["#cad3f5"];
-          optionsTextColor = ["#8aadf4"];
-          selectedLineBgColor = ["#363a4f"];
-          selectedRangeBgColor = ["#363a4f"];
-          cherryPickedCommitBgColor = ["#8bd5ca"];
-          cherryPickedCommitFgColor = ["#8aadf4"];
-          unstagedChangesColor = ["red"];
-        };
-      };
-      update.method = "never";
-      promptToReturnFromSubprocess = false;
-      notARepository = "quit";
-    };
-  };
-}
diff --git a/home/tui/neovim.nix b/home/tui/neovim.nix
deleted file mode 100644
index 131997c8..00000000
--- a/home/tui/neovim.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    git
-    curl
-    gnutar
-    gnumake
-    gnused
-    gcc
-    fzf
-    ripgrep
-    tree-sitter
-  ];
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-    withNodeJs = true;
-    withRuby = true;
-    withPython3 = true;
-    extraPackages = with pkgs; [
-      # Language servers
-      nil
-      lua-language-server
-      fortls
-      nodePackages.pyright
-      nodePackages.yaml-language-server
-      nodePackages.vim-language-server
-      nodePackages.bash-language-server
-
-      # Null LSP formatters
-      alejandra
-      beautysh
-      black
-      nodePackages.fixjson
-      fprettify
-      isort
-      python3Packages.mdformat
-      shellharden
-      stylua
-    ];
-  };
-}
diff --git a/home/tui/tmux.nix b/home/tui/tmux.nix
deleted file mode 100644
index 927f1ce8..00000000
--- a/home/tui/tmux.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{pkgs, ...}: {
-  programs.tmux = {
-    enable = true;
-    clock24 = true;
-    extraConfig = builtins.readFile (
-      pkgs.fetchFromGitHub
-      {
-        owner = "catppuccin";
-        repo = "tmux";
-        rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
-        sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
-      }
-      + "/catppuccin-macchiato.tmuxtheme"
-    );
-  };
-}
diff --git a/home/gui/wezterm/default.nix b/home/wezterm/default.nix
similarity index 100%
rename from home/gui/wezterm/default.nix
rename to home/wezterm/default.nix
diff --git a/home/gui/wezterm/key_tables.lua b/home/wezterm/key_tables.lua
similarity index 100%
rename from home/gui/wezterm/key_tables.lua
rename to home/wezterm/key_tables.lua
diff --git a/home/gui/wezterm/keys.lua b/home/wezterm/keys.lua
similarity index 100%
rename from home/gui/wezterm/keys.lua
rename to home/wezterm/keys.lua
diff --git a/home/gui/wezterm/status.lua b/home/wezterm/status.lua
similarity index 100%
rename from home/gui/wezterm/status.lua
rename to home/wezterm/status.lua
diff --git a/home/gui/wezterm/tab_bar_style.lua b/home/wezterm/tab_bar_style.lua
similarity index 100%
rename from home/gui/wezterm/tab_bar_style.lua
rename to home/wezterm/tab_bar_style.lua
diff --git a/home/gui/wezterm/wezterm.lua b/home/wezterm/wezterm.lua
similarity index 100%
rename from home/gui/wezterm/wezterm.lua
rename to home/wezterm/wezterm.lua
diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix
index e064ff6b..d22d5126 100644
--- a/hosts/Legion/configuration.nix
+++ b/hosts/Legion/configuration.nix
@@ -1,20 +1,22 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running `nixos-help`).
-{pkgs, ...}: {
+{userConfig, ...}: let
+  user = "xenia";
+  hostName = "Legion";
+in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../common.nix
-    ../../services/Legion.nix
+    ../../services/${hostName}.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-
   networking = {
-    hostName = "Legion"; # Define your hostname.
+    hostName = hostName; # Define your hostname.
     nameservers = ["192.168.1.230" "127.0.0.1" "9.9.9.9"];
   };
   system.autoUpgrade = {
@@ -25,15 +27,7 @@
       upper = "05:00";
     };
   };
-
-  users.users.xenia = {
-    isNormalUser = true;
-    description = "Evie Litherland-Smith";
-    extraGroups = ["networkmanager" "wheel"];
-    shell = pkgs.fish;
-    openssh.authorizedKeys.keys = import ../../auth/authorized_keys.nix;
-  };
-  home-manager.users.xenia = import ./home.nix;
+  users.users.${user} = userConfig;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/hosts/Legion/default.nix b/hosts/Legion/default.nix
deleted file mode 100644
index e5cd8b02..00000000
--- a/hosts/Legion/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{...}: {imports = [./configuration.nix];}
diff --git a/hosts/Legion/home.nix b/hosts/Legion/home.nix
index fc03739a..2e65b28d 100644
--- a/hosts/Legion/home.nix
+++ b/hosts/Legion/home.nix
@@ -1,8 +1,15 @@
-{...}: {
-  imports = [../../home/personal.nix];
+{pkgs, ...}: let
+  username = "xenia";
+  homeDirectory = "/home/${username}";
+in {
+  imports = [
+    ../../home/shell/fish.nix
+    ../../home/git/personal.nix
+    ../../home/ssh/personal.nix
+  ];
   home = {
-    username = "xenia";
-    homeDirectory = "/home/xenia";
+    inherit username homeDirectory;
     stateVersion = "22.11";
   };
+  programs.neovim.package = pkgs.neovim-nightly;
 }
diff --git a/hosts/Monarch/home.nix b/hosts/Monarch/home.nix
new file mode 100644
index 00000000..b0786817
--- /dev/null
+++ b/hosts/Monarch/home.nix
@@ -0,0 +1,26 @@
+{pkgs, ...}: let
+  username = "tux";
+  homeDirectory = "/Users/${username}";
+in {
+  imports = [
+    ../../home/shell/zsh.nix
+    ../../home/git/personal.nix
+    ../../home/ssh/personal.nix
+    ../../home/wezterm.nix
+  ];
+  home = {
+    inherit username homeDirectory;
+    stateVersion = "23.05";
+    packages = [pkgs.gcc];
+  };
+  programs = {
+    home-manager.enable = true;
+    zsh = {
+      sessionVariables.CC = "${pkgs.gcc}/bin/gcc";
+      envExtra = ''
+        eval "$(/opt/homebrew/bin/brew shellenv)"
+      '';
+    };
+  };
+  services.syncthing.enable = true;
+}
diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix
index 6f158309..2fab9658 100644
--- a/hosts/Ronin/configuration.nix
+++ b/hosts/Ronin/configuration.nix
@@ -1,18 +1,15 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{pkgs, ...}: let
-  greetd_session = {
-    user = "elitherl";
-    command = "Hyprland";
-  };
+{userConfig, ...}: let
+  user = "elitherl";
+  hostName = "Ronin";
 in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../common.nix
     ../desktop.nix
-    ../../services/syncthing/Ronin.nix
+    ../../services/${hostName}.nix
   ];
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -27,27 +24,15 @@ in {
   boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".device = "/dev/disk/by-uuid/761eeb11-3091-4142-9232-4fb33165eccd";
   boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".keyFile = "/crypto_keyfile.bin";
 
-  networking.hostName = "Ronin"; # Define your hostname.
+  networking.hostName = hostName; # Define your hostname.
   hardware.bluetooth.enable = true;
   environment.etc."ppp/options".text = ''
     ipcp-accept-remote
   '';
-  system.autoUpgrade.allowReboot = false;
-
-  users.users.elitherl = {
-    isNormalUser = true;
-    description = "Evie Litherland-Smith";
-    extraGroups = ["networkmanager" "wheel"];
-    shell = pkgs.fish;
-  };
-  home-manager.users.elitherl = import ./home.nix;
-  programs.hyprland.enable = true;
-  services.greetd = {
-    enable = true;
-    settings = {
-      initial_session = greetd_session;
-      default_session = greetd_session;
-    };
+  users.users.${user} = userConfig;
+  services.greetd.settings = {
+    initial_session.user = user;
+    default_session.user = user;
   };
 
   # This value determines the NixOS release from which the default
diff --git a/hosts/Ronin/default.nix b/hosts/Ronin/default.nix
deleted file mode 100644
index e5cd8b02..00000000
--- a/hosts/Ronin/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{...}: {imports = [./configuration.nix];}
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index bc564e23..4c717684 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -2,25 +2,31 @@
   pkgs,
   inputs,
   ...
-}: {
+}: let
+  username = "elitherl";
+  homeDirectory = "/home/${username}";
+in {
   imports = [
     inputs.hyprland.homeManagerModules.default
-    # ../../pkgs/eww-hyprland
+    ../../home/shell/fish.nix
+    ../../home/git/work.nix
+    ../../home/ssh/work.nix
     ../../home/desktop/hyprland
     ../../home/desktop/waybar
-    ../../home/gui
-    ../../home/work.nix
+    ../../home/firefox/work.nix
+    ../../home/wezterm
   ];
   home = {
-    username = "elitherl";
-    homeDirectory = "/home/elitherl";
+    inherit username homeDirectory;
     stateVersion = "22.11";
+    packages = with pkgs; [
+      openfortivpn
+      nomachine-client
+      teams-for-linux
+      zoom-us
+    ];
   };
   programs.neovim.package = pkgs.neovim-nightly;
-  # programs.eww-hyprland = {
-  #   enable = true;
-  #   package = pkgs.eww-wayland;
-  # };
   xdg.configFile."hypr/display.conf".text = ''
     monitor=desc:Iiyama North America PLB2403WS 0574281251316,1920x1200@60,0x185,1
     monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,1920x1080@60,1920x0,1,transform,1
diff --git a/hosts/Vanguard/configuration.nix b/hosts/Vanguard/configuration.nix
index 3a32f465..91c3f2ca 100644
--- a/hosts/Vanguard/configuration.nix
+++ b/hosts/Vanguard/configuration.nix
@@ -1,36 +1,34 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{pkgs, ...}: let
-  greetd_session = {
-    user = "xenia";
-    command = "Hyprland";
-  };
+{
+  pkgs,
+  userConfig,
+  ...
+}: let
+  user = "xenia";
+  hostName = "Vanguard";
 in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../common.nix
     ../desktop.nix
-    ../../services/sshd
-    ../../services/syncthing/Vanguard.nix
+    ../../services/${hostName}.nix
   ];
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.hostName = "Vanguard"; # Define your hostname.
-  networking.nameservers = ["192.168.1.230" "9.9.9.9"];
-
-  hardware.bluetooth.enable = true;
-  hardware.opengl.driSupport32Bit = true;
-
-  system.autoUpgrade.allowReboot = false;
+  networking = {
+    hostName = hostName; # Define your hostname.
+    nameservers = ["192.168.1.230" "9.9.9.9"];
+  };
+  hardware = {
+    bluetooth.enable = true;
+    opengl.driSupport32Bit = true;
+    steam-hardware.enable = true;
+  };
   environment.systemPackages = with pkgs; [mesa];
-
-  # Config for steam
-  hardware.steam-hardware.enable = true;
   programs = {
     xwayland.enable = true;
     hyprland.enable = true;
@@ -45,20 +43,12 @@ in {
     };
   };
 
-  users.users.xenia = {
-    isNormalUser = true;
-    description = "Evie Litherland-Smith";
-    extraGroups = ["networkmanager" "wheel"];
-    shell = pkgs.fish;
-    openssh.authorizedKeys.keys = import ../../auth/authorized_keys.nix;
-  };
-  home-manager.users.xenia = import ./home.nix;
-
+  users.users.${user} = userConfig;
   services.greetd = {
     enable = true;
     settings = {
-      default_session = greetd_session;
-      initial_session = greetd_session;
+      default_session.user = user;
+      initial_session.user = user;
     };
   };
 
diff --git a/hosts/Vanguard/default.nix b/hosts/Vanguard/default.nix
deleted file mode 100644
index e5cd8b02..00000000
--- a/hosts/Vanguard/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{...}: {imports = [./configuration.nix];}
diff --git a/hosts/Vanguard/home.nix b/hosts/Vanguard/home.nix
index 3aeae43b..de2708c2 100644
--- a/hosts/Vanguard/home.nix
+++ b/hosts/Vanguard/home.nix
@@ -1,18 +1,15 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: let
+  username = "xenia";
+  homeDirectory = "/home/${username}";
+in {
   imports = [
-    inputs.hyprland.homeManagerModules.default
-    ../../home/personal.nix
-    ../../home/desktop/hyprland
-    ../../home/desktop/waybar
-    ../../home/gui
+    ../../home/shell/fish.nix
+    ../../home/git/personal.nix
+    ../../home/ssh/personal.nix
+    ../../home/hyprland
   ];
   home = {
-    username = "xenia";
-    homeDirectory = "/home/xenia";
+    inherit username homeDirectory;
     stateVersion = "22.11";
   };
   programs.neovim.package = pkgs.neovim-nightly;
diff --git a/hosts/common.nix b/hosts/common.nix
index e7404bca..f5fb61bc 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [inputs.home-manager.nixosModules.home-manager];
+{pkgs, ...}: {
   nix = {
     settings.experimental-features = ["nix-command" "flakes"];
     gc = {
@@ -27,13 +22,11 @@
     ssh.startAgent = true;
     dconf.enable = true;
     fish.enable = true;
-    zsh.enable = true;
   };
   fonts = {
     fonts = with pkgs; [
       # icon fonts
       material-symbols
-
       # normal fonts
       jost
       lexend
@@ -41,11 +34,9 @@
       noto-fonts-cjk
       noto-fonts-emoji
       roboto
-
       # nerdfonts
       (nerdfonts.override {fonts = ["FiraCode"];})
     ];
-
     # use fonts specified by user rather than default ones
     enableDefaultFonts = false;
     fontconfig = {
@@ -61,6 +52,12 @@
       };
     };
   };
+  environment.systemPackages = with pkgs; [
+    dig
+    gnumake
+    silver-searcher
+    distrobox
+  ];
   environment = {
     localBinInPath = true;
     shellAliases = {
@@ -69,43 +66,26 @@
       gg = "nvim +Neogit";
     };
   };
-
   services.xserver = {
     layout = "gb";
     xkbVariant = "";
   };
   console.keyMap = "uk";
-
   # Set your time zone.
   time.timeZone = "Europe/London";
-
-  # Select internationalisation properties.
-  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";
-  };
-
-  # Home manager common configuration
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = false;
-    extraSpecialArgs = {inputs = inputs;};
-    users.root = {
-      # imports = [common.home.env];
-      home = {
-        username = "root";
-        homeDirectory = "/root";
-        stateVersion = "22.11";
-      };
+  i18n = {
+    # Select internationalisation properties.
+    defaultLocale = "en_GB.UTF-8";
+    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";
     };
   };
 }
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 11483510..e6d76ad5 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -12,6 +12,9 @@
     pavucontrol
     grim
     slurp
+    signal-desktop
+    libreoffice
+    zotero
   ];
   security = {
     pam.services.swaylock = {};
@@ -29,8 +32,16 @@
     blueman.enable = true;
     gvfs.enable = true;
     tumbler.enable = true;
+    greetd = {
+      enable = true;
+      settings = {
+        default_session.command = "Hyprland";
+        initial_session.command = "Hyprland";
+      };
+    };
   };
   programs = {
+    hyprland.enable = true;
     thunar = {
       enable = true;
       plugins = with pkgs.xfce; [
diff --git a/pkgs/eww-hyprland/README.md b/pkgs/eww-hyprland/README.md
deleted file mode 100644
index 66b304cf..00000000
--- a/pkgs/eww-hyprland/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Eww configuration
-
-This configuration aims to provide a shell replacement for compositors/window
-managers. Features constantly get added and existing ones get improved.
-
-## 🗃️  Components
-
-The same daemon runs multiple windows which interact with each other:
-
-### bar
-
-![bar](https://github.com/fufexan/dotfiles/assets/36706276/c3339908-029c-4e56-88c5-e620dc8ce00d)
-
-### music window
-
-![music](https://github.com/fufexan/dotfiles/assets/36706276/4260362b-8c69-417e-94c0-1436dc9febf9)
-
-### calendar
-
-![calendar](https://github.com/fufexan/dotfiles/assets/36706276/ddf2a40d-f758-4072-ac14-2c254cb9393a)
-
-### system info
-
-![system](https://github.com/fufexan/dotfiles/assets/36706276/723fd8fe-538c-41a5-bcbf-218304dc3bdf)
-
-## ❔ Usage
-
-### Home Manager
-
-If you use Home Manager, installing is as simple as adding my flake to your
-inputs, passing `inputs` to `extraSpecialArgs` and importing the relevant
-module:
-```nix
-{inputs, pkgs, ...}: {
-  imports = [inputs.fufexan.homeManagerModules.eww-hyprland];
-
-  programs.eww-hyprland = {
-    enable = true;
-
-    # default package
-    package = pkgs.eww-wayland;
-
-    # if you want to change colors
-    colors = builtins.readFile ./latte.scss;
-
-    # set to true to reload on change
-    autoReload = false; 
-  };
-}
-```
-
-Make sure to also add the fonts listed below. You can simply search where
-they are in my config.
-
-### Other distros
-
-To quickly install this config, grab all the files in this directory and put
-them in `~/.config/eww`. Then run `eww daemon` and `eww open bar`. Enjoy!
-
-Dependencies:
-- Icon fonts: [Material Symbols Outlined](https://github.com/google/material-design-icons/tree/master/variablefont)
-(any variation can be used as long as you change the `font-family` property of `.icon`)
-- Text font: [Product Sans](https://befonts.com/product-sans-font.html)
-- Script deps: everything in `default.nix`'s `dependencies` list.
-
-## 🎨 Theme
-
-The theme colors can be changed in `css/_colors.scss`. Currently the theme used
-is [Catppuccin Mocha](https://github.com/catppuccin/catppuccin).
diff --git a/pkgs/eww-hyprland/css/_calendar.scss b/pkgs/eww-hyprland/css/_calendar.scss
deleted file mode 100644
index 8e079d73..00000000
--- a/pkgs/eww-hyprland/css/_calendar.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-.calendar-win {
-  padding: .2em;
-  @include window;
-}
-
-calendar {
-  padding: 5px;
-
-  :selected {
-    color: $mauve;
-  }
-
-  .header {
-    color: $subtext1;
-  }
-
-  .highlight {
-    color: $maroon;
-    font-weight: bold;
-  }
-
-  .button {
-    color: $sapphire;
-  }
-
-  :indeterminate {
-    color: $overlay0;
-  }
-}
diff --git a/pkgs/eww-hyprland/css/_colors.scss b/pkgs/eww-hyprland/css/_colors.scss
deleted file mode 100644
index f8997817..00000000
--- a/pkgs/eww-hyprland/css/_colors.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-$rosewater:   #f5e0dc;
-$flamingo:    #f2cdcd;
-$pink:        #f5c2e7;
-$mauve:       #cba6f7;
-$red:         #f38ba8;
-$maroon:      #eba0ac;
-$peach:       #fab387;
-$yellow:      #f9e2af;
-$green:       #a6e3a1;
-$teal:        #94e2d5;
-$sky:         #89dceb;
-$sapphire:    #74c7ec;
-$blue:        #89b4fa;
-$lavender:    #b4befe;
-
-$text:        #cdd6f4;
-$subtext1:    #bac2de;
-$subtext0:    #a6adc8;
-$overlay2:    #9399b2;
-$overlay1:    #7f849c;
-$overlay0:    #6c7086;
-
-$surface2:    #585b70;
-$surface1:    #45475a;
-$surface0:    #313244;
-
-$base:        #1e1e2e;
-$mantle:      #181825;
-$crust:       #11111b;
-
-$fg: $text;
-$bg: rgba(30, 30, 46, 0.6);
-$bg1: rgba(49, 50, 68, 0.6);
-$border: #28283d;
-$shadow: $crust;
diff --git a/pkgs/eww-hyprland/css/_indicators.scss b/pkgs/eww-hyprland/css/_indicators.scss
deleted file mode 100644
index e79d78d2..00000000
--- a/pkgs/eww-hyprland/css/_indicators.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-/* screenshare & mic share indicators */
-.indicators {
-  margin: .3rem;
-  transition: 500ms ease-out;
-
-  :first-child {
-    border-radius: 1rem 0 0 1rem;
-  }
-
-  :last-child {
-    border-radius: 0 1rem 1rem 0;
-  }
-
-  :only-child {
-    border-radius: 1rem;
-  }
-}
-
-.indicator {
-  color: $base;
-  padding: 0 .3rem;
-}
-
-.screenshare { background: $red; }
-.micshare { background: $green; }
-.camerashare { background: $blue; }
diff --git a/pkgs/eww-hyprland/css/_music.scss b/pkgs/eww-hyprland/css/_music.scss
deleted file mode 100644
index 507548fe..00000000
--- a/pkgs/eww-hyprland/css/_music.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-/* module cover art */
-.song-cover-art {
-  background-position: center;
-  background-size: cover;
-  margin: 4px 5px 4px 0;
-  min-height: 24px;
-  min-width: 24px;
-  @include rounding;
-}
-
-/* music window */
-.music-window {
-  border: 1px solid $border;
-  @include window;
-}
-
-/* cover, left child */
-.music-cover-art {
-  background-position: center;
-  background-size: cover;
-  border-radius: 8px;
-  box-shadow: 0 1px 2px -1px rgba(0,0,0,0.4);
-  margin: 1em;
-  min-height: 170px;
-  min-width: 170px;
-}
-
-/* info box, right child */
-.music-box {
-  margin: 1rem 1rem 1rem 0;
-}
-
-.music-title {
-  font-size: 2rem;
-  font-weight: bold;
-  margin: .5rem;
-}
-
-.dark { color: $base; }
-.light { color: $text; }
-
-.music-artist {
-  margin: 1rem;
-}
-
-.music-button-box {
-  margin: 1rem 0 0;
-}
-
-.music-button label {
-  font-size: 2rem;
-}
-
-.music-time {
-  margin: 0 1rem;
-}
-
-.music-bar scale {
-  highlight {
-    background-image: linear-gradient(to right, $teal, $sky);
-    border-radius: 24px;
-  }
-
-  trough {
-    background-color: $bg1;
-    border-radius: 24px;
-    margin-top: 0;
-    min-height: 10px;
-    min-width: 170px;
-  }
-}
diff --git a/pkgs/eww-hyprland/css/_osd.scss b/pkgs/eww-hyprland/css/_osd.scss
deleted file mode 100644
index 1f261274..00000000
--- a/pkgs/eww-hyprland/css/_osd.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-.osd-part {
-  margin: 0 .5rem .5rem;
-  @include window;
-
-  label {
-    color: $text;
-    font-size: 2rem;
-    margin: 0 .1rem 0 .2rem;
-  }
-
-  scale {
-    margin: -.2rem 0;
-  }
-
-  trough {
-    @include rounding;
-    background-color: $bg1;
-    margin: 1rem 0 .5rem;
-    min-height: 10rem;
-    min-width: .7rem;
-
-    highlight {
-      @include rounding;
-      min-width: 0;
-    }
-  }
-}
-
-/* scale highlight gradients for volume & brightness */
-.osd-volume highlight {
-  background-image: linear-gradient(to top, $teal, $sky);
-}
-
-.osd-brightness highlight {
-  background-image: linear-gradient(to top, $yellow, $peach);
-}
diff --git a/pkgs/eww-hyprland/css/_sidebar.scss b/pkgs/eww-hyprland/css/_sidebar.scss
deleted file mode 100644
index 30298ff5..00000000
--- a/pkgs/eww-hyprland/css/_sidebar.scss
+++ /dev/null
@@ -1,137 +0,0 @@
-/* system menu */
-.system-menu-box { @include window; }
-
-/* between net/bt and their arrows */
-.separator {
-  font-size: 1rem;
-}
-
-/* date & time */
-.top-row {
-  margin: 1rem 1.5rem 0;
-
-  .time { font-size: 2rem; }
-
-  .date-box {
-    margin: 0 1rem;
-
-    label { font-size: 1.1rem; }
-
-    .date {
-      background: unset;
-      margin: 0 .5rem 0 0;
-      padding: 0;
-    }
-  }
-}
-
-/* wifi/bt/airplane button boxes */
-.system-row {
-  margin: .5rem .7rem;
-
-  /* the airplane icon is not properly spaced */
-  .airplane-box button {
-    padding: 1rem 3rem;
-  }
-
-  label {
-    font-size: 1rem;
-    margin: 0 .1rem;
-  }
-}
-
-/* wifi/bt/airplane buttons */
-.element {
-  @include rounding;
-  background-color: $bg1;
-  margin: .3rem;
-
-  button {
-    @include rounding;
-    padding: 1rem;
-
-    label {
-      font-size: 1.5rem;
-    }
-
-    &:hover {
-      background-color: rgba(255, 255, 255, 0.1);
-    }
-  }
-}
-
-/* volume & brightness sliders */
-.sliders {
-  @include rounding;
-  background-color: $bg1;
-  margin: .5rem 1rem;
-  padding: .6rem 1rem;
-
-  scale {
-    margin-right: -1rem;
-    min-width: 21.5rem;
-
-    trough { margin-right: 0; }
-  }
-
-  box { margin: .2rem 0; }
-  label { font-size: 1.2rem; }
-}
-
-.volume-slider-box,
-.brightness-slider-box {
-  trough { background-color: $base; }
-}
-
-.volume-bar highlight {
-  @include rounding;
-  background-image: linear-gradient(to right, $teal, $sky);
-}
-
-.brightness-slider-box scale highlight {
-  @include rounding;
-  background-image: linear-gradient(to right, $yellow, $peach);
-}
-
-/* battery & power button */
-.bottom-row {
-  margin: .5rem 1rem;
-
-  .battery-icon {
-    color: $green;
-    font-size: 2rem;
-  }
-
-  .battery-icon .low { color: $red; }
-  .battery-rate { color: $mauve; }
-
-  .battery-status {
-    color: $subtext0;
-    margin: 0 .5rem;
-  }
-
-  button {
-    background-color: $bg1;
-    border-radius: 50%;
-    margin-bottom: .1rem;
-    padding: 0 .5rem;
-
-    label { font-size: 1.5rem; }
-    &:hover { background-color: $bg1; }
-  }
-}
-
-/* set wifi/bt colors and dim buttons when hovering */
-.element {
-  button:hover { background-color: rgba(0, 0, 0, .1); }
-}
-
-.bt-connected {
-  background-color: $blue;
-  color: $crust;
-}
-
-.net-connected {
-  background-color: $mauve;
-  color: $crust;
-}
diff --git a/pkgs/eww-hyprland/css/_system.scss b/pkgs/eww-hyprland/css/_system.scss
deleted file mode 100644
index 44083395..00000000
--- a/pkgs/eww-hyprland/css/_system.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-/* right modules (circular-progress) */
-.cpubar { color: $blue; }
-.membar { color: $peach; }
-.batbar { color: $green; }
-.batbar .low { color: $red; }
-
-.cpubar,
-.membar,
-.batbar { background-color: $bg1; }
-
-.iconmem { color: $peach; }
-.iconcpu { color: $blue; }
-
-.icon-text {
-  font-size: 3rem;
-  padding: .7rem;
-}
-
-/* system box cpu & memory info */
-.sys-text-sub {
-  color: $text;
-}
-
-.sys-text-mem,
-.sys-text-cpu {
-  font-size: 1rem;
-  font-weight: bold;
-}
-
-.sys-icon-mem,
-.sys-icon-cpu {
-  font-size: 1.5rem;
-  margin: 1.5rem;
-}
-
-.system-info-box {
-  @include rounding;
-  background-color: $bg1;
-  margin: .5rem 1rem;
-  padding: .5rem;
-}
-
-.sys-mem,
-.sys-cpu {
-  background-color: $bg;
-}
-
-.sys-icon-mem,
-.sys-text-mem,
-.sys-mem {
-  color: $peach;
-}
-
-.sys-icon-cpu,
-.sys-text-cpu,
-.sys-cpu {
-  color: $blue;
-}
-
-.sys-box {
-  margin: .3em;
-
-  box { margin-left: 1rem; }
-}
diff --git a/pkgs/eww-hyprland/css/_volume.scss b/pkgs/eww-hyprland/css/_volume.scss
deleted file mode 100644
index ca95f1be..00000000
--- a/pkgs/eww-hyprland/css/_volume.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/* bar volume module */
-.vol-icon { color: $green; }
-.volbar highlight {
-  background-image: linear-gradient(to right, $teal, $sky);
-  border-radius: 10px;
-}
diff --git a/pkgs/eww-hyprland/default.nix b/pkgs/eww-hyprland/default.nix
deleted file mode 100644
index 5a0dd2a1..00000000
--- a/pkgs/eww-hyprland/default.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  cfg = config.programs.eww-hyprland;
-
-  dependencies = with pkgs; [
-    cfg.package
-
-    config.wayland.windowManager.hyprland.package
-
-    bash
-    blueberry
-    bluez
-    brillo
-    coreutils
-    dbus
-    findutils
-    gawk
-    gnome.gnome-control-center
-    gnused
-    imagemagick
-    jaq
-    jc
-    libnotify
-    material-symbols
-    networkmanager
-    pavucontrol
-    playerctl
-    procps
-    pulseaudio
-    ripgrep
-    socat
-    udev
-    upower
-    util-linux
-    wget
-    wireplumber
-    wlogout
-  ];
-
-  reload_script = pkgs.writeShellScript "reload_eww" ''
-    windows=$(eww windows | rg '\*' | tr -d '*')
-
-    systemctl --user restart eww.service
-
-    echo $windows | while read -r w; do
-      eww open $w
-    done
-  '';
-in {
-  options.programs.eww-hyprland = {
-    enable = lib.mkEnableOption "eww Hyprland config";
-
-    package = lib.mkOption {
-      type = with lib.types; nullOr package;
-      default = pkgs.eww-wayland;
-      defaultText = lib.literalExpression "pkgs.eww-wayland";
-      description = "Eww package to use.";
-    };
-
-    autoReload = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      defaultText = lib.literalExpression "false";
-      description = "Whether to restart the eww daemon and windows on change.";
-    };
-
-    colors = lib.mkOption {
-      type = with lib.types; nullOr lines;
-      default = null;
-      defaultText = lib.literalExpression "null";
-      description = ''
-        SCSS file with colors defined in the same way as Catppuccin colors are,
-        to be used by eww.
-
-        Defaults to Catppuccin Mocha.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [cfg.package];
-
-    # remove nix files
-    xdg.configFile."eww" = {
-      source = lib.cleanSourceWith {
-        filter = name: _type: let
-          baseName = baseNameOf (toString name);
-        in
-          !(lib.hasSuffix ".nix" baseName) && (baseName != "_colors.scss");
-        src = lib.cleanSource ./.;
-      };
-
-      # links each file individually, which lets us insert the colors file separately
-      recursive = true;
-
-      onChange =
-        if cfg.autoReload
-        then reload_script.outPath
-        else "";
-    };
-
-    # colors file
-    xdg.configFile."eww/css/_colors.scss".text =
-      if cfg.colors != null
-      then cfg.colors
-      else (builtins.readFile ./css/_colors.scss);
-
-    systemd.user.services.eww = {
-      Unit = {
-        Description = "Eww Daemon";
-        # not yet implemented
-        # PartOf = ["tray.target"];
-        PartOf = ["graphical-session.target"];
-      };
-      Service = {
-        Environment = "PATH=/run/wrappers/bin:${lib.makeBinPath dependencies}";
-        ExecStart = "${cfg.package}/bin/eww daemon --no-daemonize";
-        Restart = "on-failure";
-      };
-      Install.WantedBy = ["graphical-session.target"];
-    };
-  };
-}
diff --git a/pkgs/eww-hyprland/eww.scss b/pkgs/eww-hyprland/eww.scss
deleted file mode 100644
index 3089fd86..00000000
--- a/pkgs/eww-hyprland/eww.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-@import 'css/colors';
-
-@mixin rounding {
-  border-radius: 16px;
-}
-
-@mixin window {
-  background-color: $bg;
-  background-position: center;
-  background-size: cover;
-  border: 1px solid rgba(0,0,0,0.3);
-  color: $fg;
-  margin: 5px 5px 10px;
-  @include rounding;
-}
-
-* {
-  all: unset;
-  font-family: "Product Sans", Roboto, sans-serif;
-  transition: 200ms ease;
-}
-
-@import 'css/calendar';
-@import 'css/indicators';
-@import 'css/music';
-@import 'css/osd';
-@import 'css/sidebar';
-@import 'css/system';
-@import 'css/volume';
-
-.bar0,
-.bar1,
-.bar2 {
-  background-color: $bg;
-  color: $fg;
-
-  label {
-    font-size: 1.2rem;
-  }
-
-  .text {
-    margin-top: .2rem;
-  }
-}
-
-tooltip {
-  background: $bg;
-  border: 1px solid $border;
-  border-radius: 8px;
-
-  label {
-    font-size: 1rem;
-  }
-}
-
-/* icon font */
-.icon,
-.icon label { font-family: Material Symbols Outlined; }
-
-.module { margin: 0 5px; }
-
-/* date & time */
-.hour {
-  font-weight: bold;
-  padding-left: 5px;
-}
-
-.minute {
-  padding-right: .7rem;
-}
-
-.date {
-  color: $flamingo;
-
-  label {
-    font-size: 1.2rem;
-  }
-}
-
-/* right-aligned modules */
-.bright-icon { color: $yellow; }
-.module-bt { font-size: 1.2rem; }
-
-/* scales */
-scale trough {
-  background-color: $bg1;
-  border-radius: 24px;
-  margin: 0 1rem;
-  min-height: 10px;
-  min-width: 70px;
-}
-
-/* workspaces */
-.focused {
-  background-color: $bg;
-  border-radius: 1rem;
-  margin: .3rem;
-  padding: .25rem;
-}
-
-.workspaces { margin-left: 10px; }
-
-.ws {
-  border-radius: 2rem;
-  margin: .7rem .25rem;
-}
diff --git a/pkgs/eww-hyprland/eww.yuck b/pkgs/eww-hyprland/eww.yuck
deleted file mode 100644
index 59b42692..00000000
--- a/pkgs/eww-hyprland/eww.yuck
+++ /dev/null
@@ -1,83 +0,0 @@
-; all variables and listeners
-(include "./variables.yuck")
-
-; various bar modules
-(include "./modules/bluetooth.yuck")
-(include "./modules/bright.yuck")
-(include "./modules/clock.yuck")
-(include "./modules/indicators.yuck")
-(include "./modules/music.yuck")
-(include "./modules/net.yuck")
-(include "./modules/sys.yuck")
-(include "./modules/volume.yuck")
-(include "./modules/workspaces.yuck")
-
-; individual windows; bar is in this file
-(include "./windows/calendar.yuck")
-(include "./windows/music.yuck")
-(include "./windows/osd.yuck") ; on-screen-display (volume/brightness)
-(include "./windows/system-menu.yuck")
-
-; bar modules alignment
-(defwidget left []
-  (box
-    :space-evenly false
-    :halign "start"
-    (workspaces)))
-
-(defwidget center []
-  (box
-    :space-evenly false
-    :halign "center"
-    (music-module)))
-
-(defwidget right []
-  (box
-    :space-evenly false
-    :halign "end"
-    (indicators)
-    (bright)
-    (volume-module)
-    (bluetooth)
-    (net)
-    (sys)
-    (clock_module)))
-
-(defwidget bar-box []
-  (centerbox
-    (left)
-    (center)
-    (right)))
-
-(defwindow bar0
-    :monitor 0
-    :geometry (geometry :x "0%"
-      :y "0%"
-      :width "100%"
-      :height "32px"
-      :anchor "top center")
-    :stacking "fg"
-    :exclusive true
-  (bar-box))
-
-(defwindow bar1
-    :monitor 1
-    :geometry (geometry :x "0%"
-      :y "0%"
-      :width "100%"
-      :height "32px"
-      :anchor "top center")
-    :stacking "fg"
-    :exclusive true
-  (bar-box))
-
-(defwindow bar2
-    :monitor 2
-    :geometry (geometry :x "0%"
-      :y "0%"
-      :width "100%"
-      :height "32px"
-      :anchor "top center")
-    :stacking "fg"
-    :exclusive true
-  (bar-box))
diff --git a/pkgs/eww-hyprland/modules/bluetooth.yuck b/pkgs/eww-hyprland/modules/bluetooth.yuck
deleted file mode 100644
index 477670e0..00000000
--- a/pkgs/eww-hyprland/modules/bluetooth.yuck
+++ /dev/null
@@ -1,8 +0,0 @@
-(defwidget bluetooth []
-  (button
-    :class "module-bt module icon"
-    :onclick "blueberry" ; clicking opens blueberry
-    :onrightclick "scripts/bluetooth toggle" ; rightclick to turn bluetooth on/off
-    :tooltip "${bluetooth.text} ${bluetooth.battery}"
-    :style "color: ${bluetooth.color};"
-    {bluetooth.icon}))
diff --git a/pkgs/eww-hyprland/modules/bright.yuck b/pkgs/eww-hyprland/modules/bright.yuck
deleted file mode 100644
index 892ef08d..00000000
--- a/pkgs/eww-hyprland/modules/bright.yuck
+++ /dev/null
@@ -1,10 +0,0 @@
-(defwidget bright []
-  (box
-    :class "module"
-    (eventbox
-      ; scroll to change the brightness level
-      :onscroll "echo {} | sed -e 's/up/-U 1/g' -e 's/down/-A 1/g' | xargs brillo -S"
-      (label
-        :text {brightness.icon}
-        :class "bright-icon icon"
-        :tooltip "brightness ${round(brightness.percent, 0)}%"))))
diff --git a/pkgs/eww-hyprland/modules/clock.yuck b/pkgs/eww-hyprland/modules/clock.yuck
deleted file mode 100644
index e5e0e870..00000000
--- a/pkgs/eww-hyprland/modules/clock.yuck
+++ /dev/null
@@ -1,30 +0,0 @@
-(defvar date_rev false)
-
-(defwidget clock_module []
-  (eventbox
-    :onhover "${EWW_CMD} update date_rev=true"
-    :onhoverlost "${EWW_CMD} update date_rev=false"
-    (overlay
-      :class "module"
-      ; the styles make the clock invisible while hovered, and the date is shown instead
-      (box
-        :space-evenly false
-        :class "text"
-        (label
-          :text {formattime(EWW_TIME, "%H")}
-          :style {date_rev ? "color: rgba(0,0,0,0); text-shadow: none;" : ""}
-          :class "hour")
-        (label
-          :style {date_rev ? "color: rgba(0,0,0,0); text-shadow: none;" : ""}
-          :text ":")
-        (label
-          :text {formattime(EWW_TIME, "%M")}
-          :style {date_rev ? "color: rgba(0,0,0,0); text-shadow: none;" : ""}
-          :class "minute"))
-      (revealer
-        :reveal date_rev
-        :transition "crossfade"
-        (button
-          :class "date text"
-          :onclick "${EWW_CMD} open --toggle calendar"
-          {formattime(EWW_TIME, "%d/%m")})))))
diff --git a/pkgs/eww-hyprland/modules/indicators.yuck b/pkgs/eww-hyprland/modules/indicators.yuck
deleted file mode 100644
index bc9107fa..00000000
--- a/pkgs/eww-hyprland/modules/indicators.yuck
+++ /dev/null
@@ -1,10 +0,0 @@
-; screenshare & mic share indicators
-(defwidget indicators []
-  (box
-    :space-evenly: false
-    :class "indicators"
-    (for i in indicators
-      (label
-        :class "icon indicator ${i.class}"
-        :tooltip "${i.name} is being shared"
-        :text {i.icon}))))
diff --git a/pkgs/eww-hyprland/modules/music.yuck b/pkgs/eww-hyprland/modules/music.yuck
deleted file mode 100644
index 7e482d11..00000000
--- a/pkgs/eww-hyprland/modules/music.yuck
+++ /dev/null
@@ -1,24 +0,0 @@
-(defwidget music-module []
-  (eventbox
-    :onhover "${EWW_CMD} update music_reveal=true"
-    :onhoverlost "${EWW_CMD} update music_reveal=false"
-    (box
-      :class "module"
-      :space-evenly false
-      (box
-        :class "song-cover-art"
-        :style "background-image: url(\"${music.cover}\");")
-      (button
-        :class "module text"
-        :onclick "${EWW_CMD} open --toggle music"
-        {music.title})
-      ; show buttons when hovering
-      (revealer
-        :transition "slideright"
-        :reveal music_reveal
-        :duration "350ms"
-        (box
-          :class "icon text"
-          (button :class "song-button" :onclick "playerctl previous" "")
-          (button :class "song-button" :onclick "playerctl play-pause" {music.status})
-          (button :class "song-button" :onclick "playerctl next" ""))))))
diff --git a/pkgs/eww-hyprland/modules/net.yuck b/pkgs/eww-hyprland/modules/net.yuck
deleted file mode 100644
index 1f53316a..00000000
--- a/pkgs/eww-hyprland/modules/net.yuck
+++ /dev/null
@@ -1,8 +0,0 @@
-(defwidget net []
-  (button
-    :class "module icon"
-    ; forcefully open gnome-control-center in a non-GNOME environment
-    :onclick "XDG_CURRENT_DESKTOP=GNOME gnome-control-center &"
-    :tooltip {net.name}
-    :style "color: ${net.color};"
-    {net.icon}))
diff --git a/pkgs/eww-hyprland/modules/sys.yuck b/pkgs/eww-hyprland/modules/sys.yuck
deleted file mode 100644
index 8339b353..00000000
--- a/pkgs/eww-hyprland/modules/sys.yuck
+++ /dev/null
@@ -1,31 +0,0 @@
-(defwidget sys []
-  (box
-    :class "module"
-    :space-evenly false
-    :spacing 5
-    (circular-progress
-      :value {EWW_CPU.avg}
-      :class "cpubar"
-      :thickness 3
-      (button
-        :tooltip "using ${round(EWW_CPU.avg,0)}% cpu"
-        :onclick "${EWW_CMD} open --toggle system-menu"
-        (label :class "icon-text" :text "")))
-
-    (circular-progress
-      :value {EWW_RAM.used_mem_perc}
-      :class "membar"
-      :thickness 3
-      (button
-        :tooltip "using ${round(EWW_RAM.used_mem_perc,0)}% ram"
-        :onclick "${EWW_CMD} open --toggle system-menu"
-        (label :class "icon-text" :text "")))
-
-    (circular-progress
-      :value {EWW_BATTERY.total_avg}
-      :class "batbar ${EWW_BATTERY.total_avg > 20 ? '' : 'low'}"
-      :thickness 3
-      (button
-        :tooltip "battery on ${round(EWW_BATTERY.total_avg,0)}%"
-        :onclick "${EWW_CMD} open --toggle system-menu"
-        (label :class "icon-text" :text "")))))
diff --git a/pkgs/eww-hyprland/modules/volume.yuck b/pkgs/eww-hyprland/modules/volume.yuck
deleted file mode 100644
index 89fa47ba..00000000
--- a/pkgs/eww-hyprland/modules/volume.yuck
+++ /dev/null
@@ -1,13 +0,0 @@
-(defwidget volume-module []
-  (box
-    :class "module icon"
-    (eventbox
-      ; scroll over the icon to change volume
-      ; low increment so that scrolling with a touchpad doesn't shatter your eardrums
-      :onscroll "echo {} | sed -e 's/up/-/g' -e 's/down/+/g' | xargs -I% wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.005%"
-      :onclick "pavucontrol &" ; open pavucontrol on click
-      :onrightclick "scripts/volume mute SINK" ; toggle mute on right click
-      (label
-        :class "vol-icon"
-        :tooltip "volume ${volume.percent}%"
-        :text {volume.icon}))))
diff --git a/pkgs/eww-hyprland/modules/workspaces.yuck b/pkgs/eww-hyprland/modules/workspaces.yuck
deleted file mode 100644
index 929ba339..00000000
--- a/pkgs/eww-hyprland/modules/workspaces.yuck
+++ /dev/null
@@ -1,15 +0,0 @@
-(defwidget workspaces []
-  (eventbox
-		; scroll to change workspace
-		:onscroll "echo {} | sed -e \"s/up/-1/g\" -e \"s/down/+1/g\" | xargs hyprctl dispatch workspace"
-		(box
-			:class "module workspaces"
-		  (for ws in {hyprland.workspaces}
-		    (button
-					:onclick "hyprctl dispatch workspace ${ws.number}"
-					:class "ws icon"
-					:style "background-color: ${ws.color};"
-					; :tooltip {ws.tooltip}
-					(box
-						:class `${ws.focused ? "focused" : ""}`
-						:height 3))))))
diff --git a/pkgs/eww-hyprland/scripts/airplane b/pkgs/eww-hyprland/scripts/airplane
deleted file mode 100755
index 346ea0f6..00000000
--- a/pkgs/eww-hyprland/scripts/airplane
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=/dev/null
-source "$(dirname "$0")"/utils
-
-STATUS="$(rfkill list | sed -n 2p | awk '{print $3}')"
-
-icon() {
-  [ "$STATUS" = "no" ] && echo "" || echo ""
-}
-
-toggle() {
-  if [ "$STATUS" = "no" ]; then
-    rfkill block all
-    notify-send --urgency=normal -i airplane-mode-symbolic "Airplane Mode" "Airplane mode has been turned on!"
-  else
-    rfkill unblock all
-    notify-send --urgency=normal -i airplane-mode-disabled-symbolic "Airplane Mode" "Airplane mode has been turned off!"
-  fi
-}
-
-if [ "$1" = "toggle" ]; then
-  toggle
-else
-  last_time=$(get_time_ms)
-  STATUS="$(rfkill list | sed -n 2p | awk '{print $3}')"
-  icon
-
-  rfkill event | while read -r _; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    # 50ms debounce
-    if [[ $delta -gt 50 ]]; then
-      STATUS="$(rfkill list | sed -n 2p | awk '{print $3}')"
-      icon
-      # reset debounce timer
-      last_time=$(get_time_ms)
-    fi
-  done
-fi
diff --git a/pkgs/eww-hyprland/scripts/bluetooth b/pkgs/eww-hyprland/scripts/bluetooth
deleted file mode 100755
index 130ee34b..00000000
--- a/pkgs/eww-hyprland/scripts/bluetooth
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=/dev/null
-source "$(dirname "$0")"/utils
-
-toggle() {
-  status=$(rfkill -J | jaq -r '.rfkilldevices[] | select(.type == "bluetooth") | .soft' | head -1)
-
-  if [ "$status" = "unblocked" ]; then
-    rfkill block bluetooth
-  else
-    rfkill unblock bluetooth
-  fi
-}
-
-gen_output() {
-  powered=$(bluetoothctl show | rg Powered | cut -f 2- -d ' ')
-  status=$(bluetoothctl info)
-  name=$(echo "$status" | rg Name | cut -f 2- -d ' ')
-  mac=$(echo "$status" | head -1 | awk '{print $2}' | tr ':' '_')
-
-  if [[ "$(echo "$status" | rg Percentage)" != "" ]]; then
-    battery="$(upower -i /org/freedesktop/UPower/devices/headset_dev_"$mac" | rg percentage | awk '{print $2}' | cut -f 1 -d '%')%"
-  else
-    battery=""
-  fi
-
-  if [ "$powered" = "yes" ]; then
-    if [ "$status" != "Missing device address argument" ]; then
-      icon=""
-      text="$name"
-      color="#89b4fa"
-      class="bt-connected"
-    else
-      icon=""
-      text="Disconnected"
-      color="#45475a"
-      class=""
-    fi
-  else
-    icon=""
-    text="Bluetooth off"
-    color="#45475a"
-    class=""
-  fi
-
-  echo '{ "icon": "'"$icon"'", "battery": "'"$battery"'", "text": "'"$text"'", "color": "'"$color"'", "class": "'"$class"'" }'
-}
-
-if [ "$1" = "toggle" ]; then
-  toggle
-else
-  gen_output
-  last_time=$(get_time_ms)
-
-  udevadm monitor | while read -r _; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    # 50ms debounce
-    if [[ $delta -gt 50 ]]; then
-      gen_output
-      # reset debounce timer
-      last_time=$(get_time_ms)
-    fi
-  done
-fi
diff --git a/pkgs/eww-hyprland/scripts/brightness b/pkgs/eww-hyprland/scripts/brightness
deleted file mode 100755
index 2dae1987..00000000
--- a/pkgs/eww-hyprland/scripts/brightness
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=/dev/null
-source "$(dirname "$0")"/utils
-
-icons=("" "" "")
-date="$XDG_CACHE_HOME/eww/osd_brightness.date"
-
-gen_output() {
-  percent="$(brillo)"
-  icon="${icons[$(awk -v n="$percent" 'BEGIN{print int(n/34)}')]}"
-
-  echo '{"percent": "'"$percent"'", "icon": "'"$icon"'"}'
-}
-
-if [ "$1" = "osd" ]; then
-  osd "$date"
-else
-  # initial
-  last_time=$(get_time_ms)
-  gen_output
-  osd_handler "osd-brightness" &
-
-  udevadm monitor | rg --line-buffered "backlight" | while read -r _; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    if [[ $delta -gt 50 ]]; then
-      gen_output
-      # reset debounce timer
-      last_time=$(get_time_ms)
-    fi
-  done
-fi
diff --git a/pkgs/eww-hyprland/scripts/hyprland b/pkgs/eww-hyprland/scripts/hyprland
deleted file mode 100755
index 0e313f7d..00000000
--- a/pkgs/eww-hyprland/scripts/hyprland
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env bash
-
-# define colors
-#        red       peach     green     blue
-colors=("#f38ba8" "#fab387" "#a6e3a1" "#89b4fa")
-empty="rgba(30, 30, 46, 0.6)"
-
-# get initial focused workspace
-focusedws=$(hyprctl -j monitors | jaq -r '.[] | select(.focused == true) | .activeWorkspace.id')
-
-declare -A o=([1]=0 [2]=0 [3]=0 [4]=0 [5]=0 [6]=0 [7]=0 [8]=0 [9]=0 [10]=0)
-declare -A monitormap
-declare -A workspaces
-
-# set color for each workspace
-status() {
-  if [ "${o[$1]}" -eq 1 ]; then
-    mon=${monitormap[${workspaces[$1]}]}
-    echo -n "${colors[$mon]}"
-  else
-    echo -n "$empty"
-  fi
-}
-
-# handle workspace create/destroy
-workspace_event() {
-  while read -r k v; do workspaces[$k]="$v"; done < <(hyprctl -j workspaces | jaq -jr '.[] | .id, " ", .monitor, "\n"')
-}
-# handle monitor (dis)connects
-monitor_event() {
-  while read -r k v; do monitormap["$k"]=$v; done < <(hyprctl -j monitors | jaq -jr '.[] | .name, " ", .id, "\n"')
-}
-
-# get all apps titles in a workspace
-applist() {
-  ws="$1"
-
-  apps=$(hyprctl -j clients | jaq -jr '.[] | select(.workspace.id == '"$ws"') | .title + "\\n"')
-  echo -En "${apps%"\n"}"
-}
-
-# generate the json for eww
-generate() {
-  echo -n '{"workspaces": ['
-
-  for i in {1..10}; do
-    echo -n ''"$([ "$i" -eq 1 ] || echo ,)" '{"number": '"$i"', "color": "'"$(status "$i")"'", "focused": '"$([ "$focusedws" = "$i" ] && echo "true" || echo "false")"'}' #, "tooltip": "'$(applist "$i")'" }'
-  done
-
-  echo '], "screencast": '"$screencast"'}'
-}
-
-# setup
-
-# add monitors
-monitor_event
-
-# add workspaces
-workspace_event
-
-# screen is not shared by default
-screencast=false
-
-# check occupied workspaces
-for num in "${!workspaces[@]}"; do
-  o[$num]=1
-done
-# generate initial widget
-generate
-
-# main loop
-socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | rg --line-buffered "workspace|mon(itor)?|screencast" | while read -r line; do
-  case ${line%>>*} in
-  "workspace")
-    focusedws=${line#*>>}
-    ;;
-  "focusedmon")
-    focusedws=${line#*,}
-    ;;
-  "createworkspace")
-    o[${line#*>>}]=1
-    ;;
-  "destroyworkspace")
-    o[${line#*>>}]=0
-    ;;
-  "monitor"*)
-    monitor_event
-    ;;
-  "screencast")
-    screencast=$([ "$(echo "${line#*>>}" | awk -F, '{print $1}')" -eq 1 ] && echo true || echo false)
-    ;;
-  esac
-  generate
-done
diff --git a/pkgs/eww-hyprland/scripts/indicators b/pkgs/eww-hyprland/scripts/indicators
deleted file mode 100755
index 58ad9a06..00000000
--- a/pkgs/eww-hyprland/scripts/indicators
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-prevMic=""
-prevScreen=""
-
-gen_output() {
-  mic=$(eww get volume)
-  # no standard way of getting camera info
-  # camerareveal=$(eww get camerareveal)
-  screen=$(eww get hyprland)
-
-  if [ "$screen" != "$prevScreen" ] || [ "$mic" != "$prevMic" ]; then
-    micreveal=$(echo "$mic" | jaq -r '.in_use')
-    screenreveal=$(echo "$screen" | jaq -r '.screencast')
-
-    json='['
-
-    if [ "$micreveal" -ge 1 ]; then
-      json+='{"name": "Microphone", "icon": "", "class": "micshare"}'
-    fi
-    if [ "$screenreveal" = "true" ]; then
-      json+="$([ "$json" == "[" ] || echo ',')"'{"name": "Screen", "icon": "", "class": "screenshare"}'
-    fi
-    # if [ "$camerareveal" = "true" ]; then
-    #   json+='{"name": "Camera", "icon": "", "class": "camerashare"}'
-    # fi
-
-    json+=']'
-
-    echo "$json"
-    prevMic="$mic"
-    prevScreen="$screen"
-  fi
-}
-
-gen_output
-sleep 1
-while true; do
-  gen_output
-  sleep 1
-done
diff --git a/pkgs/eww-hyprland/scripts/net b/pkgs/eww-hyprland/scripts/net
deleted file mode 100755
index ac851d0c..00000000
--- a/pkgs/eww-hyprland/scripts/net
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env bash
-
-# Script to listen for networkmanager updates and return an appriopriate icon and tooltip.
-# This script runs until it's manually terminated.
-
-# Requires: NetworkManager, gawk
-# Usage: networkmanager
-
-# shellcheck source=/dev/null
-source "$(dirname "$0")"/utils
-
-# get initialize network device info and states
-nm="$(nmcli d | jc --nmcli | jaq -r '.[] | select(.type | test("^(wifi|ethernet)$", "ix"))')"
-icons=("" "" "" "" "")
-
-function toggle() {
-  status=$(rfkill -J | jaq -r '.rfkilldevices[] | select(.type == "wlan") | .soft' | head -1)
-
-  if [ "$status" = "unblocked" ]; then
-    rfkill block wlan
-  else
-    rfkill unblock wlan
-  fi
-}
-
-function gen_wifi() {
-  signal=$(nmcli -t -f in-use,ssid,signal dev wifi | rg '\*' | sed 's/\"/\\"/g' | awk -F: '{print $3}')
-  level=$(awk -v n="$signal" 'BEGIN{print int((n-1)/20)}')
-  if [ "$level" -gt 4 ]; then
-    level=4
-  fi
-
-  icon=${icons[$level]}
-  color="#cba6f7"
-  class="net-connected"
-  name=$(echo "$nm" | jaq -r 'select(.type == "wifi") .connection')
-}
-
-function gen_ethernet() {
-  icon=""
-  class="net-connected"
-  color="#cba6f7"
-  name=$(echo "$nm" | jaq -r 'select(.type == "ethernet") .connection')
-}
-
-function make_content() {
-  local ethernet wifi
-  ethernet=$(echo "$nm" | jaq -r 'select(.type == "ethernet") .state')
-  wifi=$(echo "$nm" | jaq -r 'select(.type == "wifi") .state')
-
-  # test ethernet first
-  if [[ $ethernet == "connected" ]]; then
-    gen_ethernet
-  elif [[ $wifi == "connected" ]]; then
-    gen_wifi
-  else
-    icon=""
-    color="#988ba2"
-    class="net-disconnected"
-    name="Disconnected"
-  fi
-
-  jaq --null-input -r -c \
-    --arg icon "$icon" \
-    --arg name "$name" \
-    --arg color "$color" \
-    --arg class "$class" \
-    '{"icon": $icon, "name": $name, "color": $color, "class": $class}'
-}
-
-# first run
-make_content
-last_time=$(get_time_ms)
-
-nmcli monitor | while read -r _; do
-  current_time=$(get_time_ms)
-  delta=$((current_time - last_time))
-  # 50ms debounce
-  if [[ $delta -gt 50 ]]; then
-    sleep 0.5
-    nm="$(nmcli d | jc --nmcli | jaq -r '.[] | select(.type | test("^(wifi|ethernet)$", "ix"))')"
-    make_content
-    # reset debounce timer
-    last_time=$(get_time_ms)
-  fi
-done
diff --git a/pkgs/eww-hyprland/scripts/utils b/pkgs/eww-hyprland/scripts/utils
deleted file mode 100644
index 720846df..00000000
--- a/pkgs/eww-hyprland/scripts/utils
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ! "$XDG_CACHE_HOME" ]; then
-  XDG_CACHE_HOME="/home/mihai/.local/cache"
-fi
-
-function get_time_ms {
-  date -u +%s%3N
-}
-
-function osd {
-  date="$1"
-  if [ ! -f "$date" ]; then
-    mkdir -p "$XDG_CACHE_HOME/eww"
-  fi
-  date +%s >"$date"
-}
-
-function osd_handler {
-  lock=0
-  rundate=0
-  OBJ="$1"
-
-  if [ ! -f "$date" ]; then
-    mkdir -p "$XDG_CACHE_HOME/eww"
-    echo 0 >"$date"
-  fi
-
-  while true; do
-    # get dates
-    rundate=$(cat "$date")
-    currentdate=$(date +%s)
-
-    # handle showing
-    if [ "$rundate" = "$currentdate" ] && [ "$lock" -eq 0 ]; then
-      eww open osd >/dev/null 2>&1
-      eww update "$OBJ"=true >/dev/null 2>&1
-      lock=1
-    elif [ "$((currentdate - rundate))" = "2" ] && [ "$lock" -eq 1 ]; then
-      eww update "$OBJ"=false >/dev/null 2>&1
-      lock=0
-      if [ "$(eww get osd-volume)" = "false" ] && [ "$(eww get osd-brightness)" = "false" ]; then
-        sleep 1
-        eww close osd >/dev/null 2>&1
-      fi
-    fi
-
-    sleep 0.1
-  done
-
-  eww close osd >/dev/null 2>&1
-}
diff --git a/pkgs/eww-hyprland/scripts/volume b/pkgs/eww-hyprland/scripts/volume
deleted file mode 100755
index 196198b9..00000000
--- a/pkgs/eww-hyprland/scripts/volume
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=/dev/null
-source "$(dirname "$0")"/utils
-
-volicons=("" "" "")
-date="$XDG_CACHE_HOME/eww/osd_vol.date"
-
-vol() {
-  wpctl get-volume @DEFAULT_AUDIO_"$1"@ | awk '{print int($2*100)}'
-}
-ismuted() {
-  wpctl get-volume @DEFAULT_AUDIO_"$1"@ | rg -qi muted
-  echo -n $?
-}
-setvol() {
-  wpctl set-volume @DEFAULT_AUDIO_"$1"@ "$(awk -v n="$2" 'BEGIN{print (n / 100)}')"
-}
-setmute() {
-  wpctl set-mute @DEFAULT_AUDIO_"$1"@ toggle
-}
-
-gen_output() {
-  percent="$(vol "SINK")"
-  if [[ "$event" == *source* ]]; then
-    pactl list sources | rg -q RUNNING
-    [ $? -eq 1 ] && in_use=0 || in_use=1
-  else
-    lvl=$(awk -v n="$percent" 'BEGIN{print int(n/34)}')
-    ismuted=$(ismuted "SINK")
-
-    if [ "$ismuted" = 1 ]; then
-      icon="${volicons[$lvl]}"
-    else
-      icon=""
-    fi
-  fi
-
-  echo '{"icon": "'"$icon"'", "percent": "'"$percent"'", "microphone": "'"$(vol "SOURCE")"'", "in_use": "'"$in_use"'"}'
-}
-
-case "$1" in
-"mute")
-  if [ "$2" != "SOURCE" ] && [ "$2" != "SINK" ]; then
-    echo "Can only mute SINK or SOURCE"
-    exit 1
-  fi
-  setmute "$2"
-  ;;
-
-"setvol")
-  if [ "$2" != "SOURCE" ] && [ "$2" != "SINK" ]; then
-    echo "Can only set volume for SINK or SOURCE"
-    exit 1
-  elif [ "$3" -lt 0 ] || [ "$3" -gt 100 ]; then
-    echo "Volume must be between 0 and 100"
-    exit 1
-  fi
-  setvol "$2" "$3"
-  ;;
-
-"osd")
-  osd "$date"
-  ;;
-
-"")
-  # initial values
-  in_use=0
-  last_time=$(get_time_ms)
-  gen_output
-  osd_handler "osd-volume" &
-
-  # event loop
-  pactl subscribe | rg --line-buffered ".*(source|sink).*" | while read -r event; do
-    current_time=$(get_time_ms)
-    delta=$((current_time - last_time))
-    # 50ms debounce
-    if [[ $delta -gt 50 ]]; then
-      gen_output
-      # reset debounce timer
-      last_time=$(get_time_ms)
-    fi
-  done
-  ;;
-
-*) echo "wrong usage" ;;
-esac
diff --git a/pkgs/eww-hyprland/variables.yuck b/pkgs/eww-hyprland/variables.yuck
deleted file mode 100644
index 1982ad70..00000000
--- a/pkgs/eww-hyprland/variables.yuck
+++ /dev/null
@@ -1,20 +0,0 @@
-(defvar bright_reveal false)
-(defvar bt_rev false)
-(defvar music_reveal false)
-(defvar net_rev false)
-(defvar time_rev false)
-(defvar vol_reveal false)
-(defvar osd-brightness false)
-(defvar osd-volume false)
-(defvar battery_icons `["","","","","","","",""]`)
-
-(deflisten airplane "scripts/airplane")
-(deflisten battery "gross battery")
-(deflisten bluetooth "scripts/bluetooth")
-(deflisten brightness "scripts/brightness")
-(deflisten indicators "scripts/indicators")
-(deflisten music "gross music")
-(deflisten music_time "gross music-time")
-(deflisten net "scripts/net")
-(deflisten volume "scripts/volume")
-(deflisten hyprland "scripts/hyprland")
diff --git a/pkgs/eww-hyprland/windows/calendar.yuck b/pkgs/eww-hyprland/windows/calendar.yuck
deleted file mode 100644
index 0d9b23b5..00000000
--- a/pkgs/eww-hyprland/windows/calendar.yuck
+++ /dev/null
@@ -1,14 +0,0 @@
-(defwidget calendar-win []
-  (box
-    :class "calendar-win text"
-    (calendar)))
-
-(defwindow calendar
-  :monitor 0
-  :geometry (geometry
-    :x "0%"
-    :y "0%"
-  	:anchor "top right"
-    :width "0px"
-    :height "0px")
-  (calendar-win))
diff --git a/pkgs/eww-hyprland/windows/music.yuck b/pkgs/eww-hyprland/windows/music.yuck
deleted file mode 100644
index 72da5e2f..00000000
--- a/pkgs/eww-hyprland/windows/music.yuck
+++ /dev/null
@@ -1,70 +0,0 @@
-(defwidget music []
-  (box
-    :class "music-window"
-    :space-evenly false
-    ; force background position/size, otherwise it is overridden
-    :style "
-      background-image: url('${music.background}');
-      background-position: center;
-      background-size: cover;
-      /*border: 1px solid ${music.border};*/
-    "
-    (box ; cover art, first child
-      :class "music-cover-art"
-      :style "background-image: url('${music.cover}');")
-    (box ; music info, second child
-      :orientation "v"
-      :space-evenly false
-      :class "music-box"
-      (scroll
-        :hscroll true
-        :vscroll false
-        (label ; title
-          :class "music-title text ${music.foreground}"
-          :justify "center"
-          :text {music.title}))
-      (scroll
-        :hscroll true
-        :vscroll false
-        (label ; artist
-          :class "music-artist text ${music.foreground}"
-          :justify "center"
-          :text {music.artist}))
-      (centerbox ; buttons
-        :halign "center"
-        :class "music-button-box icon text"
-        (button :class "music-button ${music.foreground}" :onclick "playerctl previous" "")
-        (button :class "music-button ${music.foreground}" :onclick "playerctl play-pause" {music.status})
-        (button :class "music-button ${music.foreground}" :onclick "playerctl next" ""))
-      (box ; time info
-        :orientation "v"
-        (box
-          :class "text"
-          (label
-            :xalign 0
-            :class "music-time ${music.foreground}"
-            :text {music_time.position})
-          (label
-            :xalign 1
-            :class "music-time ${music.foreground}"
-            :text {music.duration}))
-        (box ; clickable progress bar
-          :class "music-bar"
-          (scale
-            ; sadly we cannot access a child (highlight) from a parent using :style
-            ; :style "background: linear-gradient(to right, ${music.color1}, ${music.color2});"
-            ; transform scale position percentage into song position
-            :onchange "playerctl position `awk -v len=$(playerctl metadata mpris:length) 'BEGIN{print {} * len / 1000000 / 100}'`"
-            :value {music_time.position_percent}))))))
-
-(defwindow music
-  :stacking "fg"
-  :focusable false
-  :monitor 0
-  :geometry (geometry
-    :x "0%"
-    :y "0%"
-    :width "0%"
-    :height "0%"
-    :anchor "top center")
-  (music))
diff --git a/pkgs/eww-hyprland/windows/osd.yuck b/pkgs/eww-hyprland/windows/osd.yuck
deleted file mode 100644
index 4fe10b16..00000000
--- a/pkgs/eww-hyprland/windows/osd.yuck
+++ /dev/null
@@ -1,47 +0,0 @@
-; shared OSD code for volume/brightnes
-(defwidget osd-part [icon value class]
-  (box
-    :class "osd-part osd-${class}"
-    :orientation "v"
-    :space-evenly false
-    (scale
-      :flipped true
-      :orientation "v"
-      :value value)
-    (label
-      :class "text"
-      :text icon)))
-
-; osd window widget
-(defwidget osd []
-  (box
-    :class "osd-container"
-    :space-evenly false
-    ; use revealers for both volume and brightness
-    (revealer
-      :reveal {osd-brightness}
-      :transition "slideright"
-      (osd-part
-        :class "brightness"
-        :icon {brightness.icon}
-        :value {brightness.percent}))
-    (revealer
-      :reveal {osd-volume}
-      :transition "slideright"
-      (osd-part
-        :class "volume"
-        :icon {volume.icon}
-        :value {volume.percent})))
-)
-
-(defwindow osd
-  :stacking "fg"
-  :focusable false
-  :monitor 0
-  :geometry (geometry
-    :x "1%"
-    :y "0%"
-    :width "0%"
-    :height "0%"
-    :anchor "center left")
-  (osd))
diff --git a/pkgs/eww-hyprland/windows/system-menu.yuck b/pkgs/eww-hyprland/windows/system-menu.yuck
deleted file mode 100644
index 92acfb2d..00000000
--- a/pkgs/eww-hyprland/windows/system-menu.yuck
+++ /dev/null
@@ -1,218 +0,0 @@
-(defvar GB 1024000000)
-(defvar MB 1024000)
-
-(defwidget system-menu []
-  (box ; time & date
-    :class "system-menu-box"
-    :space-evenly false
-    :orientation "v"
-    (box
-      :class "top-row"
-      :space-evenly false
-      (label
-        :class "time text"
-        :text {formattime(EWW_TIME, "%H:%M")})
-      (box
-        :class "date-box"
-        :space-evenly false
-        (label
-          :class "date"
-          :text {formattime(EWW_TIME, "%d/%m")})
-        (label
-          :class "day"
-          :text {formattime(EWW_TIME, "%A")})))
-
-    (centerbox ; wifi/bluetooth/airplane buttons
-      :class "system-row"
-      (box
-        :class "net-box"
-        :space-evenly false
-        :orientation "v"
-        (box
-          :class "element icon ${net.class}"
-          :space-evenly false
-          (button
-            :class "net-button"
-            :onclick "scripts/net toggle"
-            {net.icon})
-          (label
-            :class "separator"
-            :text "│")
-          (button
-            :class "net-arrow-btn"
-            :onclick "eww close system-menu && XDG_CURRENT_DESKTOP=GNOME gnome-control-center &"
-            ""))
-        (label
-          :class "text"
-          :text {net.name}
-          :xalign 0.5
-          :justify "center"
-          :wrap true))
-
-      (box
-        :class "bluetooth-box"
-        :space-evenly false
-        :orientation "v"
-        (box
-          :class "element icon ${bluetooth.class}"
-          :space-evenly false
-          (button
-            :class "bluetooth-button"
-            :onclick "scripts/bluetooth toggle"
-            {bluetooth.icon})
-          (label
-            :class "separator"
-            :text "│")
-          (button
-            :class "bluetooth-arrow-btn"
-            :onclick "eww close system-menu && blueberry"
-            ""))
-        (label
-          :class "text"
-          :text {bluetooth.text}
-          :xalign 0.5
-          :justify "center"
-          :tooltip {bluetooth.battery}
-          :wrap true))
-
-      (box
-        :class "airplane-box"
-        :space-evenly false
-        :orientation "v"
-        (box
-          :class "element"
-          (button
-            :class "airplane-button"
-            :onclick "scripts/airplane toggle"
-            airplane))
-        (label
-          :class "text"
-          :text "Airplane Mode"
-          :xalign 0.5
-          :limit-width 16)))
-
-    (box ; brightness & volume sliders
-      :class "sliders"
-      :orientation "v"
-      (box
-        :class "volume-slider-box"
-        :space-evenly false
-        (button
-          :class "volume-icon icon"
-          :onclick "scripts/volume mute SINK"
-          {volume.icon})
-        (scale
-          :class "volume-bar"
-          :value {volume.percent}
-          :tooltip "volume on ${volume.percent}%"
-          :onchange "scripts/volume setvol SINK {}"))
-      (box
-        :class "brightness-slider-box"
-        :space-evenly false
-        (button
-          :class "brightness-slider-icon icon"
-          {brightness.icon})
-        (scale
-          :class "brightness-slider" 
-          :value {brightness.percent} 
-          :marks true 
-          :onchange "brillo -S {}")))
-
-    (box ; cpu & memory info
-      :class "system-info-box"
-
-      ; cpu
-      (box
-        :class "sys-box"
-        :space-evenly false
-        :halign "start"
-        (circular-progress
-          :value "${EWW_CPU.avg}"
-          :class "sys-cpu"
-          :thickness 3
-          (label
-            :text ""
-            :class "sys-icon-cpu icon"))
-        (box
-          :class "text"
-          :orientation "v"
-          :vexpand false
-          (label
-            :text "cpu"
-            :halign "start"
-            :class "sys-text-cpu")
-          (label
-            :text "${round(EWW_CPU.avg,2)}%"
-            :halign "start"
-            :class "sys-text-sub")
-          (label
-            :text "${EWW_CPU.cores[0].freq} MHz"
-            :halign "start"
-            :class "sys-text-sub")))
-
-      ; memory
-      (box
-        :class "sys-box"
-        :space-evenly false
-        :halign "end"
-        (circular-progress
-          :value {EWW_RAM.used_mem_perc}
-          :class "sys-mem"
-          :thickness 3
-          (label
-            :text ""
-            :class "sys-icon-mem icon"))
-        (box
-          :class "text"
-          :orientation "v"
-          (label
-            :text "memory"
-            :halign "start"
-            :class "sys-text-mem")
-          (label
-            :text {EWW_RAM.used_mem / GB < 1 ? "${round(EWW_RAM.used_mem / MB, 1)} M used" : "${round(EWW_RAM.used_mem / GB, 1)} G used"}
-            :halign "start"
-            :class "sys-text-sub")
-          (label
-            :text {EWW_RAM.total_mem / GB < 1 ? "${round(EWW_RAM.total_mem / MB, 1)} M total" : "${round(EWW_RAM.total_mem / GB, 1)} G total"}
-            :halign "start"
-            :class "sys-text-sub"))))
-
-    (centerbox ; battery info & power button
-      :class "bottom-row"
-      (box
-        :class "battery-box"
-        :space-evenly false
-        :halign "start"
-        (label
-          :class "battery-icon icon ${EWW_BATTERY.total_avg > 20 ? '' : 'low'}"
-          :text {battery_icons[round(EWW_BATTERY.total_avg / (100 / arraylength(battery_icons)) - 1,0)]})
-        (label
-          :class "text"
-          :text {round(EWW_BATTERY.total_avg,0)})
-        (label
-          :class "battery-status text"
-          :text {battery.status})
-        (label
-          :class "battery-rate text"
-          :text {battery.rate}))
-      (label) ; empty element; centerbox requires 3 children but we only need left/right
-      (box ; power button
-        :space-evenly false
-        :halign "end"
-        (button
-          :halign "end"
-          :class "power-button icon"
-          :onclick "wlogout -p layer-shell &"
-          "")))))
-
-(defwindow system-menu
-  :stacking "fg" 
-  :monitor 0
-  :geometry (geometry
-    :x "0"
-    :y "0"
-    :width "0%"
-    :height "0%"
-    :anchor "right top")
-  (system-menu))
diff --git a/pkgs/sddm-catppuccin-macchiato/default.nix b/pkgs/sddm-catppuccin-macchiato/default.nix
deleted file mode 100644
index cf0d43ea..00000000
--- a/pkgs/sddm-catppuccin-macchiato/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  stdenvNoCC,
-  fetchFromGitHub,
-}:
-stdenvNoCC.mkDerivation rec {
-  pname = "sddm-catppuccin-macchiato-theme";
-  version = "1.0";
-  dontBuild = true;
-
-  src = fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "sddm";
-    rev = "bde6932e1ae0f8fdda76eff5c81ea8d3b7d653c0";
-    sha256 = "ceaK/I5lhFz6c+UafQyQVJIzzPxjmsscBgj8130D4dE=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/sddm/themes
-    cp -aR $src/src/catppuccin-macchiato $out/share/sddm/themes/catppuccin-macchiato
-    runHook postInstall
-  '';
-}
diff --git a/services/Legion.nix b/services/Legion.nix
index 80c440aa..e74265fb 100644
--- a/services/Legion.nix
+++ b/services/Legion.nix
@@ -1,15 +1,88 @@
-{...}: {
+{...}: let
+  # generate via openvpn --genkey --secret openvpn-laptop.key
+  client-key = "/root/openvpn.key";
+  domain = "vpn.xenia.me.uk";
+  vpn-dev = "tun0";
+  port = 1194;
+in {
   imports = [
     ./adguardhome
     ./gitea
     ./nextcloud
-    ./openvpn/Legion.nix
     ./sshd
-    ./syncthing/Legion.nix
+    ./syncthing
     ./terraria/windy_limbo_of_melancholy.nix
     ./traefik/adguardhome.nix
     ./traefik/gitea.nix
     ./traefik/nextcloud.nix
     ./traefik/qbittorrent.nix
   ];
+  services.syncthing = {
+    user = "xenia";
+    group = "users";
+  };
+
+  networking = {
+    nat = {
+      enable = true;
+      externalInterface = "enp42s0";
+      internalInterfaces = [vpn-dev];
+    };
+    firewall = {
+      trustedInterfaces = [vpn-dev];
+      allowedUDPPorts = [port];
+    };
+  };
+
+  services.openvpn = {
+    restartAfterSleep = true;
+    servers.xenia.config = ''
+      dev ${vpn-dev}
+      proto udp
+      ifconfig 10.8.0.1 10.8.0.2
+      secret ${client-key}
+      port ${toString port}
+
+      cipher AES-256-CBC
+      auth-nocache
+
+      comp-lzo
+      keepalive 10 60
+      ping-timer-rem
+      persist-tun
+      persist-key
+    '';
+  };
+
+  environment.etc."openvpn/client.ovpn" = {
+    text = ''
+      dev tun
+      remote "${domain}"
+      ifconfig 10.8.0.2 10.8.0.1
+      port ${toString port}
+      redirect-gateway def1
+
+      cipher AES-256-CBC
+      auth-nocache
+
+      comp-lzo
+      keepalive 10 60
+      resolv-retry infinite
+      nobind
+      persist-key
+      persist-tun
+      secret [inline]
+
+    '';
+    mode = "600";
+  };
+  system.activationScripts.openvpn-addkey = ''
+    f="/etc/openvpn/client.ovpn"
+    if ! grep -q '<secret>' $f; then
+      echo "appending secret key"
+      echo "<secret>" >> $f
+      cat ${client-key} >> $f
+      echo "</secret>" >> $f
+    fi
+  '';
 }
diff --git a/services/syncthing/Ronin.nix b/services/Ronin.nix
similarity index 77%
rename from services/syncthing/Ronin.nix
rename to services/Ronin.nix
index 01373c4a..cc7d9a4f 100644
--- a/services/syncthing/Ronin.nix
+++ b/services/Ronin.nix
@@ -1,9 +1,11 @@
-{...}: {
-  imports = [./default.nix];
+{...}: let
+  user = "elitherl";
+in {
+  imports = [./syncthing];
   services.syncthing = {
-    user = "elitherl";
+    user = user;
     group = "users";
-    dataDir = "/home/elitherl";
+    dataDir = "/home/${user}";
     folders = {
       "Archive".enable = false;
       "Books".enable = false;
diff --git a/services/syncthing/Vanguard.nix b/services/Vanguard.nix
similarity index 79%
rename from services/syncthing/Vanguard.nix
rename to services/Vanguard.nix
index 6713db1f..d7d894db 100644
--- a/services/syncthing/Vanguard.nix
+++ b/services/Vanguard.nix
@@ -1,9 +1,11 @@
-{...}: {
-  imports = [./default.nix];
+{...}: let
+  user = "xenia";
+in {
+  imports = [./sshd ./syncthing];
   services.syncthing = {
-    user = "xenia";
+    user = user;
     group = "users";
-    dataDir = "/home/xenia";
+    dataDir = "/home/${user}";
     folders = {
       "Archive".path = "~/Documents/Archive";
       "Books".path = "~/Documents/Books";
diff --git a/services/openvpn/Legion.nix b/services/openvpn/Legion.nix
deleted file mode 100644
index eff984b6..00000000
--- a/services/openvpn/Legion.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{...}: let
-  # generate via openvpn --genkey --secret openvpn-laptop.key
-  client-key = "/root/openvpn.key";
-  domain = "vpn.xenia.me.uk";
-  vpn-dev = "tun0";
-  port = 1194;
-in {
-  networking = {
-    nat = {
-      enable = true;
-      externalInterface = "enp42s0";
-      internalInterfaces = [vpn-dev];
-    };
-    firewall = {
-      trustedInterfaces = [vpn-dev];
-      allowedUDPPorts = [port];
-    };
-  };
-
-  services.openvpn = {
-    restartAfterSleep = true;
-    servers.xenia.config = ''
-      dev ${vpn-dev}
-      proto udp
-      ifconfig 10.8.0.1 10.8.0.2
-      secret ${client-key}
-      port ${toString port}
-
-      cipher AES-256-CBC
-      auth-nocache
-
-      comp-lzo
-      keepalive 10 60
-      ping-timer-rem
-      persist-tun
-      persist-key
-    '';
-  };
-
-  environment.etc."openvpn/client.ovpn" = {
-    text = ''
-      dev tun
-      remote "${domain}"
-      ifconfig 10.8.0.2 10.8.0.1
-      port ${toString port}
-      redirect-gateway def1
-
-      cipher AES-256-CBC
-      auth-nocache
-
-      comp-lzo
-      keepalive 10 60
-      resolv-retry infinite
-      nobind
-      persist-key
-      persist-tun
-      secret [inline]
-
-    '';
-    mode = "600";
-  };
-  system.activationScripts.openvpn-addkey = ''
-    f="/etc/openvpn/client.ovpn"
-    if ! grep -q '<secret>' $f; then
-      echo "appending secret key"
-      echo "<secret>" >> $f
-      cat ${client-key} >> $f
-      echo "</secret>" >> $f
-    fi
-  '';
-}
diff --git a/services/openvpn/Vanguard.nix b/services/openvpn/Vanguard.nix
deleted file mode 100644
index eff984b6..00000000
--- a/services/openvpn/Vanguard.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{...}: let
-  # generate via openvpn --genkey --secret openvpn-laptop.key
-  client-key = "/root/openvpn.key";
-  domain = "vpn.xenia.me.uk";
-  vpn-dev = "tun0";
-  port = 1194;
-in {
-  networking = {
-    nat = {
-      enable = true;
-      externalInterface = "enp42s0";
-      internalInterfaces = [vpn-dev];
-    };
-    firewall = {
-      trustedInterfaces = [vpn-dev];
-      allowedUDPPorts = [port];
-    };
-  };
-
-  services.openvpn = {
-    restartAfterSleep = true;
-    servers.xenia.config = ''
-      dev ${vpn-dev}
-      proto udp
-      ifconfig 10.8.0.1 10.8.0.2
-      secret ${client-key}
-      port ${toString port}
-
-      cipher AES-256-CBC
-      auth-nocache
-
-      comp-lzo
-      keepalive 10 60
-      ping-timer-rem
-      persist-tun
-      persist-key
-    '';
-  };
-
-  environment.etc."openvpn/client.ovpn" = {
-    text = ''
-      dev tun
-      remote "${domain}"
-      ifconfig 10.8.0.2 10.8.0.1
-      port ${toString port}
-      redirect-gateway def1
-
-      cipher AES-256-CBC
-      auth-nocache
-
-      comp-lzo
-      keepalive 10 60
-      resolv-retry infinite
-      nobind
-      persist-key
-      persist-tun
-      secret [inline]
-
-    '';
-    mode = "600";
-  };
-  system.activationScripts.openvpn-addkey = ''
-    f="/etc/openvpn/client.ovpn"
-    if ! grep -q '<secret>' $f; then
-      echo "appending secret key"
-      echo "<secret>" >> $f
-      cat ${client-key} >> $f
-      echo "</secret>" >> $f
-    fi
-  '';
-}
diff --git a/services/syncthing/Legion.nix b/services/syncthing/Legion.nix
deleted file mode 100644
index ac88d162..00000000
--- a/services/syncthing/Legion.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  imports = [./default.nix];
-  services.syncthing = {
-    user = "xenia";
-    group = "users";
-  };
-}
diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix
index cf92ca42..5d84465d 100644
--- a/services/syncthing/default.nix
+++ b/services/syncthing/default.nix
@@ -3,7 +3,7 @@
 in {
   services.syncthing = {
     enable = true;
-    dataDir = lib.mkDefault "/var/lib/syncthing";
+    dataDir = lib.mkDefault defaultDataDir;
     systemService = true;
     openDefaultPorts = true;
     devices = {
@@ -18,56 +18,56 @@ in {
     folders = {
       "Archive" = {
         id = "hwnqy-xzcdx";
-        path = lib.mkDefault "/var/lib/syncthing/Archive";
+        path = lib.mkDefault defaultDataDir + "/Archive";
         ignorePerms = true;
         devices = ["Ion" "Legion" "Monarch" "Vanguard"];
       };
       "Books" = {
         id = "zjmxy-ycmbq";
-        path = lib.mkDefault "/var/lib/syncthing/Books";
+        path = lib.mkDefault defaultDataDir + "/Books";
         ignorePerms = true;
         devices = ["Legion" "Monarch" "Nortstar" "Remarkable" "Vanguard"];
       };
       "Comics" = {
         id = "kc2h0-q3wot";
-        path = lib.mkDefault "/var/lib/syncthing/Comics";
+        path = lib.mkDefault defaultDataDir + "/Comics";
         ignorePerms = true;
         devices = ["Ion" "Legion" "Monarch" "Nortstar" "Vanguard"];
       };
       "Documents" = {
         id = "qc6qa-bipsd";
-        path = lib.mkDefault "/var/lib/syncthing/Documents";
+        path = lib.mkDefault defaultDataDir + "/Documents";
         ignorePerms = true;
         devices = ["Legion" "Monarch" "Nortstar" "Vanguard"];
       };
       "Exports" = {
         id = "tof2e-pdtde";
-        path = lib.mkDefault "/var/lib/syncthing/Exports";
+        path = lib.mkDefault defaultDataDir + "/Exports";
         ignorePerms = true;
         devices = ["Legion" "Monarch" "Vanguard"];
       };
       "Notes" = {
         id = "4ggjz-5dyop";
-        path = lib.mkDefault "/var/lib/syncthing/Notes";
+        path = lib.mkDefault defaultDataDir + "/Notes";
         ignorePerms = true;
         devices = ["Ion" "Legion" "Monarch" "Nortstar" "Ronin" "Vanguard"];
       };
       "Pictures" = {
         id = "ziuj8-rm6dn";
-        path = lib.mkDefault "/var/lib/syncthing/Pictures";
+        path = lib.mkDefault defaultDataDir + "/Pictures";
         ignorePerms = true;
         devices = ["Ion" "Legion" "Monarch" "Nortstar" "Vanguard"];
       };
       "Xochitl" = {
         id = "dkcbx-kq7hl";
-        path = lib.mkDefault "/var/lib/syncthing/Xochitl";
+        path = lib.mkDefault defaultDataDir + "/Xochitl";
         type = "receiveonly";
         ignorePerms = true;
         devices = ["Legion" "Remarkable"];
       };
       "Zotero" = {
         id = "huyvn-liwc9";
-        path = lib.mkDefault "/var/lib/syncthing/Zotero";
+        path = lib.mkDefault defaultDataDir + "/Zotero";
         ignorePerms = true;
         devices = ["Ion" "Legion" "Monarch" "Nortstar" "Ronin" "Vanguard"];
       };