From 404eacd81de128bd23e57643a890b0336323d948 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 6 Nov 2023 16:07:02 +0800 Subject: [PATCH] home,bspwm: bspwmrc -> home-manager configuration --- .../resources/dotfiles/config/bspwm/bspwmrc | 12 ------------ .../home-manager/resources/wm/bspwm.nix | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 users/guanranwang/home-manager/resources/dotfiles/config/bspwm/bspwmrc diff --git a/users/guanranwang/home-manager/resources/dotfiles/config/bspwm/bspwmrc b/users/guanranwang/home-manager/resources/dotfiles/config/bspwm/bspwmrc deleted file mode 100644 index b2b5559..0000000 --- a/users/guanranwang/home-manager/resources/dotfiles/config/bspwm/bspwmrc +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -pgrep -x sxhkd > /dev/null || sxhkd & -pgrep -x feh > /dev/null || feh --bg-fill /home/guanranwang/.local/share/backgrounds/wallpaper1.png - -bspc monitor -d I II III IV V VI VII VIII IX X -bspc config border_width 2 -bspc config window_gap 4 -bspc config focus_follows_pointer true -bspc config split_ratio 0.52 -bspc config borderless_monocle true -bspc config gapless_monocle true \ No newline at end of file diff --git a/users/guanranwang/home-manager/resources/wm/bspwm.nix b/users/guanranwang/home-manager/resources/wm/bspwm.nix index 0ea0132..a113379 100644 --- a/users/guanranwang/home-manager/resources/wm/bspwm.nix +++ b/users/guanranwang/home-manager/resources/wm/bspwm.nix @@ -11,7 +11,21 @@ enable = true; windowManager.bspwm = { enable = true; - extraConfig = builtins.readFile ../dotfiles/config/bspwm/bspwmrc; + startupPrograms = [ + "pgrep -x sxhkd > /dev/null || sxhkd" + "pgrep -x feh > /dev/null || feh --bg-fill ~/.local/share/backgrounds/wallpaper1.png" + ]; + monitors = { + eDP-1 = ["I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X"]; + }; + settings = { + border_width = 2; + window_gap = 4; + focus_follows_pointer = true; + split_ratio = 0.52; + borderless_monocle = true; + gapless_monocle = true; + }; }; }; }