swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat[client]: make home-manager more convenient to use
Some checks are pending
Flake check / Check flake (push) Waiting to run
Details

Browse source
This commit is contained in:
Leon Schwarzäugl 2025-11-01 23:56:37 +01:00
parent 64e6a9c159
commit 40b42028d2
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
3 changed files with 108 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

33
SwarselSystems.org
View file

@ -1259,10 +1259,18 @@ Lastly, in the =perSystem= attribute set, we see that it is actually passed some
pkgs.age pkgs.age
pkgs.ssh-to-age pkgs.ssh-to-age
pkgs.sops pkgs.sops
pkgs.home-manager
pkgs.nixpkgs-fmt pkgs.nixpkgs-fmt
self.packages.${system}.swarsel-build self.packages.${system}.swarsel-build
self.packages.${system}.swarsel-deploy self.packages.${system}.swarsel-deploy
(pkgs.symlinkJoin {
name = "home-manager";
buildInputs = [ pkgs.makeWrapper ];
paths = [ pkgs.home-manager ];
postBuild = ''
wrapProgram $out/bin/home-manager \
--append-flags '--flake .#$(hostname)'
'';
})
]; ];
commands = [ commands = [
@ -11049,16 +11057,19 @@ Again, we adapt =nix= to our needs, enable the home-manager command for non-NixO
in in
{ {
options.swarselmodules.general = lib.mkEnableOption "general nix settings"; options.swarselmodules.general = lib.mkEnableOption "general nix settings";
config = let config =
let
nix-version = "2_30"; nix-version = "2_30";
in lib.mkIf config.swarselmodules.general { in
lib.mkIf config.swarselmodules.general {
nix = lib.mkIf (!config.swarselsystems.isNixos) { nix = lib.mkIf (!config.swarselsystems.isNixos) {
package = lib.mkForce pkgs.nixVersions."nix_${nix-version}"; package = lib.mkForce pkgs.nixVersions."nix_${nix-version}";
# extraOptions = '' # extraOptions = ''
# plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins # plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins
# extra-builtins-file = ${self + /nix/extra-builtins.nix} # extra-builtins-file = ${self + /nix/extra-builtins.nix}
# ''; # '';
extraOptions = let extraOptions =
let
nix-plugins = pkgs.nix-plugins.override { nix-plugins = pkgs.nix-plugins.override {
nixComponents = pkgs.nixVersions."nixComponents_${nix-version}"; nixComponents = pkgs.nixVersions."nixComponents_${nix-version}";
}; };
@ -11092,7 +11103,19 @@ Again, we adapt =nix= to our needs, enable the home-manager command for non-NixO
nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null); nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null);
programs = { programs = {
home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true; home-manager = lib.mkIf (!config.swarselsystems.isNixos)
{
enable = true;
package = pkgs.symlinkJoin {
name = "home-manager";
buildInputs = [ pkgs.makeWrapper ];
paths = [ pkgs.home-manager ];
postBuild = ''
wrapProgram $out/bin/home-manager \
--append-flags '--flake .#$(hostname)'
'';
};
};
man = { man = {
enable = true; enable = true;
generateCaches = true; generateCaches = true;

14
modules/home/common/settings.nix
View file

@ -50,7 +50,19 @@ in
nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null); nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null);
programs = { programs = {
home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true; home-manager = lib.mkIf (!config.swarselsystems.isNixos)
{
enable = true;
package = pkgs.symlinkJoin {
name = "home-manager";
buildInputs = [ pkgs.makeWrapper ];
paths = [ pkgs.home-manager ];
postBuild = ''
wrapProgram $out/bin/home-manager \
--append-flags '--flake .#$(hostname)'
'';
};
};
man = { man = {
enable = true; enable = true;
generateCaches = true; generateCaches = true;

10
nix/devshell.nix
View file

@ -58,10 +58,18 @@
pkgs.age pkgs.age
pkgs.ssh-to-age pkgs.ssh-to-age
pkgs.sops pkgs.sops
pkgs.home-manager
pkgs.nixpkgs-fmt pkgs.nixpkgs-fmt
self.packages.${system}.swarsel-build self.packages.${system}.swarsel-build
self.packages.${system}.swarsel-deploy self.packages.${system}.swarsel-deploy
(pkgs.symlinkJoin {
name = "home-manager";
buildInputs = [ pkgs.makeWrapper ];
paths = [ pkgs.home-manager ];
postBuild = ''
wrapProgram $out/bin/home-manager \
--append-flags '--flake .#$(hostname)'
'';
})
]; ];
commands = [ commands = [