From 2919727b0228075647b7a1b8bbecfe4d2eb08352 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 30 May 2021 21:37:07 +0700 Subject: [PATCH] add bspwm and sxhkd --- users/rin/bspwm.nix | 15 ++++ users/rin/home.nix | 8 +- users/rin/i3.nix | 5 +- users/rin/polybar.bspwm.nix | 95 +++++++++++++++++++++++ users/rin/{polybar.nix => polybar.i3.nix} | 0 users/rin/sxhkd.nix | 54 +++++++++++++ users/rin/xorg.nix | 5 ++ 7 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 users/rin/bspwm.nix create mode 100644 users/rin/polybar.bspwm.nix rename users/rin/{polybar.nix => polybar.i3.nix} (100%) create mode 100644 users/rin/sxhkd.nix create mode 100644 users/rin/xorg.nix diff --git a/users/rin/bspwm.nix b/users/rin/bspwm.nix new file mode 100644 index 0000000..ea62794 --- /dev/null +++ b/users/rin/bspwm.nix @@ -0,0 +1,15 @@ +{ config, ... }: { + xsession.windowManager.bspwm = { + enable = true; + monitors = { eDP-1 = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "XI" "X" ]; }; + settings = { + window_gap = 10; + border_width = 0; + split_ratio = 0.5; + }; + extraConfig = '' + feh --no-fehbg --bg-fill ${config.xdg.configHome}/xorg/wallpaper.png + systemctl --user restart polybar # home-manager loads this too early + ''; + }; +} diff --git a/users/rin/home.nix b/users/rin/home.nix index 2450722..a5492ca 100644 --- a/users/rin/home.nix +++ b/users/rin/home.nix @@ -36,9 +36,13 @@ ./dunst.nix ./picom.nix - ./polybar.nix + ./polybar.bspwm.nix + # ./polybar.i3.nix - ./i3.nix + ./xorg.nix + ./sxhkd.nix + ./bspwm.nix + # ./i3.nix ]; programs = { diff --git a/users/rin/i3.nix b/users/rin/i3.nix index 570f6b1..d4427c2 100644 --- a/users/rin/i3.nix +++ b/users/rin/i3.nix @@ -29,9 +29,6 @@ let }) states); in rec { - home.file.".xinitrc".source = ./scripts/xinitrc; - xdg.configFile."i3/wallpaper.png".source = ../../res/wallpaper.png; - xsession.enable = true; xsession.windowManager.i3 = { enable = true; package = pkgs.i3-gaps; @@ -45,7 +42,7 @@ in rec { notification = false; } { - command = "feh --no-fehbg --bg-fill ${config.xdg.configHome}/i3/wallpaper.png"; + command = "feh --no-fehbg --bg-fill ${config.xdg.configHome}/xorg/wallpaper.png"; always = true; notification = false; } diff --git a/users/rin/polybar.bspwm.nix b/users/rin/polybar.bspwm.nix new file mode 100644 index 0000000..96a7658 --- /dev/null +++ b/users/rin/polybar.bspwm.nix @@ -0,0 +1,95 @@ +{ config, ... }: { + services.polybar = { + enable = true; + script = builtins.readFile ./scripts/polybar.sh; + settings = { + "bar/top" = { + monitor = "eDP-1"; + width = "100%"; + height = 35; + #background = "#64506c"; + background = "#10000000"; + foreground = "#fff"; + + spacing = 2; + padding = { + left = 5; + right = 5; + bottom = 5; + }; + + font = [ + "NotoSans:style=Regular:size=11:antialias=true;2" + "NotoSans:size=11:antialias=true;2" + "MaterialIcons:size=17:antialias=true;6" + + "HanaMinA:size=9.8;1" + "HanaMinB:size=9.8;1" + ]; + + modules = { + left = "workspaces"; + center = "title"; + right = "datetime"; + }; + + enable-ipc = true; + scroll = { + up = "#workspaces.prev"; + down = "#workspaces.next"; + }; + }; + + "module/workspaces" = { + type = "internal/bspwm"; + + pin-workspaces = true; + enable-click = false; + enable-scroll = false; + reverse-scroll = false; + + #ws-icon.default = "%{T3}"; # ef4a + label = { + monitor = ""; + focused = "%{T3}"; # ef4a + occupied = { + text = "%{T3}"; # e837 + foreground = "#B0FFFFFF"; + }; + empty = { + text = "%{T3}"; # ef4a + foreground = "#B0FFFFFF"; + }; + urgent = { + text = "%{T3}"; # e837 + foreground = "#EE1012"; + }; + + separator = { + text = " "; + padding = "0"; + }; + }; + }; + + "module/title" = { + type = "internal/xwindow"; + format = { + text = "%{T1}