From 47b89ff975c3d2d95262ece657f2f0801c1ae4e9 Mon Sep 17 00:00:00 2001
From: iiogama <iiogama@0x212.org>
Date: Tue, 26 Sep 2023 20:45:25 -0700
Subject: [PATCH] Tested some bspwm configurations

---
 home-manager/dots/bspwm/bspwmrc | 13 ++++++++-----
 home-manager/dots/sxhkd/sxhkdrc |  5 +----
 home-manager/dots/xinitrc       |  1 +
 hosts/buckwheat/home.nix        | 16 ----------------
 nixos/cli.nix                   |  1 +
 nixos/gui.nix                   | 16 ++++++++++++----
 6 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/home-manager/dots/bspwm/bspwmrc b/home-manager/dots/bspwm/bspwmrc
index c0afdcf..899ec4b 100755
--- a/home-manager/dots/bspwm/bspwmrc
+++ b/home-manager/dots/bspwm/bspwmrc
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+bspc monitor DP-1 -d 1 2 3 4 5
+bspc monitor DP-2 -d 6 7 8 9 0
+
 bspc config border_width 1
 bspc config focus_follows_pointer true
 bspc config pointer_follows_focus false
@@ -21,11 +24,11 @@ bspc rule -a mpv \
 bspc rule -a "*:Toolkit:Picture-in-Picture" \
 	state=floating sticky=on follow=off focus=on \
 	rectangle=640x360+1920+1080
-bspc rule -a librewolf:Navigator: desktop='8'
+bspc rule -a discord:discord: desktop='2'
+bspc rule -a Signal:signal: desktop='2'
+bspc rule -a obsidian:obsidian: desktop='7'
+bspc rule -a betterbird:Mail: desktop='7'
 bspc rule -a steam:steamwebhelper: desktop='9'
-bspc rule -a discord:discord: desktop='0'
-bspc rule -a Signal:signal: desktop='0'
-bspc rule -a obsidian:obsidian: desktop='office'
-bspc rule -a betterbird:Mail: desktop='office'
+bspc rule -a librewolf:Navigator: desktop='0'
 bspc rule -a trayer:panel: border=off manage=off
 bspc rule -a xdragon:Xdragon state=floating sticky=on
diff --git a/home-manager/dots/sxhkd/sxhkdrc b/home-manager/dots/sxhkd/sxhkdrc
index 170db33..533445c 100644
--- a/home-manager/dots/sxhkd/sxhkdrc
+++ b/home-manager/dots/sxhkd/sxhkdrc
@@ -75,15 +75,12 @@ super + {p,b,comma,period}
 	bspc node -f @{parent,brother,first,second}
 #
 # focus the next/previous window in the current desktop
-#super + {_,shift + }c
-#	bspc node -f {next,prev}.local.!hidden.window
 alt + {_,shift +} Tab
 	bspc node -f {next,prev}.local.!hidden.window
 
-
 # focus the next/previous desktop in the current monitor
 super + bracket{left,right}
-bspc desktop -f {prev,next}.local; notify-desktop "Workspace" "$(bspc query -D -d focused --names)"
+	bspc desktop -f {prev,next}.local; notify-desktop "Workspace" "$(bspc query -D -d focused --names)"
 
 # focus the last node/desktop
 super + {grave,Tab}
diff --git a/home-manager/dots/xinitrc b/home-manager/dots/xinitrc
index cd7d2e0..4bb4440 100644
--- a/home-manager/dots/xinitrc
+++ b/home-manager/dots/xinitrc
@@ -13,4 +13,5 @@ nm-applet &
 volumeicon &
 mullvad-gui &
 sxhkd &
+xrandr --output DP-1 --primary --mode 2560x1440 --rotate normal --rate "164.99" --output DP-2 --mode 2560x1440 --rotate normal --rate "164.99" --right-of DP-1 &
 exec bspwm
diff --git a/hosts/buckwheat/home.nix b/hosts/buckwheat/home.nix
index 4ff097c..baaa5fe 100644
--- a/hosts/buckwheat/home.nix
+++ b/hosts/buckwheat/home.nix
@@ -13,20 +13,4 @@
       tray = "auto";
     };
   };
-  xsession.windowManager.bspwm.monitors = {
-    DP-1 = [
-      "6"
-      "7"
-      "8"
-      "9"
-      "0"
-    ];
-    DP-2 = [
-      "1"
-      "2"
-      "3"
-      "4"
-      "5"
-    ];
-  };
 }
diff --git a/nixos/cli.nix b/nixos/cli.nix
index 6cc2ae9..08c5c5c 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -77,6 +77,7 @@
     dig
     dogdns
     dua
+    exiftool
     ffmpeg
     fq
     fx
diff --git a/nixos/gui.nix b/nixos/gui.nix
index 8ed73c9..3859534 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -17,10 +17,16 @@
       ];
     };
   };
-  xdg.portal = {
-    enable = true;
-    xdgOpenUsePortal = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  xdg = {
+    autostart.enable = true;
+    portal = {
+      enable = true;
+      xdgOpenUsePortal = true;
+      extraPortals = [ 
+        pkgs.xdg-desktop-portal
+        pkgs.xdg-desktop-portal-gtk
+      ];
+    };
   };
   services = {
     xserver = {
@@ -76,6 +82,7 @@
     tor-browser-bundle-bin
   ];
   environment.systemPackages = with pkgs; [
+    butt
     clipmenu
     dunst
     hsetroot
@@ -85,6 +92,7 @@
     trayer
     volumeicon
     xbanish
+    xdg-utils
     xdo
     xdragon
     xsel