diff --git a/home/common/gui.nix b/home/common/gui.nix index 0eaedb6..16fe0b8 100644 --- a/home/common/gui.nix +++ b/home/common/gui.nix @@ -147,6 +147,7 @@ }; # profiles = {}; package = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { + # webp support ffmpeg_5 = pkgs.ffmpeg_5-full; }) { scripts = @@ -284,7 +285,8 @@ # cli tools imagemagick ffmpeg_5-full # fonts - noto-fonts noto-fonts-cjk noto-fonts-emoji + noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif + noto-fonts-emoji noto-fonts-extra (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) # might check out some day (tm) # nyxt qutebrowser diff --git a/home/common/i3-sway.nix b/home/common/i3-sway.nix index c7ba4c2..ee61d28 100644 --- a/home/common/i3-sway.nix +++ b/home/common/i3-sway.nix @@ -310,12 +310,16 @@ in export XDG_CURRENT_DESKTOP=sway export XDG_SESSION_DESKTOP=sway # TODO: set to sdl3 compat when SDL3 releases - export SDL_DYNAMIC_API=${pkgs.SDL2.out}/lib/libSDL2.so + # this is for steam games, I set the launch options to: + # `SDL_DYNAMIC_API=$SDL2_DYNAMIC_API %command%` + # Steam itself doesn't work with SDL_DYNAMIC_API set, so it's + # a bad idea to set SDL_DYNAMIC_API globally + export SDL2_DYNAMIC_API=${pkgs.SDL2.out}/lib/libSDL2.so ''; }; services.swayidle = let swaylock-start = builtins.toString (with pkgs; writeScript "swaylock-start" '' #! ${bash}/bin/bash - ${procps}/bin/pgrep -fx ${swaylock}/bin/swaylock || (${swaylock}/bin/swaylock && ${pkgs.sway}/bin/swaymsg "output * dpms on") + ${procps}/bin/pgrep -fx "${swaylock}/bin/swaylock -f" || ${swaylock}/bin/swaylock -f ''); in { enable = config.wayland.windowManager.sway.enable; events = [ @@ -326,14 +330,8 @@ in { timeout = 300; command = "${pkgs.sway}/bin/swaymsg \"output * dpms off\""; resumeCommand = "${pkgs.sway}/bin/swaymsg \"output * dpms on\""; } - { timeout = 598; - command = "${pkgs.sway}/bin/swaymsg \"output * dpms on\""; } { timeout = 600; - command = swaylock-start; - resumeCommand = "${pkgs.sway}/bin/swaymsg \"output * dpms on\""; } - { timeout = 602; - command = "${pkgs.sway}/bin/swaymsg \"output * dpms off\""; - resumeCommand = "${pkgs.sway}/bin/swaymsg \"output * dpms on\""; } + command = swaylock-start; } ]; }; programs.swaylock.settings = rec { diff --git a/home/common/vim.nix b/home/common/vim.nix index 251e76c..64ed59f 100644 --- a/home/common/vim.nix +++ b/home/common/vim.nix @@ -99,7 +99,7 @@ vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) vim.keymap.set('n', 'wl', function() diff --git a/home/common/waybar.css b/home/common/waybar.css index 6e001fa..1f8ac3b 100644 --- a/home/common/waybar.css +++ b/home/common/waybar.css @@ -55,15 +55,18 @@ window#waybar.hidden { } #clock, -#cpu, -#memory, -#wireplumber, #battery, -#language, #tray { padding: 0 8px; } +#memory, +#cpu, +#wireplumber, +#language { + padding: 0 3px; +} + #mode, #workspaces, #workspaces button @@ -75,8 +78,8 @@ window#waybar.hidden { } #window { - padding: 0 3px; - margin: 3px 2px; + padding: 0 0; + margin: 3px 0; background-color: transparent; color: @fg; } diff --git a/home/common/waybar.nix b/home/common/waybar.nix index 76fa197..b5e2235 100644 --- a/home/common/waybar.nix +++ b/home/common/waybar.nix @@ -9,8 +9,8 @@ src = pkgs.fetchFromGitHub { owner = "chayleaf"; repo = "Waybar"; - rev = "44984a3990d347af50c09d8492bf3853cd361b96"; - sha256 = "sha256-aiMvzB/uMaaQreCQ2T2nl4qFYW0DzMnvknvmdbGhF2c="; + rev = "8c3a5d8044b9de7de445c76b22443939a6870dc4"; + sha256 = "sha256-4dRsR6D2KYa3eLojTNAS6UZNnle78yeNbSH2XwjcwlU="; }; }); settings = [{ @@ -23,7 +23,7 @@ tooltip = true; format = "{player_icon} {dynamic}"; format-paused = "{status_icon} {dynamic}"; - interval = 10; + interval = 1; # tooltip-format = "{dynamic}"; album-len = 32; artist-len = 32; @@ -73,12 +73,12 @@ modules-right = [ "memory" "cpu" "tray" "wireplumber" "clock" "sway/language" ]; cpu = { # format = "{usage}% "; - format = " {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}"; + format = "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}"; format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"]; tooltip = false; }; memory = { - format = " {used}G"; + format = "{used}G"; tooltip = false; }; tray = { @@ -86,9 +86,8 @@ spacing = 5; }; wireplumber = { - format = "{icon} {volume}%"; + format = "{volume}%"; format-muted = "ﱝ"; - format-icons = ["奄" "奔" "墳"]; tooltip = false; }; clock = { @@ -98,6 +97,8 @@ }; "sway/language" = { tooltip = false; + # make sure it isn't pushed away when other modules get too big + min-length = 2; }; }]; style = ./waybar.css;