diff options
| -rw-r--r-- | home.nix | 1 | ||||
| -rw-r--r-- | modules/graphical/bspwm/default.nix | 2 | ||||
| -rw-r--r-- | modules/graphical/default.nix | 3 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/cpu.nix | 2 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/date.nix | 2 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/default.nix | 1 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/kernel-version.nix | 10 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/memory.nix | 2 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/time.nix | 2 | ||||
| -rw-r--r-- | modules/graphical/polybar/module/volume.nix | 4 | ||||
| -rw-r--r-- | modules/tools/default.nix | 1 | ||||
| -rw-r--r-- | modules/tools/lsd/default.nix | 12 |
12 files changed, 10 insertions, 32 deletions
@@ -26,7 +26,6 @@ tools.git.email = "54011232+arpitchakladar@users.noreply.github.com"; tools.htop.enable = true; tools.kitty.enable = true; - tools.lsd.enable = true; tools.neofetch.enable = true; tools.neovim.enable = true; tools.neovim.profile = "full"; diff --git a/modules/graphical/bspwm/default.nix b/modules/graphical/bspwm/default.nix index 657b129..f334290 100644 --- a/modules/graphical/bspwm/default.nix +++ b/modules/graphical/bspwm/default.nix @@ -13,7 +13,7 @@ focus_follows_pointer = true; pointer_follows_focus = false; pointer_motion_interval = 40; - pointer_modifier = "mod1"; # alt key + pointer_modifier = "mod4"; pointer_action1 = "resize_side"; pointer_action2 = "move"; pointer_action3 = "resize_corner"; diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index 411deaa..9e18ce0 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -20,6 +20,9 @@ ${if config.tools.feh.enable then "${pkgs.feh}/bin/feh --bg-scale ${../../assets/skeleton-mage.png}" else "xsetroot -solid \"${config.scheme.withHashtag.base00}\""} +pkill sxhkd +sxhkd & +exec ${pkgs.bspwm}/bin/bspwm "; }; } diff --git a/modules/graphical/polybar/module/cpu.nix b/modules/graphical/polybar/module/cpu.nix index d37b5cc..8134df1 100644 --- a/modules/graphical/polybar/module/cpu.nix +++ b/modules/graphical/polybar/module/cpu.nix @@ -4,6 +4,6 @@ with config.scheme.withHashtag; { type = "internal/cpu"; interval = 2; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; + format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; label = "%percentage%%"; } diff --git a/modules/graphical/polybar/module/date.nix b/modules/graphical/polybar/module/date.nix index 56e2fa6..9c56121 100644 --- a/modules/graphical/polybar/module/date.nix +++ b/modules/graphical/polybar/module/date.nix @@ -6,5 +6,5 @@ with config.scheme.withHashtag; interval = 60; date = "%d/%m/%Y"; label = "%date%"; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; + format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; } diff --git a/modules/graphical/polybar/module/default.nix b/modules/graphical/polybar/module/default.nix index fc57f52..fe5b8a1 100644 --- a/modules/graphical/polybar/module/default.nix +++ b/modules/graphical/polybar/module/default.nix @@ -10,5 +10,4 @@ "module/time" = import ./time.nix { inherit config; }; "module/volume" = import ./volume.nix { inherit config; }; "module/battery" = import ./battery.nix { inherit config; }; - "module/kernel-version" = import ./kernel-version.nix { inherit config; }; } diff --git a/modules/graphical/polybar/module/kernel-version.nix b/modules/graphical/polybar/module/kernel-version.nix deleted file mode 100644 index 8f94e37..0000000 --- a/modules/graphical/polybar/module/kernel-version.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "custom/script"; - exec = "uname -r"; - interval = 1024; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; - label = "%output%"; -} diff --git a/modules/graphical/polybar/module/memory.nix b/modules/graphical/polybar/module/memory.nix index cf70874..a4aa410 100644 --- a/modules/graphical/polybar/module/memory.nix +++ b/modules/graphical/polybar/module/memory.nix @@ -4,6 +4,6 @@ with config.scheme.withHashtag; { type = "internal/memory"; interval = 2; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; + format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; label = "%gb_used%"; } diff --git a/modules/graphical/polybar/module/time.nix b/modules/graphical/polybar/module/time.nix index b8ea545..71df1a5 100644 --- a/modules/graphical/polybar/module/time.nix +++ b/modules/graphical/polybar/module/time.nix @@ -6,5 +6,5 @@ with config.scheme.withHashtag; interval = 30; time = "%H:%M"; label = "%time%"; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; + format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; } diff --git a/modules/graphical/polybar/module/volume.nix b/modules/graphical/polybar/module/volume.nix index e3eb758..ee18dc0 100644 --- a/modules/graphical/polybar/module/volume.nix +++ b/modules/graphical/polybar/module/volume.nix @@ -4,9 +4,9 @@ with config.scheme.withHashtag; { type = "internal/pulseaudio"; interval = 5; - format-volume = "<ramp-volume> <label-volume>"; + format-volume = "%{T2}%{F${base03}}<ramp-volume>%{F-}%{T-} <label-volume>"; label-volume = "%percentage%%"; - label-muted = " "; + label-muted = "%{T2}%{F${base03}} "; ramp-volume-0 = " "; ramp-volume-1 = " "; ramp-volume-2 = " "; diff --git a/modules/tools/default.nix b/modules/tools/default.nix index d733a12..2cc4330 100644 --- a/modules/tools/default.nix +++ b/modules/tools/default.nix @@ -11,7 +11,6 @@ ./git ./htop ./kitty - ./lsd ./neofetch ./neovim ./nnn diff --git a/modules/tools/lsd/default.nix b/modules/tools/lsd/default.nix deleted file mode 100644 index feb1481..0000000 --- a/modules/tools/lsd/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: - -{ - options.tools.lsd = { - enable = lib.mkEnableOption "Enables lsd."; - }; - - config = lib.mkIf config.tools.lsd.enable { - programs.lsd.enable = true; - programs.lsd.settings.icons.separator = " "; - }; -} |
