Compare commits

..

No commits in common. "3c3d062ed51a853445b207383874294b7c79ebea" and "11d4804be85725b5e246391cbf508b204901253a" have entirely different histories.

6 changed files with 32 additions and 65 deletions

View File

@ -1,7 +0,0 @@
{ ... }:
{
services.nextcloud-client = {
enable = true;
startInBackground = true;
};
}

View File

@ -1,18 +1,15 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
xsession.windowManager.bspwm = let theme = import ../theme.nix; in { xsession.windowManager.bspwm = let colors = import ../color-scheme.nix; in {
enable = true; enable = true;
settings = { settings = {
normal_border_color = theme.colors.disabled; normal_border_color = colors.disabled;
active_border_color = theme.colors.secondary; active_border_color = colors.secondary;
focused_border_color = theme.colors.primary; focused_border_color = colors.primary;
border_width = theme.sizing.m;
window_gap = theme.sizing.xl;
border_width = 2;
window_gap = 10;
focus_follows_pointer = true; focus_follows_pointer = true;
single_monocle = true;
honor_size_hints = true;
}; };
extraConfig = '' extraConfig = ''
bspc monitor DP-2 -d I II III IV V bspc monitor DP-2 -d I II III IV V
@ -29,11 +26,6 @@
${pkgs.feh}/bin/feh --bg-fill ${pkgs.atau-pkgs.atau-wallpapers}/share/backgrounds/atau-wallpapers/aos1.png ${pkgs.feh}/bin/feh --bg-fill ${pkgs.atau-pkgs.atau-wallpapers}/share/backgrounds/atau-wallpapers/aos1.png
''; '';
startupPrograms = [ startupPrograms = [ "picom" "polybar primary" "polybar secondary" ];
"bluetoothd"
"picom"
"polybar primary"
"polybar secondary"
];
}; };
} }

View File

@ -4,20 +4,20 @@
enable = true; enable = true;
script = ""; # required but we start polybar via bspwm, so dont start it here. script = ""; # required but we start polybar via bspwm, so dont start it here.
config = rec { config = rec {
theme = import ../theme.nix; colors = import ../.color-scheme.nix;
common-bar = { common-bar = {
width = "100%"; width = "100%";
height = "${theme.sizing.str.xl}pt"; height = "24pt";
radius = theme.border-radius; radius = 10;
#;dpi = 96 #;dpi = 96
background = theme.colors.background; background = colors.background;
foreground = theme.colors.foreground; foreground = colors.foreground;
line-size = "3pt"; line-size = "3pt";
border-size = "${theme.sizing.str.m}pt"; border-size = "4pt";
border-color = "#00000000"; border-color = "#00000000";
padding-left = 0; padding-left = 0;
@ -26,7 +26,7 @@
module-margin = 1; module-margin = 1;
separator = "|"; separator = "|";
separator-foreground = theme.colors.disabled; separator-foreground = colors.disabled;
font-0 = "monospace;2"; font-0 = "monospace;2";
wm-restack = "bspwm"; wm-restack = "bspwm";
@ -59,19 +59,19 @@
pin-workspaces = true; pin-workspaces = true;
label-active = "%name%"; label-active = "%name%";
label-active-background = theme.colors.background-alt; label-active-background = colors.background-alt;
label-active-underline = theme.colors.primary; label-active-underline = colors.primary;
label-active-padding = 1; label-active-padding = 1;
label-occupied = "%name%"; label-occupied = "%name%";
label-occupied-padding = 1; label-occupied-padding = 1;
label-urgent = "%name%"; label-urgent = "%name%";
label-urgent-background = theme.colors.alert; label-urgent-background = colors.alert;
label-urgent-padding = 1; label-urgent-padding = 1;
label-empty = "%name%"; label-empty = "%name%";
label-empty-foreground = theme.colors.disabled; label-empty-foreground = colors.disabled;
label-empty-padding = 1; label-empty-padding = 1;
}; };
}; };

View File

@ -0,0 +1,12 @@
{
background = "#282A2E";
background-alt = "#373B41";
foreground = "#C5C8C6";
primary = "#F0C674";
secondary = "#8ABEB7";
alert = "#A54242";
disabled = "#707880";
}

View File

@ -1,30 +0,0 @@
{
border-radius = 5;
colors = {
background = "#282A2E";
background-alt = "#373B41";
foreground = "#C5C8C6";
primary = "#F0C674";
secondary = "#8ABEB7";
alert = "#A54242";
disabled = "#707880";
};
sizing = rec {
xs = 1;
s = 2;
m = 4;
l = 8;
xl = 16;
str = {
xs = toString xs;
s = toString s;
m = toString m;
l = toString l;
xl = toString xl;
};
};
}

View File

@ -7,6 +7,7 @@
home.homeDirectory = "/home/${user}"; home.homeDirectory = "/home/${user}";
imports = [ imports = [
../../apps/vscode.nix
../../modules/bspwm ../../modules/bspwm
../../apps/bash.nix ../../apps/bash.nix
@ -14,8 +15,6 @@
../../apps/git.nix ../../apps/git.nix
../../apps/kitty.nix ../../apps/kitty.nix
../../apps/mpv.nix ../../apps/mpv.nix
../../apps/nextcloud.nix
../../apps/vscode.nix
]; ];
# Packages that should be installed to the user profile. # Packages that should be installed to the user profile.
@ -49,6 +48,7 @@
lmms lmms
lutris lutris
moonlight-qt moonlight-qt
nextcloud-client
nixpkgs-fmt nixpkgs-fmt
nodejs_20 nodejs_20
obsidian obsidian