diff --git a/CHEATSHEET.md b/CHEATSHEET.md new file mode 100644 index 0000000..da520e0 --- /dev/null +++ b/CHEATSHEET.md @@ -0,0 +1,14 @@ +# Update Neovim + +1. Update the version controlled code +2. Run: + +```bash +nix flake lock --update-input nvim-config +``` + +3. Run: + +```bash +home-manager switch --flake "/home/fw/nix#fw@jobb" +``` diff --git a/config/dev.nix b/config/dev.nix index dafbc5c..01d1aab 100644 --- a/config/dev.nix +++ b/config/dev.nix @@ -59,7 +59,6 @@ in prettierd qrencode air - unstable.k9s git lazydocker gcc diff --git a/config/home.nix b/config/home.nix index 5d5ec8f..37f93dd 100644 --- a/config/home.nix +++ b/config/home.nix @@ -25,6 +25,7 @@ ../shared/oh-my-posh.nix ../shared/gtk.nix ../shared/neovim.nix + ../shared/k9s.nix # ../shared/hyprland.nix ]; diff --git a/flake.nix b/flake.nix index 9ce44be..7ea6bb3 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,14 @@ # Home manager home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nvim-config = { + url = "github:fwastring/nvim?exportIgnore=1"; + flake = false; + }; + k9s-config = { + url = "github:fwastring/k9s?exportIgnore=1"; + flake = false; + }; }; outputs = diff --git a/shared/k9s.nix b/shared/k9s.nix new file mode 100644 index 0000000..00b1546 --- /dev/null +++ b/shared/k9s.nix @@ -0,0 +1,10 @@ +{ config, inputs, pkgs, ... }: + +let +in +{ + programs.k9s.enable = true; + + xdg.configFile."k9s".source = inputs.k9s-config; + +} diff --git a/shared/kitty.nix b/shared/kitty.nix index 49cdaad..89fa8fa 100644 --- a/shared/kitty.nix +++ b/shared/kitty.nix @@ -10,7 +10,7 @@ font = { name = "ComicShannsMono Nerd Font"; - size = 22; + size = 12; }; shellIntegration = { mode = "no-cursor"; diff --git a/shared/neovim.nix b/shared/neovim.nix index cbb5068..b9fe0e2 100644 --- a/shared/neovim.nix +++ b/shared/neovim.nix @@ -1,22 +1,13 @@ -{ config, pkgs, ... }: +{ config, inputs, pkgs, ... }: let - # Replace with the URL of your Neovim configuration GitHub repository - nvim-config = { - url = "github:fwastring/nvim?exportIgnore=1"; - # Use a specific, locked commit hash here - # You can get this by running 'nix flake lock' - # after adding the input - flake = false; # Tell Nix this is not a flake - }; - in { # Enable the Home Manager Neovim module if you haven't already # programs.neovim.enable = true; # Create a symlink from the Nix store to the Neovim config directory - xdg.configFile."nvim".source = nvim-config; + xdg.configFile."nvim".source = inputs.nvim-config; # Other Home Manager options... }