diff --git a/hosts/nixos/aramis/home.nix b/hosts/nixos/aramis/home.nix index 8f741dc..66a0892 100644 --- a/hosts/nixos/aramis/home.nix +++ b/hosts/nixos/aramis/home.nix @@ -28,13 +28,6 @@ nm-applet.enable = true; # Terminal terminal.program = "alacritty"; - # WM configuration - wm = { - i3bar = { - # Show VPN blocks - vpn.enable = true; - }; - }; # Zathura document viewer zathura.enable = true; }; diff --git a/modules/home/wm/default.nix b/modules/home/wm/default.nix index f86049d..6a615e5 100644 --- a/modules/home/wm/default.nix +++ b/modules/home/wm/default.nix @@ -36,31 +36,6 @@ in i3bar = { enable = mkRelatedOption "i3bar configuration" [ "i3" ]; - - vpn = { - enable = mkEnableOption "VPN configuration"; - - blockConfigs = mkOption { - type = with types; listOf (attrsOf str); - default = [ - { - active_format = " VPN "; - service = "wg-quick-wg"; - } - { - active_format = " VPN (LAN) "; - service = "wg-quick-lan"; - } - ]; - example = [ - { - active_format = " WORK "; - service = "some-service-name"; - } - ]; - description = "list of block configurations, merged with the defauls"; - }; - }; }; rofi = { diff --git a/modules/home/wm/i3bar/default.nix b/modules/home/wm/i3bar/default.nix index 5dbb505..645abeb 100644 --- a/modules/home/wm/i3bar/default.nix +++ b/modules/home/wm/i3bar/default.nix @@ -17,7 +17,7 @@ in top = { icons = "awesome5"; - blocks = builtins.filter (attr: attr != { }) (lib.flatten [ + blocks = builtins.filter (attr: attr != { }) [ { block = "music"; # This format seems to remove the block when not playing, somehow @@ -59,19 +59,6 @@ in { block = "disk_space"; } - (lib.optionals cfg.vpn.enable - ( - let - defaults = { - block = "service_status"; - active_state = "Good"; - inactive_format = ""; - inactive_state = "Idle"; - }; - in - builtins.map (block: defaults // block) cfg.vpn.blockConfigs - ) - ) { block = "net"; format = " $icon{| $ssid|} $ip{| $signal_strength|} "; @@ -105,7 +92,7 @@ in format = " $icon $timestamp.datetime(f:'%F %T') "; interval = 5; } - ]); + ]; }; }; };