diff options
| -rw-r--r-- | modules/profiles/xorg/default.nix | 16 | ||||
| -rw-r--r-- | users/tdback/modules/xorg/default.nix | 20 |
2 files changed, 19 insertions, 17 deletions
diff --git a/modules/profiles/xorg/default.nix b/modules/profiles/xorg/default.nix index fce668a..fce4b26 100644 --- a/modules/profiles/xorg/default.nix +++ b/modules/profiles/xorg/default.nix @@ -5,11 +5,11 @@ { hardware.graphics.enable32Bit = true; - services.xserver = { + services.flatpak.enable = true; + xdg.portal = { enable = true; - xkb.layout = "us"; - displayManager.lightdm.enable = true; - windowManager.bspwm.enable = true; + config.common.default = "*"; + extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; }; services.displayManager.autoLogin = { @@ -17,11 +17,11 @@ user = "tdback"; }; - services.flatpak.enable = true; - xdg.portal = { + services.xserver = { enable = true; - config.common.default = "*"; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + xkb.layout = "us"; + displayManager.lightdm.enable = true; + windowManager.bspwm.enable = true; }; environment.systemPackages = with pkgs.xorg; [ diff --git a/users/tdback/modules/xorg/default.nix b/users/tdback/modules/xorg/default.nix index 9b9eab4..dce4c7d 100644 --- a/users/tdback/modules/xorg/default.nix +++ b/users/tdback/modules/xorg/default.nix @@ -9,14 +9,16 @@ package = pkgs.unstable.bspwm; settings = let - color = "#3B4252"; + border = "#16191F"; + feedback = "#485264"; in { - window_gap = 0; - top_padding = 0; - bottom_padding = 0; - right_padding = 0; - left_padding = 0; + window_gap = 4; + border_width = 1; + top_padding = 2; + bottom_padding = 2; + right_padding = 2; + left_padding = 2; top_monocle_padding = 0; bottom_monocle_padding = 0; right_monocle_padding = 0; @@ -24,9 +26,9 @@ split_ratio = 0.5; borderless_monocle = true; gapless_monocle = true; - normal_border_color = color; - active_border_color = color; - focused_border_color = color; + normal_border_color = border; + active_border_color = border; + focused_border_color = feedback; }; rules = { |