diff --git a/home/config/fonts.nix b/home/config/fonts.nix new file mode 100644 index 0000000..b2ef0d8 --- /dev/null +++ b/home/config/fonts.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + jetbrains-mono + noto-fonts + unifont + + (nerdfonts.override { + fonts = [ + "NerdFontsSymbolsOnly" + ]; + }) + ]; +} diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index b619a91..bdd1f2f 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -2,6 +2,8 @@ args@{ pkgs, config, lib, ... }: { imports = [ + ../config/fonts.nix + ../programs/fish.nix ../programs/atuin.nix ../programs/starship.nix diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 964b4ec..34cd503 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -89,8 +89,8 @@ in src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "3004104180391328fca40339587f254d835a9527"; - sha256 = "1slpbs7x72xijbzmbhmlzylhpq02a4y98rnnk3lnsk3n37pfmn82"; + rev = "c390eab0950ea01a0d118c2c3c29db7781430b33"; + sha256 = "1pminnalq75r4cw0j8f4mh0qhvzakzgmr106p9c3qhj54km22jsp"; fetchSubmodules = false; }; }; @@ -462,12 +462,12 @@ in }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-06-19"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "83c59ed1eeae70a55605990993cf4d208948fdf7"; - sha256 = "1780104ap415dlnvik1s027vhd0ikvly23lcb4dq2d2smlkymjgf"; + rev = "52f1f3280d9092bfaee5c45be5962fabee3d9654"; + sha256 = "1k0065mn4hb3ama3qxrln24rf7cqziysddvw4anxws85dan5x9sj"; fetchSubmodules = false; }; }; diff --git a/system/darwin/fonts.nix b/system/darwin/fonts.nix deleted file mode 100644 index 75c1160..0000000 --- a/system/darwin/fonts.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: - -{ - fonts = { - fontDir.enable = true; - - fonts = with pkgs; [ - jetbrains-mono - noto-fonts - unifont - - (nerdfonts.override { - fonts = [ - "NerdFontsSymbolsOnly" - ]; - }) - ]; - }; -} diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix index 3013bf6..9bb7569 100644 --- a/system/hosts/Styx.nix +++ b/system/hosts/Styx.nix @@ -3,7 +3,7 @@ ../shared/show-update-changelog.nix ../darwin/defaults.nix - ../darwin/fonts.nix + #../darwin/fonts.nix ../darwin/sudo.nix ../darwin/fish.nix ../darwin/attic.nix