nixos76: fixes for laptop

This commit is contained in:
alex 2024-08-24 11:11:21 -04:00
parent 0c7d3d5d9c
commit 2da09001d7
3 changed files with 47 additions and 40 deletions

View File

@ -153,7 +153,7 @@
# Syncthing # Syncthing
services = { services = {
syncthing = { syncthing = lib.mkForce {
enable = true; enable = true;
user = "alex"; user = "alex";
dataDir = "/home/alex/Sync"; dataDir = "/home/alex/Sync";

View File

@ -1,6 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
xsession.windowManager.bspwm = let theme = import ../theme.nix "light"; in { xsession.windowManager.bspwm =
let
theme = import ../theme.nix "light";
primaryMonitor = "eDP-1"; # = "DP-2" for thelio
windowGap = 2; # = "theme.sizing.xl" for thelio
in
{
enable = true; enable = true;
settings = { settings = {
normal_border_color = theme.colors.disabled; normal_border_color = theme.colors.disabled;
@ -8,14 +14,14 @@
focused_border_color = theme.colors.primary; focused_border_color = theme.colors.primary;
border_width = theme.sizing.m; border_width = theme.sizing.m;
window_gap = theme.sizing.xl; window_gap = windowGap;
focus_follows_pointer = true; focus_follows_pointer = true;
single_monocle = true; single_monocle = true;
honor_size_hints = true; honor_size_hints = true;
}; };
extraConfig = '' extraConfig = ''
bspc monitor DP-2 -d I II III IV V bspc monitor ${primaryMonitor} -d I II III IV V
bspc monitor HDMI-1 -d VI VII VIII IX X bspc monitor HDMI-1 -d VI VII VIII IX X
# Set mouse 1 to move floating windows: # Set mouse 1 to move floating windows:

View File

@ -7,6 +7,7 @@
let let
theme = import ../theme.nix "light"; theme = import ../theme.nix "light";
colors = theme.colors; colors = theme.colors;
primaryMonitor = "eDP-1"; # = "DP-2" for thelio
in in
rec { rec {
common-bar = { common-bar = {
@ -53,9 +54,9 @@
}; };
"bar/primary" = lib.recursiveUpdate common-bar { "bar/primary" = lib.recursiveUpdate common-bar {
monitor = "DP-2"; monitor = primaryMonitor;
modules-left = "xworkspaces xwindow"; modules-left = "xworkspaces xwindow";
modules-right = "filesystem memory cpu wlan date"; modules-right = "filesystem memory cpu wlan systray date";
}; };
"bar/secondary" = lib.recursiveUpdate common-bar { "bar/secondary" = lib.recursiveUpdate common-bar {