diff --git a/home/common/programs/desktop.nix b/home/common/programs/desktop.nix index b942593..93e3735 100644 --- a/home/common/programs/desktop.nix +++ b/home/common/programs/desktop.nix @@ -19,6 +19,7 @@ # communication slack zoom-us + ferdium # dev tools ferdium diff --git a/home/common/programs/eww/default.nix b/home/common/programs/eww/default.nix index 76c70ce..462ac11 100644 --- a/home/common/programs/eww/default.nix +++ b/home/common/programs/eww/default.nix @@ -1,7 +1,9 @@ -{ config, pkgs, ... }: { +{ config, pkgs, ... }: +{ home.packages = [ pkgs.eww ]; xdg.configFile = { "eww/eww.yuck".source = ./eww.yuck; "eww/eww.scss".source = ./eww.scss; + "eww/scripts".source = ./scripts; }; } diff --git a/home/common/programs/eww/eww.yuck b/home/common/programs/eww/eww.yuck index 85c3206..d847253 100644 --- a/home/common/programs/eww/eww.yuck +++ b/home/common/programs/eww/eww.yuck @@ -23,15 +23,12 @@ :space-evenly true :halign "start" :spacing 10 - (button :onclick "wmctrl -s 0" 1) - (button :onclick "wmctrl -s 1" 2) - (button :onclick "wmctrl -s 2" 3) - (button :onclick "wmctrl -s 3" 4) - (button :onclick "wmctrl -s 4" 5) - (button :onclick "wmctrl -s 5" 6) - (button :onclick "wmctrl -s 6" 7) - (button :onclick "wmctrl -s 7" 8) - (button :onclick "wmctrl -s 8" 9))) + (button :onclick "hyprctl dispatch workspace 1" 1) + (button :onclick "hyprctl dispatch workspace 2" 2) + (button :onclick "hyprctl dispatch workspace 3" 3) + (button :onclick "hyprctl dispatch workspace 4" 4) + (button :onclick "hyprctl dispatch workspace 5" 5) + (button :onclick "hyprctl dispatch workspace 8" 6))) (defwidget music [] (box :class "music" @@ -71,6 +68,6 @@ :width "100%" :height "10px" :anchor "top center") - :reserve (struts :side "top" :distance "20px") + :reserve (struts :side "top" :distance "4%") (bar)) diff --git a/home/common/programs/eww/scripts/getvol b/home/common/programs/eww/scripts/getvol old mode 100644 new mode 100755 diff --git a/home/common/programs/zsh.nix b/home/common/programs/zsh.nix index 2338add..e0a6758 100644 --- a/home/common/programs/zsh.nix +++ b/home/common/programs/zsh.nix @@ -80,6 +80,7 @@ home.packages = with pkgs; [ btop + inxi mise ripgrep pass diff --git a/hosts/common/features/laptop.nix b/hosts/common/features/laptop.nix index cc4f41f..f47de74 100644 --- a/hosts/common/features/laptop.nix +++ b/hosts/common/features/laptop.nix @@ -1,10 +1,12 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ acpi ]; + environment.systemPackages = with pkgs; [ + brightnessctl + ]; powerManagement = { enable = true; - powertop = true; + powertop.enable = true; }; services = { @@ -25,8 +27,4 @@ }; }; }; - - environment.systemPackages = with pkgs; [ - brightnessctl - ]; }