Flatten home/desktop structure

home/desktop/common/default.nix

@@ -1,2 +0,0 @@
-{ ... }:
-{ imports = [ ./gtk.nix ]; }

home/desktop/common/touchinput.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    squeekboard
-    lisgd
-  ];
-  programs.wlogout = {
-    enable = true;
-  };
-}

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

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

home/desktop/hyprland.nix

@@ -9,32 +9,26 @@ in
 {
   imports = [
     hyprland.homeManagerModules.default
-    ./common.nix
     ./swaylock.nix
     ./eww.nix
     ./waybar.nix
-    ../common/gtk.nix
+    ./gtk.nix
-    ../common/dunst.nix
+    ./dunst.nix
-    ../common/rofi.nix
+    ./rofi.nix
-    ../xorg/xresources.nix
   ];
   home.packages = with pkgs; [
+    pipewire
+    wireplumber
+    wl-clipboard
     swayimg
     hyprpaper
   ];
   programs.rofi.package = pkgs.rofi-wayland;
-  xdg.configFile."hypr" = {
+  xdg.configFile."hypr/common.conf".source = ./config/hypr/common.conf;
-    source = ./config/hypr;
+  xdg.configFile."hypr/keybinds.conf".source = ./config/hypr/keybinds.conf;
-    # recursive = true;
+  xdg.configFile."hypr/window-rules.conf".source = ./config/hypr/window-rules.conf;
-    # text = "# test";
-  };
-  xsession.enable = true;
-  programs.keychain.enableXsessionIntegration = true;
   wayland.windowManager.hyprland = {
     enable = true;
-    xwayland = {
+    xwayland = { enable = true; hidpi = true; };
-      enable = true;
-      hidpi = true;
-    };
   };
 }

home/desktop/polybar.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ bluez ];
-    bluez
-  ];
   services.polybar = {
     enable = true;
     config = ./config/polybar/polybar.ini;

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; };
+}

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;
+}

home/desktop/wayland/common.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    pipewire
-    wireplumber
-    wl-clipboard
-  ];
-}

home/desktop/wayland/config/hypr/hyprpaper-H0615.conf

@@ -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

home/desktop/wayland/config/hypr/hyprpaper-Vanguard.conf

@@ -1,2 +0,0 @@
-preload = ~/.nixos/wallpaper/images_dark/5120x2880.png
-wallpaper = HDMI-A-1,~/.nixos/wallpaper/images_dark/5120x2880.png

home/desktop/wayland/config/waybar/config-Vanguard.json

@@ -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

home/desktop/wayland/sway.nix

@@ -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;
-  };
-}

home/desktop/wayland/waybar.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "FiraCode" ]; })
-    bluez
-  ];
-  xdg.configFile."waybar".source = ./config/waybar;
-  programs.waybar.enable = true;
-}

home/desktop/xfce.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   imports = [
-    ./xresources.nix
     ./gtk.nix
     ./bspwm.nix
     ./sxhkd.nix

home/desktop/xorg/common.nix

@@ -1,5 +0,0 @@
-{ ... }:
-{
-  xsession.enable = true;
-  programs.keychain.enableXsessionIntegration = true;
-}

home/desktop/xresources.nix

@@ -1,6 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [ ./common.nix ];
   xresources.extraConfig = builtins.readFile
     (
       pkgs.fetchFromGitHub