From af84369e19fbf62af8432437b1a2c94565954be5 Mon Sep 17 00:00:00 2001 From: CDaut Date: Fri, 26 Apr 2024 10:39:18 +0200 Subject: [PATCH] waybar tweaks :3 --- home.nix | 11 ++++------- programm_configs/sway.nix | 5 +++-- programm_configs/vscode.nix | 1 + programm_configs/waybar.nix | 6 +++--- programm_configs/waybarstyle.css | 5 +++++ 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/home.nix b/home.nix index c9a9e94..c69c1d9 100644 --- a/home.nix +++ b/home.nix @@ -4,11 +4,12 @@ let inherit (pkgs.texlive) scheme-full; }); in +let username = "clemens"; in { # Home Manager needs a bit of information about you and the paths it should # manage. - home.username = "clemens"; - home.homeDirectory = "/home/clemens"; + home.username = username; + home.homeDirectory = "/home/${username}"; # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release @@ -83,10 +84,6 @@ in target = ".config/i3/lock.sh"; executable = true; }; - wallpaper = { - source = ./media/wallpaper.png; - target = ".background-image"; - }; }; # envars @@ -95,7 +92,7 @@ in GTK_THEME = "Adwaita:dark"; }; systemd.user.sessionVariables = { - GTK2_RC_FILES = "/home/clemens/.gtkrc-2.0"; + GTK2_RC_FILES = "/home/${username}/.gtkrc-2.0"; GTK_THEME = "Adwaita:dark"; }; } diff --git a/programm_configs/sway.nix b/programm_configs/sway.nix index 61457c9..3376e91 100644 --- a/programm_configs/sway.nix +++ b/programm_configs/sway.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { wayland.windowManager.sway = let mod = "Mod4"; in { enable = true; @@ -14,6 +14,7 @@ xkb_layout = "de"; }; }; + output."*".bg = "${../media/wallpaper.png} fill"; menu = "${pkgs.rofi}/bin/rofi -show combi -config ~/.config/rofi/config.rasi"; modifier = mod; # Super key gaps = { @@ -112,7 +113,7 @@ always = true; } { - command = "blueman-tray"; + command = "blueman-applet"; always = true; } ]; diff --git a/programm_configs/vscode.nix b/programm_configs/vscode.nix index b04318e..5cb4da2 100644 --- a/programm_configs/vscode.nix +++ b/programm_configs/vscode.nix @@ -18,6 +18,7 @@ mkhl.direnv ms-vscode.cmake-tools twxs.cmake + tomoki1207.pdf ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "shader"; diff --git a/programm_configs/waybar.nix b/programm_configs/waybar.nix index 0beecc7..5d5226b 100644 --- a/programm_configs/waybar.nix +++ b/programm_configs/waybar.nix @@ -13,9 +13,9 @@ height = 30; spacing = 20; modules-left = [ "sway/workspaces" ]; - modules-right = [ "disk" "pulseaudio" "cpu" "network#eth" "network#wireless" "eth" "battery" "temperature" "clock" "tray" ]; + modules-right = [ "disk" "pulseaudio" "cpu" "network#eth" "network#wireless" "battery" "temperature" "clock" "tray" ]; - "tray" = { + "tray" = { spacing = 10; icon-size = 20; }; @@ -48,7 +48,7 @@ critical-threshold = 70; format = "{temperatureC}°C"; interval = 2; - hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon0/temp1_input"; + hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input"; }; "network#eth" = { diff --git a/programm_configs/waybarstyle.css b/programm_configs/waybarstyle.css index cd8c6ce..c87a831 100644 --- a/programm_configs/waybarstyle.css +++ b/programm_configs/waybarstyle.css @@ -29,6 +29,11 @@ window#waybar { background: rgb(111.5, 39, 49); } +#battery.charging { + background: rgb(39, 111.5, 49); + +} + #network.wireless { border-bottom: 4px solid #9f78e1; }