diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 5047642..e787afa 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -30,6 +30,7 @@ in { firefox fftw gcc + gh grc gparted git @@ -67,6 +68,7 @@ in { pamixer pavucontrol pdfarranger + pdfpc pfetch pidgin playerctl diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 4dbfce0..7458b6e 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -6,6 +6,7 @@ }: let cfg = config.modules.system.programs.terminals.foot; colours = config.modules.style.colorScheme.colors; + inherit (config.meta.mainUser) username; inherit (lib) mkIf; @@ -16,10 +17,10 @@ title = "foot"; locked-title = "no"; - font = "valiosevka:size=14"; - font-bold = "valiosevka:size=14"; - # font = "Iosevka Nerd Font:size=14"; - # font-bold = "Iosevka Nerd Font:size=14"; + # font = "valiosevka:size=14"; + # font-bold = "valiosevka:size=14"; + font = "Iosevka Nerd Font:size=14"; + font-bold = "Iosevka Nerd Font:size=14"; line-height = 20; letter-spacing = 0; @@ -124,7 +125,7 @@ paths = [pkgs.foot]; buildInputs = [pkgs.makeWrapper]; postBuild = '' - wrapProgram $out/bin/foot --add-flags "--config=${foot-config}" + wrapProgram $out/bin/foot --add-flags "--config=${foot-config} --working-directory=/home/${username}" ''; }; in { diff --git a/modules/wms/wayland/hyprland/binds.nix b/modules/wms/wayland/hyprland/binds.nix index 6ab9307..e94bc11 100644 --- a/modules/wms/wayland/hyprland/binds.nix +++ b/modules/wms/wayland/hyprland/binds.nix @@ -1,10 +1,12 @@ { config, + lib, pkgs, ... }: let cfg = config.modules.desktops.hyprland; inherit (builtins) map genList toString; + inherit (lib.meta) getExe; in { programs.hyprland.settings = { # Keybinds @@ -30,8 +32,9 @@ in { "$mainMod, RETURN, exec, foot" "$mainMod, Q, killactive" "$mainMod, F, fullscreen, 0" - "$mainMod, D, exec, ${pkgs.procps}/bin/pkill walker || ${pkgs.walker}/bin/walker" + "$mainMod, D, exec, ${pkgs.procps}/bin/pkill fuzzel || ${getExe pkgs.fuzzel}" "$mainMod, SPACE, togglefloating, active" + "$mainMod ALT, L, exec, ${getExe pkgs.swaylock}" # Screenshotting "$mainMod, S, exec, ${pkgs.grimblast}/bin/grimblast copy area" # only copy diff --git a/packages/shell/aliases.nix b/packages/shell/aliases.nix index 23b0ca8..de33835 100644 --- a/packages/shell/aliases.nix +++ b/packages/shell/aliases.nix @@ -16,7 +16,7 @@ in { ytopus = "yt-dlp -x --embed-metadata --audio-quality 0 --audio-format opus --embed-metadata --embed-thumbnail"; - cat = "${getExe pkgs.bat} --plain"; + cat = "${getExe pkgs.bat}"; kys = "shutdown now"; diff --git a/packages/shell/starship.nix b/packages/shell/starship.nix index 0fa39f5..fde1199 100644 --- a/packages/shell/starship.nix +++ b/packages/shell/starship.nix @@ -21,6 +21,7 @@ git_commit.commit_hash_length = 7; git_status = { + disabled = true; ahead = "⇡ "; behind = "⇣ "; conflicted = " ";