no xorg

42 files changed, 27 insertions, 58 deletions

diff --git a/home/ebisu/fortune/desktop/agnostic.nix b/home/ebisu/fortune/desktop/agnostic.nix
deleted file mode 100644
index 4531cc4..0000000
--- a/home/ebisu/fortune/desktop/agnostic.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    showmethekey
-    brightnessctl
-    bibata-cursors
-    xorg.xlsclients
-    libnotify
-    # lemurs
-    # emptty
-  ];
-}
diff --git a/home/ebisu/fortune/desktop/wayland/clipboard.nix b/home/ebisu/fortune/desktop/clipboard.nix
index e063ca5..e063ca5 100644
--- a/home/ebisu/fortune/desktop/wayland/clipboard.nix
+++ b/home/ebisu/fortune/desktop/clipboard.nix
diff --git a/home/ebisu/fortune/desktop/default.nix b/home/ebisu/fortune/desktop/default.nix
index 3ea8654..56cc9c9 100644
--- a/home/ebisu/fortune/desktop/default.nix
+++ b/home/ebisu/fortune/desktop/default.nix
@@ -1,8 +1,30 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [
-    ./wayland
-    ./agnostic.nix
-    # ./xorg.nix
+    ./hyprland
+    ./waybar
+    ./clipboard.nix
+    ./mako.nix
+    ./screenshot.nix
+    ./wlogout.nix
+  ];
+
+  home.packages = with pkgs; [
+    gammastep
+    wlr-randr
+    ydotool
+    swappy
+    swww
+    rofi-wayland
+    hyprpicker
+    rofi-emoji
+    (pkgs.callPackage ../../../../pkgs/swaddle.nix { })
+    showmethekey
+    brightnessctl
+    bibata-cursors
+    xorg.xlsclients
+    libnotify
+    # lemurs
+    # emptty
   ];
 }
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/default.nix b/home/ebisu/fortune/desktop/hyprland/default.nix
index b3d92be..b3d92be 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/default.nix
+++ b/home/ebisu/fortune/desktop/hyprland/default.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hypridle.nix b/home/ebisu/fortune/desktop/hyprland/hypridle.nix
index d1b0835..d1b0835 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hypridle.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hypridle.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/animations.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/animations.nix
index c47c164..c47c164 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/animations.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/animations.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/binds.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
index cb96ef0..71a8df5 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/binds.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/binds.nix
@@ -1,4 +1,4 @@
-_: {
+{
   wayland.windowManager.hyprland = {
     settings = {
       "$mod" = "SUPER";
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/decoration.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/decoration.nix
index feb9145..feb9145 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/decoration.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/decoration.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/default.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix
index a121177..a121177 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/default.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/environment.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/environment.nix
index 252b53a..252b53a 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/environment.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/environment.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/executions.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix
index d959c50..d959c50 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/executions.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/general.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/general.nix
index 088c7da..088c7da 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/general.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/general.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/plugins.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix
index dc36858..dc36858 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/plugins.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/rules.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix
index d933d5e..d933d5e 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/rules.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/common.sh b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/common.sh
index 25be5b6..25be5b6 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/common.sh
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/common.sh
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/fake_fullscreen_status b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/fake_fullscreen_status
index e198758..e198758 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/fake_fullscreen_status
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/fake_fullscreen_status
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/hycov_easymotion b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/hycov_easymotion
index ab7c3bb..ab7c3bb 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/hycov_easymotion
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/hycov_easymotion
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_gtk
index 861aa12..861aa12 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_gtk
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/initialise_waybar b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_waybar
index 09f7ff9..09f7ff9 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/initialise_waybar
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_waybar
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/initialise_xdg_portal b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_xdg_portal
index 10470eb..10470eb 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/initialise_xdg_portal
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/initialise_xdg_portal
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/move_focus_to_monitor b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/move_focus_to_monitor
index 27562a9..27562a9 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/move_focus_to_monitor
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/move_focus_to_monitor
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/move_window_to_monitor b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/move_window_to_monitor
index 06e4f94..06e4f94 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/move_window_to_monitor
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/move_window_to_monitor
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/move_window_to_workspace b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/move_window_to_workspace
index 4256a9f..4256a9f 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/move_window_to_workspace
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/move_window_to_workspace
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/source.bak/screenshot.ab b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/source.bak/screenshot.ab
index 6bc510d..6bc510d 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/source.bak/screenshot.ab
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/source.bak/screenshot.ab
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/switch_workspace b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/switch_workspace
index fc8900c..fc8900c 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/switch_workspace
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/switch_workspace
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/toggle_gaps b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/toggle_gaps
index d593ab2..d593ab2 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/toggle_gaps
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/toggle_gaps
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/toggle_layout b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/toggle_layout
index 1ef8774..1ef8774 100755
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/scripts/toggle_layout
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/scripts/toggle_layout
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/workspaces.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/workspaces.nix
index 06498a5..06498a5 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/workspaces.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprland/workspaces.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprlock.nix b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
index e3ce65b..e3ce65b 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprlock.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprlock.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprpaper.nix b/home/ebisu/fortune/desktop/hyprland/hyprpaper.nix
index ce6c79a..ce6c79a 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprpaper.nix
+++ b/home/ebisu/fortune/desktop/hyprland/hyprpaper.nix
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/inspo.txt b/home/ebisu/fortune/desktop/hyprland/inspo.txt
index 39d2483..39d2483 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/inspo.txt
+++ b/home/ebisu/fortune/desktop/hyprland/inspo.txt
diff --git a/home/ebisu/fortune/desktop/wayland/mako.nix b/home/ebisu/fortune/desktop/mako.nix
index 836541c..836541c 100644
--- a/home/ebisu/fortune/desktop/wayland/mako.nix
+++ b/home/ebisu/fortune/desktop/mako.nix
diff --git a/home/ebisu/fortune/desktop/wayland/screenshot.nix b/home/ebisu/fortune/desktop/screenshot.nix
index 481ffb5..481ffb5 100644
--- a/home/ebisu/fortune/desktop/wayland/screenshot.nix
+++ b/home/ebisu/fortune/desktop/screenshot.nix
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/configuration/default-modules.nix b/home/ebisu/fortune/desktop/waybar/configuration/default-modules.nix
index 253a72d..253a72d 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/configuration/default-modules.nix
+++ b/home/ebisu/fortune/desktop/waybar/configuration/default-modules.nix
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py b/home/ebisu/fortune/desktop/waybar/configuration/scripts/mediaplayer.py
index c44ee0b..c44ee0b 100755
--- a/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py
+++ b/home/ebisu/fortune/desktop/waybar/configuration/scripts/mediaplayer.py
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py.bak b/home/ebisu/fortune/desktop/waybar/configuration/scripts/mediaplayer.py.bak
index 1630d97..1630d97 100755
--- a/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py.bak
+++ b/home/ebisu/fortune/desktop/waybar/configuration/scripts/mediaplayer.py.bak
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css b/home/ebisu/fortune/desktop/waybar/configuration/style.css
index 121c792..121c792 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css
+++ b/home/ebisu/fortune/desktop/waybar/configuration/style.css
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css.bak b/home/ebisu/fortune/desktop/waybar/configuration/style.css.bak
index 3858c71..3858c71 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css.bak
+++ b/home/ebisu/fortune/desktop/waybar/configuration/style.css.bak
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/default.nix b/home/ebisu/fortune/desktop/waybar/default.nix
index cdf3268..cdf3268 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/default.nix
+++ b/home/ebisu/fortune/desktop/waybar/default.nix
diff --git a/home/ebisu/fortune/desktop/wayland/default.nix b/home/ebisu/fortune/desktop/wayland/default.nix
deleted file mode 100644
index 000f8a9..0000000
--- a/home/ebisu/fortune/desktop/wayland/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./hyprland
-    ./waybar
-    ./clipboard.nix
-    ./mako.nix
-    ./screenshot.nix
-    ./wlogout.nix
-  ];
-
-  home.packages = with pkgs; [
-    gammastep
-    wlr-randr
-    ydotool
-    swappy
-    swww
-    rofi-wayland
-    hyprpicker
-    rofi-emoji
-    (pkgs.callPackage ../../../../../pkgs/swaddle.nix { })
-  ];
-}
diff --git a/home/ebisu/fortune/desktop/wayland/wlogout.nix b/home/ebisu/fortune/desktop/wlogout.nix
index 5e20380..5e20380 100644
--- a/home/ebisu/fortune/desktop/wayland/wlogout.nix
+++ b/home/ebisu/fortune/desktop/wlogout.nix
diff --git a/home/ebisu/fortune/desktop/xorg.nix b/home/ebisu/fortune/desktop/xorg.nix
deleted file mode 100644
index 1019327..0000000
--- a/home/ebisu/fortune/desktop/xorg.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    gifsicle
-    main
-    unclutter
-    xcape
-    xcolor
-    xclip
-    xsel
-    # xrootgif
-    xwallpaper
-    xbanish
-    xdotool
-    clipnotify
-    sxhkd
-  ];
-}