From 341216cd94debb335a5650960ccf46a92ab66f47 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sun, 16 Apr 2023 12:49:10 +0200 Subject: [PATCH] Update fish/tide and some minor tweaks --- home/common.nix | 4 ++-- home/fish/fish.nix | 5 +++-- home/fish/tide/nix-shell.nix | 3 ++- home/kagami-pc-home.nix | 1 + modules/personal/fonts/default.nix | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/home/common.nix b/home/common.nix index 6638203..9f1d39b 100644 --- a/home/common.nix +++ b/home/common.nix @@ -42,8 +42,8 @@ # Fonts fantasque-sans-mono - ## Enable the FSM font with NF variant - (nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + ## Get the nerd font symbols + (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) # CLI tools fd diff --git a/home/fish/fish.nix b/home/fish/fish.nix index 5ea882d..f38e229 100644 --- a/home/fish/fish.nix +++ b/home/fish/fish.nix @@ -166,8 +166,9 @@ src = pkgs.fetchFromGitHub { owner = "IlanCosman"; repo = "tide"; - rev = "3787c725f7f6a0253f59a2c0e9fde03202689c6c"; - sha256 = "00zsib1q21bgxffjlyxf5rgcyq3h1ixwznwvid9k6mkkmwixv9lj"; + rev = "447945d2cff8f70d5c791dd4eec8b322d37798dd"; + # sha256 = lib.fakeSha256; + sha256 = "sha256-1c2E3UC3r9hPfijAQoZ/+4yXieFxC4+hkk7wUyr30NM="; }; } { diff --git a/home/fish/tide/nix-shell.nix b/home/fish/tide/nix-shell.nix index eeddd3d..28504c0 100644 --- a/home/fish/tide/nix-shell.nix +++ b/home/fish/tide/nix-shell.nix @@ -11,8 +11,9 @@ in config.programs.fish = mkIf cfg.enable { functions._tide_item_nix_shell = '' + # In a Nix Shell if string match -q "/nix/store/*" $PATH - set -U tide_nix_shell_color blue + set -U tide_nix_shell_color (set -q DIRENV_DIR && echo "FFA500" || echo "blue") set -U tide_nix_shell_bg_color normal _tide_print_item nix_shell "❄" end diff --git a/home/kagami-pc-home.nix b/home/kagami-pc-home.nix index faf81f0..d14e853 100644 --- a/home/kagami-pc-home.nix +++ b/home/kagami-pc-home.nix @@ -34,6 +34,7 @@ programs.my-sway.enableMpd = true; # Keyboard options wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp"; + wayland.windowManager.sway.config.input."type:pointer".accel_profile = "flat"; # 144hz adaptive refresh ON! wayland.windowManager.sway.config.output = let diff --git a/modules/personal/fonts/default.nix b/modules/personal/fonts/default.nix index 70d66d5..823dba6 100644 --- a/modules/personal/fonts/default.nix +++ b/modules/personal/fonts/default.nix @@ -25,7 +25,7 @@ in fonts = with pkgs; [ noto-fonts-emoji-blob-bin ibm-plex - (nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) noto-fonts noto-fonts-cjk merriweather