diff --git a/flake.lock b/flake.lock index b47c648..efe7b38 100644 --- a/flake.lock +++ b/flake.lock @@ -148,16 +148,15 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1757698511, + "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "a3fcc92180c7462082cd849498369591dfb20855", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -220,16 +219,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "lastModified": 1757773722, + "narHash": "sha256-DwxmQZ9D+hEe7h968RvFIVm6gidiVpGKZl8HanbI7FY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "b8df34ffe22cfc4f6c6229aa29d8ee67657cbec0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0e62506..4529cdf 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "OSHs dotfiles"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -13,16 +13,15 @@ system = builtins.currentSystem; username = builtins.getEnv "USER"; homeDir = builtins.getEnv "HOME"; - pkgs = import nixpkgs { inherit system; }; + overlays = [ + neovim-nightly-overlay.overlays.default + ]; + pkgs = import nixpkgs { inherit system overlays; }; in { homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ { - nixpkgs.overlays = [ - neovim-nightly-overlay.overlays.default - ]; - home.username = username; home.homeDirectory = homeDir; # Only manage what you explicitly turn on below @@ -49,11 +48,7 @@ autosuggestion.enable = true; syntaxHighlighting.enable = true; - initExtra = '' - source ${pkgs.fzf}/share/fzf/key-bindings.zsh - source ${pkgs.fzf}/share/fzf/completion.zsh - source ${pkgs.fzf-zsh}/share/zsh/plugins/fzf-zsh/fzf-zsh.plugin.zsh - + initContent = '' [ -f "$HOME/.config/zshrc" ] && source $HOME/.config/zshrc ''; @@ -96,9 +91,7 @@ fd tmux xsel - fzf - fzf-zsh - thefuck + pay-respects rust-analyzer jq ]; @@ -119,14 +112,12 @@ force = true; }; - # Environment variables only for this user/session home.sessionVariables = { EDITOR = "nvim"; }; - # Good HM hygiene xdg.enable = true; - home.stateVersion = "24.05"; + home.stateVersion = "25.11"; } ]; };