From a51a4b7d8cecef7fe1486f8799f8ffc974d80519 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Tue, 30 Sep 2025 09:52:02 +0200 Subject: [PATCH] better ux for buldak --- home-manager/dotfiles/niri/config.kdl | 3 +- home-manager/dotfiles/waybar/config.jsonc | 11 +++-- home-manager/dotfiles/waybar/style.css | 9 +++- home-manager/home.nix | 55 ++++++++++++----------- hosts/buldak/configuration.nix | 10 ++++- hosts/buldak/features/software.nix | 1 + 6 files changed, 54 insertions(+), 35 deletions(-) diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index fa82ce4..9437258 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -571,6 +571,7 @@ binds { // wayland support spawn-at-startup "xwayland-satellite" +spawn-at-startup "poweralertd" spawn-at-startup "swww-daemon" spawn-at-startup "~/config/niri/start-bg.sh" @@ -581,7 +582,7 @@ environment { // apps to launch at startup spawn-at-startup "discord" spawn-at-startup "footclient" "nvim" "~/Documents/Notes" -spawn-at-startup "cider" +spawn-at-startup "cider-2" clipboard { disable-primary diff --git a/home-manager/dotfiles/waybar/config.jsonc b/home-manager/dotfiles/waybar/config.jsonc index f1a063b..c460262 100644 --- a/home-manager/dotfiles/waybar/config.jsonc +++ b/home-manager/dotfiles/waybar/config.jsonc @@ -23,8 +23,7 @@ "scroll-step": 0.2 }, "privacy": { - "icon-spacing": 4, - "icon-size": 18, + "icon-spacing": 4, "icon-size": 18, "transition-duration": 250, "modules": [ { @@ -43,7 +42,7 @@ "format": "{}%  " }, "network": { - "interface": "wlp3s0", + "interface": "wlo1", "format": "{ifname}", "format-wifi": " ", "format-ethernet": "󰈀", @@ -77,7 +76,7 @@ "exec-if": "which swaync-client", "exec": "swaync-client -swb", "on-click": "swaync-client -t -sw", - "on-click-right": "swaync-client -d -sw", + "escape": true }, "tray": { @@ -89,7 +88,7 @@ "warning": 20, "critical": 10 }, - "format": "{capacity}% {icon}" - "format-icons": ["", "", "", "", ""], + "format": "{capacity}% {icon}", + "format-icons": ["", "", "", "", ""] } } diff --git a/home-manager/dotfiles/waybar/style.css b/home-manager/dotfiles/waybar/style.css index 9d77e90..f692454 100644 --- a/home-manager/dotfiles/waybar/style.css +++ b/home-manager/dotfiles/waybar/style.css @@ -56,8 +56,8 @@ #workspaces button { border-radius: 0; - padding-left: 3px; - padding-right: 3px; + padding-left: 8px; + padding-right: 8px; } #bluetooth { @@ -109,6 +109,11 @@ margin-right: 16px; } +#battery { + border-radius: 12px; + margin-right: 16px; +} + #window { margin-left: 16px; background-color: @surface0; diff --git a/home-manager/home.nix b/home-manager/home.nix index 909ec27..e7ec9e6 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,4 +1,5 @@ { + inputs, config, pkgs, ... @@ -23,6 +24,7 @@ home.packages = with pkgs; [ + forgejo-cli yt-dlp nerd-fonts.code-new-roman ffmpegthumbnailer @@ -88,6 +90,8 @@ nvimpager mpc fastfetch + matugen + # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: @@ -114,31 +118,31 @@ ".config/mako".source = dotfiles/mako; }; - programs.matugen = { - enable = true; - variant = "dark"; - - config = { - wallpaper = { - command = "swww"; - arguments = [ - "img" - "--transition-type" - "center" - ]; - set = true; - }; - }; - - templates = { - waybar = { - input_path = "./templates/colors.css"; - output_path = "~/.config/waybar/colors.css"; - post_hook = "pkill -SIGUSR2 waybar"; - }; - }; - }; - + # programs.matugen = { + # enable = true; + # variant = "dark"; + # + # config = { + # wallpaper = { + # command = "swww"; + # arguments = [ + # "img" + # "--transition-type" + # "center" + # ]; + # set = true; + # }; + # }; + # + # templates = { + # waybar = { + # input_path = "./templates/colors.css"; + # output_path = "~/.config/waybar/colors.css"; + # post_hook = "pkill -SIGUSR2 waybar"; + # }; + # }; + # }; + # programs.direnv = { enable = true; enableBashIntegration = true; # see note on other shells below @@ -332,6 +336,7 @@ gpsh = "git push"; flake = "nix flake"; develop = "nix develop"; + fj = "fj --host git.rougebordeaux.xyz"; }; history.size = 10000; diff --git a/hosts/buldak/configuration.nix b/hosts/buldak/configuration.nix index 943f438..9e95bd9 100644 --- a/hosts/buldak/configuration.nix +++ b/hosts/buldak/configuration.nix @@ -52,7 +52,7 @@ boot.initrd.luks.devices."luks-d265e9b2-2ef5-445a-83f2-ec022e0eec7b".device = "/dev/disk/by-uuid/d265e9b2-2ef5-445a-83f2-ec022e0eec7b"; networking.hostName = "buldak"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Enable networking networking.networkmanager.enable = true; @@ -111,9 +111,17 @@ # $ nix search wget environment.systemPackages = with pkgs; [ poweralertd + upower matugen + networkmanagerapplet ]; + services.upower = { + enable = true; + percentageLow = 20; + percentageCritical = 10; + percentageAction = 5; + }; nixpkgs.config.permittedInsecurePackages = [ "libsoup-2.74.3" ]; diff --git a/hosts/buldak/features/software.nix b/hosts/buldak/features/software.nix index 138d144..25b35e7 100644 --- a/hosts/buldak/features/software.nix +++ b/hosts/buldak/features/software.nix @@ -10,6 +10,7 @@ cider-2 iamb qutebrowser + ente-desktop ]; virtualisation.containers.enable = true;