From b4d45ba6bb526053a81c677a9711348fcac0b418 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 16 May 2023 09:11:39 +0100
Subject: [PATCH] Flatten home/desktop structure

---
 home/desktop/{xorg => }/bspwm.nix             |   0
 home/desktop/common/default.nix               |   2 --
 home/desktop/common/touchinput.nix            |  10 -------
 .../{xorg => }/config/bspwm/startup.sh        |   0
 .../{wayland => }/config/eww/bar/eww.scss     |   0
 .../{wayland => }/config/eww/bar/eww.yuck     |   0
 .../eww/bar/scripts/change-active-workspace   |   0
 .../eww/bar/scripts/get-active-workspace      |   0
 .../config/eww/bar/scripts/get-workspaces     |   0
 .../config/eww/bar/scripts/getram             |   0
 .../config/eww/bar/scripts/getvol             |   0
 .../desktop/{wayland => }/config/eww/eww.scss |   0
 .../desktop/{wayland => }/config/eww/eww.yuck |   0
 .../config/eww/powermenu/eww.scss             |   0
 .../config/eww/powermenu/eww.yuck             |   0
 .../config/eww/powermenu/wallpaper            | Bin
 .../hyprland.conf => config/hypr/common.conf} |   0
 .../config/hypr/hyprland-H0615.conf           |   0
 .../config/hypr/hyprland-Vanguard.conf        |   0
 home/desktop/config/hypr/hyprpaper-H0615.conf |   7 +++++
 .../config/hypr/hyprpaper-Vanguard.conf       |   2 ++
 .../{wayland => }/config/hypr/keybinds.conf   |   0
 .../config/hypr/window-rules.conf             |   0
 .../{xorg => }/config/polybar/polybar.ini     |   0
 .../config/rofi/catppuccin-macchiato.rasi     |   0
 .../config/sway/swayconfig-H0615              |   0
 .../config/sway/swayconfig-northstar          |   0
 .../style.css => config/waybar/common.css}    |   0
 .../{wayland => }/config/waybar/common.json   |   0
 .../config/waybar/config-H0615.json           |   0
 .../{wayland => }/config/waybar/layout.json   |   0
 .../{wayland => }/config/waybar/macchiato.css |   0
 .../{wayland => }/config/waybar/modules.json  |   0
 home/desktop/{common => }/dunst.nix           |   0
 home/desktop/{wayland => }/eww.nix            |   0
 home/desktop/{common => }/gtk.nix             |   0
 home/desktop/{wayland => }/hyprland.nix       |  26 +++++++-----------
 home/desktop/{xorg => }/picom.nix             |   0
 home/desktop/{xorg => }/polybar.nix           |   4 +--
 home/desktop/{common => }/rofi.nix            |   0
 home/desktop/sway.nix                         |   6 ++++
 home/desktop/{wayland => }/swaylock.nix       |   0
 home/desktop/{common => }/sxhkd.nix           |   0
 home/desktop/waybar.nix                       |  13 +++++++++
 home/desktop/wayland/common.nix               |   8 ------
 .../wayland/config/hypr/hyprpaper-H0615.conf  |   7 -----
 .../config/hypr/hyprpaper-Vanguard.conf       |   2 --
 .../config/waybar/config-Vanguard.json        |  19 -------------
 home/desktop/wayland/sway.nix                 |  11 --------
 home/desktop/wayland/waybar.nix               |   9 ------
 home/desktop/{xorg => }/xfce.nix              |   1 -
 home/desktop/xorg/common.nix                  |   5 ----
 home/desktop/{xorg => }/xresources.nix        |   1 -
 53 files changed, 39 insertions(+), 94 deletions(-)
 rename home/desktop/{xorg => }/bspwm.nix (100%)
 delete mode 100644 home/desktop/common/default.nix
 delete mode 100644 home/desktop/common/touchinput.nix
 rename home/desktop/{xorg => }/config/bspwm/startup.sh (100%)
 rename home/desktop/{wayland => }/config/eww/bar/eww.scss (100%)
 rename home/desktop/{wayland => }/config/eww/bar/eww.yuck (100%)
 rename home/desktop/{wayland => }/config/eww/bar/scripts/change-active-workspace (100%)
 rename home/desktop/{wayland => }/config/eww/bar/scripts/get-active-workspace (100%)
 rename home/desktop/{wayland => }/config/eww/bar/scripts/get-workspaces (100%)
 rename home/desktop/{wayland => }/config/eww/bar/scripts/getram (100%)
 rename home/desktop/{wayland => }/config/eww/bar/scripts/getvol (100%)
 rename home/desktop/{wayland => }/config/eww/eww.scss (100%)
 rename home/desktop/{wayland => }/config/eww/eww.yuck (100%)
 rename home/desktop/{wayland => }/config/eww/powermenu/eww.scss (100%)
 rename home/desktop/{wayland => }/config/eww/powermenu/eww.yuck (100%)
 rename home/desktop/{wayland => }/config/eww/powermenu/wallpaper (100%)
 rename home/desktop/{wayland/config/hypr/hyprland.conf => config/hypr/common.conf} (100%)
 rename home/desktop/{wayland => }/config/hypr/hyprland-H0615.conf (100%)
 rename home/desktop/{wayland => }/config/hypr/hyprland-Vanguard.conf (100%)
 create mode 100644 home/desktop/config/hypr/hyprpaper-H0615.conf
 create mode 100644 home/desktop/config/hypr/hyprpaper-Vanguard.conf
 rename home/desktop/{wayland => }/config/hypr/keybinds.conf (100%)
 rename home/desktop/{wayland => }/config/hypr/window-rules.conf (100%)
 rename home/desktop/{xorg => }/config/polybar/polybar.ini (100%)
 rename home/desktop/{common => }/config/rofi/catppuccin-macchiato.rasi (100%)
 rename home/desktop/{wayland => }/config/sway/swayconfig-H0615 (100%)
 rename home/desktop/{wayland => }/config/sway/swayconfig-northstar (100%)
 rename home/desktop/{wayland/config/waybar/style.css => config/waybar/common.css} (100%)
 rename home/desktop/{wayland => }/config/waybar/common.json (100%)
 rename home/desktop/{wayland => }/config/waybar/config-H0615.json (100%)
 rename home/desktop/{wayland => }/config/waybar/layout.json (100%)
 rename home/desktop/{wayland => }/config/waybar/macchiato.css (100%)
 rename home/desktop/{wayland => }/config/waybar/modules.json (100%)
 rename home/desktop/{common => }/dunst.nix (100%)
 rename home/desktop/{wayland => }/eww.nix (100%)
 rename home/desktop/{common => }/gtk.nix (100%)
 rename home/desktop/{wayland => }/hyprland.nix (61%)
 rename home/desktop/{xorg => }/picom.nix (100%)
 rename home/desktop/{xorg => }/polybar.nix (77%)
 rename home/desktop/{common => }/rofi.nix (100%)
 create mode 100644 home/desktop/sway.nix
 rename home/desktop/{wayland => }/swaylock.nix (100%)
 rename home/desktop/{common => }/sxhkd.nix (100%)
 create mode 100644 home/desktop/waybar.nix
 delete mode 100644 home/desktop/wayland/common.nix
 delete mode 100644 home/desktop/wayland/config/hypr/hyprpaper-H0615.conf
 delete mode 100644 home/desktop/wayland/config/hypr/hyprpaper-Vanguard.conf
 delete mode 100644 home/desktop/wayland/config/waybar/config-Vanguard.json
 delete mode 100644 home/desktop/wayland/sway.nix
 delete mode 100644 home/desktop/wayland/waybar.nix
 rename home/desktop/{xorg => }/xfce.nix (95%)
 delete mode 100644 home/desktop/xorg/common.nix
 rename home/desktop/{xorg => }/xresources.nix (95%)

diff --git a/home/desktop/xorg/bspwm.nix b/home/desktop/bspwm.nix
similarity index 100%
rename from home/desktop/xorg/bspwm.nix
rename to home/desktop/bspwm.nix
diff --git a/home/desktop/common/default.nix b/home/desktop/common/default.nix
deleted file mode 100644
index 7dd3f52e..00000000
--- a/home/desktop/common/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ ... }:
-{ imports = [ ./gtk.nix ]; }
diff --git a/home/desktop/common/touchinput.nix b/home/desktop/common/touchinput.nix
deleted file mode 100644
index 7c031574..00000000
--- a/home/desktop/common/touchinput.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    squeekboard
-    lisgd
-  ];
-  programs.wlogout = {
-    enable = true;
-  };
-}
diff --git a/home/desktop/xorg/config/bspwm/startup.sh b/home/desktop/config/bspwm/startup.sh
similarity index 100%
rename from home/desktop/xorg/config/bspwm/startup.sh
rename to home/desktop/config/bspwm/startup.sh
diff --git a/home/desktop/wayland/config/eww/bar/eww.scss b/home/desktop/config/eww/bar/eww.scss
similarity index 100%
rename from home/desktop/wayland/config/eww/bar/eww.scss
rename to home/desktop/config/eww/bar/eww.scss
diff --git a/home/desktop/wayland/config/eww/bar/eww.yuck b/home/desktop/config/eww/bar/eww.yuck
similarity index 100%
rename from home/desktop/wayland/config/eww/bar/eww.yuck
rename to home/desktop/config/eww/bar/eww.yuck
diff --git a/home/desktop/wayland/config/eww/bar/scripts/change-active-workspace b/home/desktop/config/eww/bar/scripts/change-active-workspace
similarity index 100%
rename from home/desktop/wayland/config/eww/bar/scripts/change-active-workspace
rename to home/desktop/config/eww/bar/scripts/change-active-workspace
diff --git a/home/desktop/wayland/config/eww/bar/scripts/get-active-workspace b/home/desktop/config/eww/bar/scripts/get-active-workspace
similarity index 100%
rename from home/desktop/wayland/config/eww/bar/scripts/get-active-workspace
rename to home/desktop/config/eww/bar/scripts/get-active-workspace
diff --git a/home/desktop/wayland/config/eww/bar/scripts/get-workspaces b/home/desktop/config/eww/bar/scripts/get-workspaces
similarity index 100%
rename from home/desktop/wayland/config/eww/bar/scripts/get-workspaces
rename to home/desktop/config/eww/bar/scripts/get-workspaces
diff --git a/home/desktop/wayland/config/eww/bar/scripts/getram b/home/desktop/config/eww/bar/scripts/getram
similarity index 100%
rename from home/desktop/wayland/config/eww/bar/scripts/getram
rename to home/desktop/config/eww/bar/scripts/getram
diff --git a/home/desktop/wayland/config/eww/bar/scripts/getvol b/home/desktop/config/eww/bar/scripts/getvol
similarity index 100%
rename from home/desktop/wayland/config/eww/bar/scripts/getvol
rename to home/desktop/config/eww/bar/scripts/getvol
diff --git a/home/desktop/wayland/config/eww/eww.scss b/home/desktop/config/eww/eww.scss
similarity index 100%
rename from home/desktop/wayland/config/eww/eww.scss
rename to home/desktop/config/eww/eww.scss
diff --git a/home/desktop/wayland/config/eww/eww.yuck b/home/desktop/config/eww/eww.yuck
similarity index 100%
rename from home/desktop/wayland/config/eww/eww.yuck
rename to home/desktop/config/eww/eww.yuck
diff --git a/home/desktop/wayland/config/eww/powermenu/eww.scss b/home/desktop/config/eww/powermenu/eww.scss
similarity index 100%
rename from home/desktop/wayland/config/eww/powermenu/eww.scss
rename to home/desktop/config/eww/powermenu/eww.scss
diff --git a/home/desktop/wayland/config/eww/powermenu/eww.yuck b/home/desktop/config/eww/powermenu/eww.yuck
similarity index 100%
rename from home/desktop/wayland/config/eww/powermenu/eww.yuck
rename to home/desktop/config/eww/powermenu/eww.yuck
diff --git a/home/desktop/wayland/config/eww/powermenu/wallpaper b/home/desktop/config/eww/powermenu/wallpaper
similarity index 100%
rename from home/desktop/wayland/config/eww/powermenu/wallpaper
rename to home/desktop/config/eww/powermenu/wallpaper
diff --git a/home/desktop/wayland/config/hypr/hyprland.conf b/home/desktop/config/hypr/common.conf
similarity index 100%
rename from home/desktop/wayland/config/hypr/hyprland.conf
rename to home/desktop/config/hypr/common.conf
diff --git a/home/desktop/wayland/config/hypr/hyprland-H0615.conf b/home/desktop/config/hypr/hyprland-H0615.conf
similarity index 100%
rename from home/desktop/wayland/config/hypr/hyprland-H0615.conf
rename to home/desktop/config/hypr/hyprland-H0615.conf
diff --git a/home/desktop/wayland/config/hypr/hyprland-Vanguard.conf b/home/desktop/config/hypr/hyprland-Vanguard.conf
similarity index 100%
rename from home/desktop/wayland/config/hypr/hyprland-Vanguard.conf
rename to home/desktop/config/hypr/hyprland-Vanguard.conf
diff --git a/home/desktop/config/hypr/hyprpaper-H0615.conf b/home/desktop/config/hypr/hyprpaper-H0615.conf
new file mode 100644
index 00000000..a4dbc267
--- /dev/null
+++ b/home/desktop/config/hypr/hyprpaper-H0615.conf
@@ -0,0 +1,7 @@
+preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png
+preload = /etc/nixos/config/wallpaper/images_dark/1920x1200.png
+preload = /etc/nixos/config/wallpaper/images_dark/1080x1920.png
+
+wallpaper = HDMI-A-1,/etc/nixos/config/wallpaper/images_dark/1920x1200.png
+wallpaper = DP-1,/etc/nixos/config/wallpaper/images_dark/1080x1920.png
+wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png
diff --git a/home/desktop/config/hypr/hyprpaper-Vanguard.conf b/home/desktop/config/hypr/hyprpaper-Vanguard.conf
new file mode 100644
index 00000000..b6bd2c7a
--- /dev/null
+++ b/home/desktop/config/hypr/hyprpaper-Vanguard.conf
@@ -0,0 +1,2 @@
+preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png
+wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png
diff --git a/home/desktop/wayland/config/hypr/keybinds.conf b/home/desktop/config/hypr/keybinds.conf
similarity index 100%
rename from home/desktop/wayland/config/hypr/keybinds.conf
rename to home/desktop/config/hypr/keybinds.conf
diff --git a/home/desktop/wayland/config/hypr/window-rules.conf b/home/desktop/config/hypr/window-rules.conf
similarity index 100%
rename from home/desktop/wayland/config/hypr/window-rules.conf
rename to home/desktop/config/hypr/window-rules.conf
diff --git a/home/desktop/xorg/config/polybar/polybar.ini b/home/desktop/config/polybar/polybar.ini
similarity index 100%
rename from home/desktop/xorg/config/polybar/polybar.ini
rename to home/desktop/config/polybar/polybar.ini
diff --git a/home/desktop/common/config/rofi/catppuccin-macchiato.rasi b/home/desktop/config/rofi/catppuccin-macchiato.rasi
similarity index 100%
rename from home/desktop/common/config/rofi/catppuccin-macchiato.rasi
rename to home/desktop/config/rofi/catppuccin-macchiato.rasi
diff --git a/home/desktop/wayland/config/sway/swayconfig-H0615 b/home/desktop/config/sway/swayconfig-H0615
similarity index 100%
rename from home/desktop/wayland/config/sway/swayconfig-H0615
rename to home/desktop/config/sway/swayconfig-H0615
diff --git a/home/desktop/wayland/config/sway/swayconfig-northstar b/home/desktop/config/sway/swayconfig-northstar
similarity index 100%
rename from home/desktop/wayland/config/sway/swayconfig-northstar
rename to home/desktop/config/sway/swayconfig-northstar
diff --git a/home/desktop/wayland/config/waybar/style.css b/home/desktop/config/waybar/common.css
similarity index 100%
rename from home/desktop/wayland/config/waybar/style.css
rename to home/desktop/config/waybar/common.css
diff --git a/home/desktop/wayland/config/waybar/common.json b/home/desktop/config/waybar/common.json
similarity index 100%
rename from home/desktop/wayland/config/waybar/common.json
rename to home/desktop/config/waybar/common.json
diff --git a/home/desktop/wayland/config/waybar/config-H0615.json b/home/desktop/config/waybar/config-H0615.json
similarity index 100%
rename from home/desktop/wayland/config/waybar/config-H0615.json
rename to home/desktop/config/waybar/config-H0615.json
diff --git a/home/desktop/wayland/config/waybar/layout.json b/home/desktop/config/waybar/layout.json
similarity index 100%
rename from home/desktop/wayland/config/waybar/layout.json
rename to home/desktop/config/waybar/layout.json
diff --git a/home/desktop/wayland/config/waybar/macchiato.css b/home/desktop/config/waybar/macchiato.css
similarity index 100%
rename from home/desktop/wayland/config/waybar/macchiato.css
rename to home/desktop/config/waybar/macchiato.css
diff --git a/home/desktop/wayland/config/waybar/modules.json b/home/desktop/config/waybar/modules.json
similarity index 100%
rename from home/desktop/wayland/config/waybar/modules.json
rename to home/desktop/config/waybar/modules.json
diff --git a/home/desktop/common/dunst.nix b/home/desktop/dunst.nix
similarity index 100%
rename from home/desktop/common/dunst.nix
rename to home/desktop/dunst.nix
diff --git a/home/desktop/wayland/eww.nix b/home/desktop/eww.nix
similarity index 100%
rename from home/desktop/wayland/eww.nix
rename to home/desktop/eww.nix
diff --git a/home/desktop/common/gtk.nix b/home/desktop/gtk.nix
similarity index 100%
rename from home/desktop/common/gtk.nix
rename to home/desktop/gtk.nix
diff --git a/home/desktop/wayland/hyprland.nix b/home/desktop/hyprland.nix
similarity index 61%
rename from home/desktop/wayland/hyprland.nix
rename to home/desktop/hyprland.nix
index b5ad472d..39df72ac 100644
--- a/home/desktop/wayland/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -9,32 +9,26 @@ in
 {
   imports = [
     hyprland.homeManagerModules.default
-    ./common.nix
     ./swaylock.nix
     ./eww.nix
     ./waybar.nix
-    ../common/gtk.nix
-    ../common/dunst.nix
-    ../common/rofi.nix
-    ../xorg/xresources.nix
+    ./gtk.nix
+    ./dunst.nix
+    ./rofi.nix
   ];
   home.packages = with pkgs; [
+    pipewire
+    wireplumber
+    wl-clipboard
     swayimg
     hyprpaper
   ];
   programs.rofi.package = pkgs.rofi-wayland;
-  xdg.configFile."hypr" = {
-    source = ./config/hypr;
-    # recursive = true;
-    # text = "# test";
-  };
-  xsession.enable = true;
-  programs.keychain.enableXsessionIntegration = true;
+  xdg.configFile."hypr/common.conf".source = ./config/hypr/common.conf;
+  xdg.configFile."hypr/keybinds.conf".source = ./config/hypr/keybinds.conf;
+  xdg.configFile."hypr/window-rules.conf".source = ./config/hypr/window-rules.conf;
   wayland.windowManager.hyprland = {
     enable = true;
-    xwayland = {
-      enable = true;
-      hidpi = true;
-    };
+    xwayland = { enable = true; hidpi = true; };
   };
 }
diff --git a/home/desktop/xorg/picom.nix b/home/desktop/picom.nix
similarity index 100%
rename from home/desktop/xorg/picom.nix
rename to home/desktop/picom.nix
diff --git a/home/desktop/xorg/polybar.nix b/home/desktop/polybar.nix
similarity index 77%
rename from home/desktop/xorg/polybar.nix
rename to home/desktop/polybar.nix
index c62373bc..a011beba 100644
--- a/home/desktop/xorg/polybar.nix
+++ b/home/desktop/polybar.nix
@@ -1,8 +1,6 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [
-    bluez
-  ];
+  home.packages = with pkgs; [ bluez ];
   services.polybar = {
     enable = true;
     config = ./config/polybar/polybar.ini;
diff --git a/home/desktop/common/rofi.nix b/home/desktop/rofi.nix
similarity index 100%
rename from home/desktop/common/rofi.nix
rename to home/desktop/rofi.nix
diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix
new file mode 100644
index 00000000..0c955052
--- /dev/null
+++ b/home/desktop/sway.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  #xdg.configFile."sway".source = ./config/sway;
+  home.packages = with pkgs; [ brightnessctl ];
+  wayland.windowManager.sway = { enable = true; };
+}
diff --git a/home/desktop/wayland/swaylock.nix b/home/desktop/swaylock.nix
similarity index 100%
rename from home/desktop/wayland/swaylock.nix
rename to home/desktop/swaylock.nix
diff --git a/home/desktop/common/sxhkd.nix b/home/desktop/sxhkd.nix
similarity index 100%
rename from home/desktop/common/sxhkd.nix
rename to home/desktop/sxhkd.nix
diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix
new file mode 100644
index 00000000..4c28b918
--- /dev/null
+++ b/home/desktop/waybar.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    (nerdfonts.override { fonts = [ "FiraCode" ]; })
+    bluez
+  ];
+  # xdg.configFile."waybar/common.json".source = ./config/waybar/common.json;
+  xdg.configFile."waybar" = {
+    source = ./config/waybar;
+    recursive = true;
+  };
+  programs.waybar.enable = true;
+}
diff --git a/home/desktop/wayland/common.nix b/home/desktop/wayland/common.nix
deleted file mode 100644
index 89dcc27e..00000000
--- a/home/desktop/wayland/common.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    pipewire
-    wireplumber
-    wl-clipboard
-  ];
-}
diff --git a/home/desktop/wayland/config/hypr/hyprpaper-H0615.conf b/home/desktop/wayland/config/hypr/hyprpaper-H0615.conf
deleted file mode 100644
index 5ae65d1a..00000000
--- a/home/desktop/wayland/config/hypr/hyprpaper-H0615.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-preload = ~/.nixos/wallpaper/images_dark/1920x1080.png
-preload = ~/.nixos/wallpaper/images_dark/1920x1200.png
-preload = ~/.nixos/wallpaper/images_dark/1080x1920.png
-
-wallpaper = HDMI-A-1,~/.nixos/wallpaper/images_dark/1920x1200.png
-wallpaper = DP-1,~/.nixos/wallpaper/images_dark/1080x1920.png
-wallpaper = ,~/.nixos/wallpaper/images_dark/1920x1080.png
diff --git a/home/desktop/wayland/config/hypr/hyprpaper-Vanguard.conf b/home/desktop/wayland/config/hypr/hyprpaper-Vanguard.conf
deleted file mode 100644
index f79e5493..00000000
--- a/home/desktop/wayland/config/hypr/hyprpaper-Vanguard.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-preload = ~/.nixos/wallpaper/images_dark/5120x2880.png
-wallpaper = HDMI-A-1,~/.nixos/wallpaper/images_dark/5120x2880.png
diff --git a/home/desktop/wayland/config/waybar/config-Vanguard.json b/home/desktop/wayland/config/waybar/config-Vanguard.json
deleted file mode 100644
index ca1ecce7..00000000
--- a/home/desktop/wayland/config/waybar/config-Vanguard.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "include": ["~/.config/waybar/modules.json", "~/.config/waybar/layout.json"],
-  "output": "HDMI-A-1",
-  "modules-left": ["custom/launcher", "cpu", "memory", "temperature"],
-  "modules-center": ["wlr/workspaces"],
-  "modules-right": [
-    "pulseaudio",
-    "bluetooth",
-    "network",
-    "backlight",
-    "battery",
-    "battery#bat2",
-    "clock",
-    "tray",
-    "custom/power"
-  ]
-}
-
-// vim: ft=json
diff --git a/home/desktop/wayland/sway.nix b/home/desktop/wayland/sway.nix
deleted file mode 100644
index b31b6808..00000000
--- a/home/desktop/wayland/sway.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [ ./common-wayland.nix ];
-  #xdg.configFile."sway".source = ./config/sway;
-  home.packages = with pkgs; [
-    brightnessctl
-  ];
-  wayland.windowManager.sway = {
-    enable = true;
-  };
-}
diff --git a/home/desktop/wayland/waybar.nix b/home/desktop/wayland/waybar.nix
deleted file mode 100644
index 67b901c8..00000000
--- a/home/desktop/wayland/waybar.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "FiraCode" ]; })
-    bluez
-  ];
-  xdg.configFile."waybar".source = ./config/waybar;
-  programs.waybar.enable = true;
-}
diff --git a/home/desktop/xorg/xfce.nix b/home/desktop/xfce.nix
similarity index 95%
rename from home/desktop/xorg/xfce.nix
rename to home/desktop/xfce.nix
index 4153b868..b08eea21 100644
--- a/home/desktop/xorg/xfce.nix
+++ b/home/desktop/xfce.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   imports = [
-    ./xresources.nix
     ./gtk.nix
     ./bspwm.nix
     ./sxhkd.nix
diff --git a/home/desktop/xorg/common.nix b/home/desktop/xorg/common.nix
deleted file mode 100644
index 2eaac95e..00000000
--- a/home/desktop/xorg/common.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-{
-  xsession.enable = true;
-  programs.keychain.enableXsessionIntegration = true;
-}
diff --git a/home/desktop/xorg/xresources.nix b/home/desktop/xresources.nix
similarity index 95%
rename from home/desktop/xorg/xresources.nix
rename to home/desktop/xresources.nix
index dbc66a90..1218d453 100644
--- a/home/desktop/xorg/xresources.nix
+++ b/home/desktop/xresources.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [ ./common.nix ];
   xresources.extraConfig = builtins.readFile
     (
       pkgs.fetchFromGitHub