diff --git a/nixos/common.nix b/nixos/common.nix index d2fc7ff0..828c6ac5 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -39,6 +39,7 @@ in shell = pkgs.zsh; }; + programs.light.enable = true; virtualisation.docker = { enable = true; diff --git a/nixos/home.nix b/nixos/home.nix index bade3fd4..b8e445f6 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -13,6 +13,7 @@ in }; }; home.packages = with pkgs; [ + wirelesstools keepass fontconfig nodejs rustup gcc gdb binutils xclip pkgconfig veracrypt gitAndTools.diff-so-fancy openjdk11 gimp restic glxinfo discord diff --git a/nixos/polybar.nix b/nixos/polybar.nix index 0a4bda2c..498c2dd5 100644 --- a/nixos/polybar.nix +++ b/nixos/polybar.nix @@ -3,13 +3,21 @@ services.polybar = { enable = true; script = "polybar -r main_bar &"; + package = pkgs.polybar.override { + i3GapsSupport = true; + alsaSupport = true; + iwSupport = true; + nlSupport = false; + githubSupport = true; + }; config = { + "settings" = {screenchange-reload = "true";}; "bar/main_bar" = { - font-0 = "DejaVu Sans Mono for Powerline:size=10.0;weight=bold"; + font-0 = "DejaVu Sans Mono for Powerline:size=12.0;weight=bold"; background = "#002b36"; foreground = "#839496"; bottom = "false"; - height = 50; + height = 32; fixed-center = "true"; line-size = 6; padding-right = "1%"; @@ -17,8 +25,9 @@ module-margin-right = 1; modules-left = "xwindow"; modules-center = "date"; - modules-right = "org-clock volume backlight filesystem memory cpu network"; + modules-right = "backlight volume memory cpu battery-label battery1 battery0"; }; + "module/date" = { type = "internal/date"; interval = 5; @@ -26,48 +35,62 @@ time = "%H:%M"; label = "%date% %time%"; }; - "settings" = {screenchange-reload = "true";}; + "module/xwindow" = { type = "internal/xwindow"; label = "%title:0:30:...%"; label-padding = 10; }; - "module/network" = { - type = "internal/network"; - interface = "wlp1s0"; - interval = "3.0"; - format-connected = ""; - label-connected = " %essid%"; - }; + "module/cpu" = { type = "internal/cpu"; - label = " %percentage:2%%"; + interval = 3; + format = "CPU: