Compare commits

...

3 commits

Author SHA1 Message Date
16d52b4ddf home/nix-direnv: use unreleased version from flake
necessary to get integrated [GC root
refreshing](https://github.com/nix-community/nix-direnv/pull/631).

It currently looks like nix-direnv is going to be integrated into direnv
itself, so maybe nor new releases will be made until then.
2026-01-27 23:17:42 +01:00
aeb29c17a2 overlay: clean up structure 2026-01-27 23:16:27 +01:00
cda2fe7091 nixfmt: rfc-style name is deprecated
also updated the treefmt flake:
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4' (2025-11-12)
  → 'github:numtide/treefmt-nix/f46bb205f239b415309f58166f8df6919fa88377' (2026-01-25)
2026-01-27 10:58:04 +01:00
6 changed files with 106 additions and 34 deletions

69
flake.lock generated
View file

@ -53,6 +53,27 @@
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nix-direnv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1768135262,
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nur",
@ -177,6 +198,28 @@
"type": "github"
}
},
"nix-direnv": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1768704530,
"narHash": "sha256-BASsdRYo8t/himZisgWW524t86pxuC0H3/Dv8sqR8sM=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "29bb68202897f6e8653d28f64c5525c2c502f19c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-direnv",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1769302137,
@ -259,7 +302,7 @@
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_2",
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_3"
},
"locked": {
@ -308,11 +351,12 @@
"lanzaboote": "lanzaboote",
"mysecrets": "mysecrets",
"nix-darwin": "nix-darwin",
"nix-direnv": "nix-direnv",
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs_2",
"nur": "nur",
"treefmt-nix": "treefmt-nix",
"treefmt-nix": "treefmt-nix_2",
"utils": "utils"
}
},
@ -353,6 +397,27 @@
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nix-direnv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1768158989,
"narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"

View file

@ -29,6 +29,11 @@
flake = false;
url = "git+ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git";
};
nix-direnv = {
url = "github:nix-community/nix-direnv";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =

View file

@ -19,7 +19,11 @@
programs.bat.enable = true;
programs.direnv = {
enable = true;
nix-direnv.enable = true;
nix-direnv = {
enable = true;
# use a more recent nix-direnv to get the _nix_refresh_gcroots integration
package = inputs.nix-direnv.packages."${pkgs.stdenv.hostPlatform.system}".nix-direnv;
};
enableZshIntegration = true;
};
@ -51,7 +55,7 @@
merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt`
mergetool.nixfmt = {
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
cmd = "${lib.getExe pkgs.nixfmt} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true;
};
core.excludesfile = toString (

View file

@ -90,7 +90,7 @@ let
nixHelpers = [
nixpkgs-review
nixfmt-rfc-style
nixfmt
nix-top
statix
];

View file

@ -74,7 +74,7 @@
"editor.formatOnSave" = false;
"editor.formatOnType" = false;
};
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
"nix.formatterPath" = lib.getExe pkgs.nixfmt;
"nix.enableLanguageServer" = true;
"nix.serverPath" = lib.getExe pkgs.nixd;
"nix.serverSettings" = { };

View file

@ -1,33 +1,31 @@
[
(self: super: rec {
myVim =
with super;
neovim.override {
configure = {
packages.myVimPackage = with pkgs.vimPlugins; {
# loaded on start
start = [
ale
base16-vim
LanguageClient-neovim
ctrlp
direnv-vim
fugitive
haskell-vim
jedi-vim
nerdtree
nerdtree-git-plugin
supertab
vim-dirdiff
vim-pandoc
vim-pandoc-syntax
vim-nix
vim-jinja
which-key-nvim
];
};
customRC = builtins.readFile ./vimrc;
(self: super: {
myVim = super.neovim.override {
configure = {
packages.myVimPackage = with self.pkgs.vimPlugins; {
# loaded on start
start = [
ale
base16-vim
LanguageClient-neovim
ctrlp
direnv-vim
fugitive
haskell-vim
jedi-vim
nerdtree
nerdtree-git-plugin
supertab
vim-dirdiff
vim-pandoc
vim-pandoc-syntax
vim-nix
vim-jinja
which-key-nvim
];
};
customRC = builtins.readFile ./vimrc;
};
};
})
]