From 3995e664d090d3f776ea16d4825cb69b3e26dfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 12 Nov 2023 21:53:52 +0100 Subject: [PATCH] nix: Various fixes --- config/nix/hm/common.nix | 3 ++- config/nix/hm/desktop.nix | 2 +- config/nix/hm/style.nix | 12 +++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config/nix/hm/common.nix b/config/nix/hm/common.nix index b0ab15f..06c7859 100644 --- a/config/nix/hm/common.nix +++ b/config/nix/hm/common.nix @@ -241,7 +241,8 @@ in enable = true; enableZshIntegration = true; defaultOptions = [ "--height 40%" "--layout=default" ]; - fileWidgetOptions = [ "--preview '[[ -d {} ]] && ls -l --color=always {} || [[ \$(file --mime {}) =~ binary ]] && file --brief {} || (highlight -O ansi -l {} || coderay {} || rougify {} || cat {}) 2> /dev/null | head -500'" ]; + fileWidgetOptions = [ "--preview '[[ -d {} ]] && ${pkgs.coreutils}/bin/ls -l --color=always {} || [[ \$(${pkgs.file}/bin/file --mime {}) =~ binary ]] && ${pkgs.file}/bin/file --brief {} || (${pkgs.highlight}/bin/highlight -O ansi -l {} || coderay {} || rougify {} || ${pkgs.coreutils}/bin/cat {}) 2> /dev/null | head -500'" ]; + # file and friends are not in PATH by default... so here we want aboslute paths, which means those won't get reloaded. Meh. }; # TODO highlight or bat nix-index = { diff --git a/config/nix/hm/desktop.nix b/config/nix/hm/desktop.nix index 9a07883..941eab1 100644 --- a/config/nix/hm/desktop.nix +++ b/config/nix/hm/desktop.nix @@ -103,7 +103,7 @@ # TODO Is a shell script even required? }"; "${mod}+Shift+Return" = "exec ${config.programs.urxvt.package}/bin/urxvt"; - "${mod}+p" = "exec ${pkgs.xfce.thunar}/bin/tunar"; + "${mod}+p" = "exec ${pkgs.xfce.thunar}/bin/thunar"; "${mod}+m" = "exec ${config.programs.qutebrowser.package}/bin/qutebrowser --override-restore --backend=webengine"; # TODO --backend not useful anymore # Volume control diff --git a/config/nix/hm/style.nix b/config/nix/hm/style.nix index 06456ed..935dc5c 100644 --- a/config/nix/hm/style.nix +++ b/config/nix/hm/style.nix @@ -17,9 +17,15 @@ in }; # FIXME This doesn't work - fonts.monospace = { - package = pkgs.nerdfonts; - name = "DejaVuSansM Nerd Font"; + fonts = { + sizes = { + applications = 10; + terminal = 10; + }; + monospace = { + package = pkgs.nerdfonts; + name = "DejaVuSansM Nerd Font"; + }; }; targets.vim.enable = false; # FIXME Not compatible with nixvim for now (there's a MR)