aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--home.nix2
-rw-r--r--modules/desktop/status-bar/polybar/bar/main.nix16
-rw-r--r--modules/desktop/status-bar/polybar/default.nix1
-rw-r--r--modules/desktop/status-bar/polybar/module/battery.nix46
-rw-r--r--modules/desktop/status-bar/polybar/module/bspwm.nix2
-rw-r--r--modules/desktop/status-bar/polybar/module/cpu.nix2
-rw-r--r--modules/desktop/status-bar/polybar/module/date.nix2
-rw-r--r--modules/desktop/status-bar/polybar/module/kernel-version.nix2
-rw-r--r--modules/desktop/status-bar/polybar/module/memory.nix2
-rw-r--r--modules/desktop/status-bar/polybar/module/separator.nix7
-rw-r--r--modules/desktop/status-bar/polybar/module/time.nix2
-rw-r--r--modules/desktop/terminal/kitty/default.nix2
-rw-r--r--modules/desktop/window-manager/default.nix2
-rw-r--r--modules/fonts/nerdfont/default.nix19
-rw-r--r--modules/fonts/nerdfont/fira-code/default.nix18
15 files changed, 72 insertions, 53 deletions
diff --git a/home.nix b/home.nix
index fe20f8a..05aaee3 100644
--- a/home.nix
+++ b/home.nix
@@ -16,7 +16,7 @@
desktop.xdg-portal.enable = true;
# Fonts
- fonts.nerdfont.enable = true;
+ fonts.nerdfont.fira-code.enable = true;
# Shell
shell.bash.enable = true;
diff --git a/modules/desktop/status-bar/polybar/bar/main.nix b/modules/desktop/status-bar/polybar/bar/main.nix
index d1f05b2..660c444 100644
--- a/modules/desktop/status-bar/polybar/bar/main.nix
+++ b/modules/desktop/status-bar/polybar/bar/main.nix
@@ -1,7 +1,9 @@
{ config }:
with config.scheme.withHashtag;
-{
+let
+ largerFontSize = toString (builtins.ceil (config.fonts.size * 9.0 / 8.0));
+in {
width = "\${env:POLYBAR_WIDTH}";
fixed-center = false;
height = 35;
@@ -21,20 +23,22 @@ with config.scheme.withHashtag;
padding-left = 1;
padding-right = 1;
- separator = "%{F${base03}}│%{F-}";
+ module-margin-left = 1;
+ module-margin-right = 1;
- module-margin-left = 2;
- module-margin-right = 2;
+ separator = "%{F${base03}}%{T3}│%{T-}%{F-}";
offset-x = "\${env:POLYBAR_OFFSET}";
offset-y = "\${env:POLYBAR_OFFSET}";
font-0 = "${config.fonts.normal}:pixelsize=${toString config.fonts.size};3";
+ font-1 = "${config.fonts.normal}:weight=Bold:pixelsize=${largerFontSize};3";
+ font-2 = "${config.fonts.normal}:style=Light:pixelsize=${largerFontSize};2";
modules-left =
if config.desktop.window-manager.bspwm.enable then
- "bspwm"
+ "bspwm separator"
else null;
modules-center = "xwindow";
- modules-right = "memory cpu battery time date kernel-version";
+ modules-right = "separator memory cpu battery time date kernel-version";
}
diff --git a/modules/desktop/status-bar/polybar/default.nix b/modules/desktop/status-bar/polybar/default.nix
index fb72e5f..05fb79a 100644
--- a/modules/desktop/status-bar/polybar/default.nix
+++ b/modules/desktop/status-bar/polybar/default.nix
@@ -23,6 +23,7 @@ POLYBAR_WIDTH=$((MONITOR_WIDTH - 2 * OFFSET)) POLYBAR_OFFSET=$OFFSET polybar mai
services.polybar.config = {
"bar/main" = import ./bar/main.nix { inherit config; };
+ "module/separator" = import ./module/separator.nix { inherit config; };
"module/xwindow" = import ./module/xwindow.nix { inherit config; };
"module/bspwm" =
if config.desktop.window-manager.bspwm.enable then
diff --git a/modules/desktop/status-bar/polybar/module/battery.nix b/modules/desktop/status-bar/polybar/module/battery.nix
index 6d4aef9..4c0bec6 100644
--- a/modules/desktop/status-bar/polybar/module/battery.nix
+++ b/modules/desktop/status-bar/polybar/module/battery.nix
@@ -6,31 +6,31 @@ with config.scheme.withHashtag;
battery = "BAT0";
adapter = "ADP1";
- format-charging = "<animation-charging> <label-charging>";
- format-discharging = "<ramp-capacity> <label-discharging>";
- format-full-prefix = "%{F${base0B}}󰁹%{F-}";
+ format-charging = "%{T2}%{F${base07}}<animation-charging>%{F-}%{T-} <label-charging>";
+ format-discharging = "%{T2}%{F${base07}}<ramp-capacity>%{F-}%{T-} <label-discharging>";
+ format-full-prefix = "󰁹";
- ramp-capacity-0 = "%{F${base0C}}󰁺%{F-}";
- ramp-capacity-1 = "%{F${base0C}}󰁻%{F-}";
- ramp-capacity-2 = "%{F${base0C}}󰁼%{F-}";
- ramp-capacity-3 = "%{F${base0C}}󰁽%{F-}";
- ramp-capacity-4 = "%{F${base0C}}󰁾%{F-}";
- ramp-capacity-5 = "%{F${base0C}}󰁿%{F-}";
- ramp-capacity-6 = "%{F${base0C}}󰂀%{F-}";
- ramp-capacity-7 = "%{F${base0C}}󰂁%{F-}";
- ramp-capacity-8 = "%{F${base0C}}󰂂%{F-}";
- ramp-capacity-9 = "%{F${base0C}}󰁹%{F-}";
+ ramp-capacity-0 = "󰁺";
+ ramp-capacity-1 = "󰁻";
+ ramp-capacity-2 = "󰁼";
+ ramp-capacity-3 = "󰁽";
+ ramp-capacity-4 = "󰁾";
+ ramp-capacity-5 = "󰁿";
+ ramp-capacity-6 = "󰂀";
+ ramp-capacity-7 = "󰂁";
+ ramp-capacity-8 = "󰂂";
+ ramp-capacity-9 = "󰁹";
- animation-charging-0 = "%{F${base0C}}󰁺%{F-}";
- animation-charging-1 = "%{F${base0C}}󰁻%{F-}";
- animation-charging-2 = "%{F${base0C}}󰁼%{F-}";
- animation-charging-3 = "%{F${base0C}}󰁽%{F-}";
- animation-charging-4 = "%{F${base0C}}󰁾%{F-}";
- animation-charging-5 = "%{F${base0C}}󰁿%{F-}";
- animation-charging-6 = "%{F${base0C}}󰂀%{F-}";
- animation-charging-7 = "%{F${base0C}}󰂁%{F-}";
- animation-charging-8 = "%{F${base0C}}󰂂%{F-}";
- animation-charging-9 = "%{F${base0C}}󰁹%{F-}";
+ animation-charging-0 = "󰁺";
+ animation-charging-1 = "󰁻";
+ animation-charging-2 = "󰁼";
+ animation-charging-3 = "󰁽";
+ animation-charging-4 = "󰁾";
+ animation-charging-5 = "󰁿";
+ animation-charging-6 = "󰂀";
+ animation-charging-7 = "󰂁";
+ animation-charging-8 = "󰂂";
+ animation-charging-9 = "󰁹";
animation-charging-framerate = 750;
}
diff --git a/modules/desktop/status-bar/polybar/module/bspwm.nix b/modules/desktop/status-bar/polybar/module/bspwm.nix
index c6671e7..ed82946 100644
--- a/modules/desktop/status-bar/polybar/module/bspwm.nix
+++ b/modules/desktop/status-bar/polybar/module/bspwm.nix
@@ -11,7 +11,7 @@ with config.scheme.withHashtag;
label-occupied = "%index%";
label-occupied-padding = 2;
- label-urgent = "%index%!";
+ label-urgent = "%index%";
label-urgent-underline = "${base08}";
label-urgent-padding = 2;
diff --git a/modules/desktop/status-bar/polybar/module/cpu.nix b/modules/desktop/status-bar/polybar/module/cpu.nix
index 403add3..409ac68 100644
--- a/modules/desktop/status-bar/polybar/module/cpu.nix
+++ b/modules/desktop/status-bar/polybar/module/cpu.nix
@@ -4,6 +4,6 @@ with config.scheme.withHashtag;
{
type = "internal/cpu";
interval = 2;
- format-prefix = "%{F${base09}} %{F-}";
+ format-prefix = "%{T2}%{F${base07}} %{F-}%{T-}";
label = "%percentage%%";
}
diff --git a/modules/desktop/status-bar/polybar/module/date.nix b/modules/desktop/status-bar/polybar/module/date.nix
index 9ebfd77..e9e7ef6 100644
--- a/modules/desktop/status-bar/polybar/module/date.nix
+++ b/modules/desktop/status-bar/polybar/module/date.nix
@@ -6,5 +6,5 @@ with config.scheme.withHashtag;
interval = 60;
date = "%d/%m/%Y";
label = "%date%";
- format-prefix = "%{F${base0B}} %{F-}";
+ format-prefix = "%{T2}%{F${base07}} %{F-}%{T-}";
}
diff --git a/modules/desktop/status-bar/polybar/module/kernel-version.nix b/modules/desktop/status-bar/polybar/module/kernel-version.nix
index e6822fa..697c49c 100644
--- a/modules/desktop/status-bar/polybar/module/kernel-version.nix
+++ b/modules/desktop/status-bar/polybar/module/kernel-version.nix
@@ -5,6 +5,6 @@ with config.scheme.withHashtag;
type = "custom/script";
exec = "uname -r";
interval = 1024;
- format-prefix = "%{F${base03}} %{F-}";
+ format-prefix = "%{T2}%{F${base07}} %{F-}%{T-}";
label = "%output%";
}
diff --git a/modules/desktop/status-bar/polybar/module/memory.nix b/modules/desktop/status-bar/polybar/module/memory.nix
index a09d4a8..82851db 100644
--- a/modules/desktop/status-bar/polybar/module/memory.nix
+++ b/modules/desktop/status-bar/polybar/module/memory.nix
@@ -4,6 +4,6 @@ with config.scheme.withHashtag;
{
type = "internal/memory";
interval = 2;
- format-prefix = "%{F${base0A}} %{F-}";
+ format-prefix = "%{T2}%{F${base07}} %{F-}%{T-}";
label = "%percentage_used%%";
}
diff --git a/modules/desktop/status-bar/polybar/module/separator.nix b/modules/desktop/status-bar/polybar/module/separator.nix
new file mode 100644
index 0000000..3cd1430
--- /dev/null
+++ b/modules/desktop/status-bar/polybar/module/separator.nix
@@ -0,0 +1,7 @@
+{ config }:
+
+with config.scheme.withHashtag;
+{
+ type = "custom/text";
+ label = " ";
+}
diff --git a/modules/desktop/status-bar/polybar/module/time.nix b/modules/desktop/status-bar/polybar/module/time.nix
index f3e0054..9095c98 100644
--- a/modules/desktop/status-bar/polybar/module/time.nix
+++ b/modules/desktop/status-bar/polybar/module/time.nix
@@ -6,5 +6,5 @@ with config.scheme.withHashtag;
interval = 30;
time = "%H:%M";
label = "%time%";
- format-prefix = "%{F${base0C}} %{F-}";
+ format-prefix = "%{T2}%{F${base07}} %{F-}%{T-}";
}
diff --git a/modules/desktop/terminal/kitty/default.nix b/modules/desktop/terminal/kitty/default.nix
index 943a730..8950a46 100644
--- a/modules/desktop/terminal/kitty/default.nix
+++ b/modules/desktop/terminal/kitty/default.nix
@@ -20,7 +20,7 @@
font_size = config.fonts.size;
font_family = config.fonts.normal;
filter_notification = "all";
- update_check_interval = 0;
+ update_check_interval = 0; # disable notifications
scrollback_indicator_opacity = "0.5";
dynamic_background_opacity = false;
diff --git a/modules/desktop/window-manager/default.nix b/modules/desktop/window-manager/default.nix
index de8034b..ed46a99 100644
--- a/modules/desktop/window-manager/default.nix
+++ b/modules/desktop/window-manager/default.nix
@@ -13,7 +13,7 @@
};
gap = lib.mkOption {
- type = lib.types.number;
+ type = lib.types.int;
default = 5;
description = "The spacing between windows.";
};
diff --git a/modules/fonts/nerdfont/default.nix b/modules/fonts/nerdfont/default.nix
index aff853c..d3bbc9b 100644
--- a/modules/fonts/nerdfont/default.nix
+++ b/modules/fonts/nerdfont/default.nix
@@ -1,18 +1,7 @@
-{ lib, config, pkgs, ... }:
+{ ... }:
{
- options.fonts.nerdfont = {
- enable = lib.mkEnableOption "Enables bash.";
- };
-
- config = lib.mkIf config.fonts.nerdfont.enable {
- fonts.normal = lib.mkDefault "Fira Code Nerd Font";
- home.packages = with pkgs; [
- (nerdfonts.override {
- fonts = [
- "FiraCode"
- ];
- })
- ];
- };
+ imports = [
+ ./fira-code
+ ];
}
diff --git a/modules/fonts/nerdfont/fira-code/default.nix b/modules/fonts/nerdfont/fira-code/default.nix
new file mode 100644
index 0000000..94381b4
--- /dev/null
+++ b/modules/fonts/nerdfont/fira-code/default.nix
@@ -0,0 +1,18 @@
+{ lib, config, pkgs, ... }:
+
+{
+ options.fonts.nerdfont.fira-code = {
+ enable = lib.mkEnableOption "Enables fira code nerd font.";
+ };
+
+ config = lib.mkIf config.fonts.nerdfont.fira-code.enable {
+ fonts.normal = lib.mkDefault "Fira Code Nerd Font";
+ home.packages = with pkgs; [
+ (nerdfonts.override {
+ fonts = [
+ "FiraCode"
+ ];
+ })
+ ];
+ };
+}
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-11 02:44:58 +0000