Compare commits

...

3 commits

Author SHA1 Message Date
4666231398 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:36:05 +01:00
cfe1856b72 overlay: clean up structure 2026-01-27 23:36:05 +01:00
75062d5568 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)

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 23:36:05 +01:00
6 changed files with 109 additions and 37 deletions

75
flake.lock generated
View file

@ -53,6 +53,27 @@
} }
}, },
"flake-parts_2": { "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": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nur", "nur",
@ -177,6 +198,28 @@
"type": "github" "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": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1769302137, "lastModified": 1769302137,
@ -259,7 +302,7 @@
}, },
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@ -308,11 +351,12 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"mysecrets": "mysecrets", "mysecrets": "mysecrets",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-direnv": "nix-direnv",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable", "nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nur": "nur", "nur": "nur",
"treefmt-nix": "treefmt-nix", "treefmt-nix": "treefmt-nix_2",
"utils": "utils" "utils": "utils"
} }
}, },
@ -355,15 +399,36 @@
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nix-direnv",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1762938485, "lastModified": 1768158989,
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1769353635,
"narHash": "sha256-J0G1ACrUK29M0THPAsz429eZX07GmR9Bs/b0pB3N0dQ=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "f46bb205f239b415309f58166f8df6919fa88377",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -29,6 +29,11 @@
flake = false; flake = false;
url = "git+ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"; 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 = outputs =

View file

@ -19,7 +19,11 @@
programs.bat.enable = true; programs.bat.enable = true;
programs.direnv = { programs.direnv = {
enable = true; 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; enableZshIntegration = true;
}; };
@ -51,7 +55,7 @@
merge.tool = "vimdiff"; merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt` # provide `git mergetool -t nixfmt`
mergetool.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; trustExitCode = true;
}; };
core.excludesfile = toString ( core.excludesfile = toString (

View file

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

View file

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

View file

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