jonas/.hive
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generation 101 2024-04-22 16:55:23 (current)

Browse Source
This commit is contained in:
Jonas Röger 2024-04-22 16:55:24 +02:00
parent d52a85f5f3
commit e5bd8d80f1
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flake.nix
View File

@ -51,17 +51,6 @@
... ...
}: {nixpkgs.overlays = [overlay-unstable];}) }: {nixpkgs.overlays = [overlay-unstable];})
./hosts/comfy-station/configuration.nix ./hosts/comfy-station/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = [
plasma-manager.homeManagerModules.plasma-manager
inputs.sops-nix.homeManagerModules.sops
];
home-manager.users.jonas = import ./home/jonas/home.nix;
}
]; ];
}; };
vm = nixpkgs.lib.nixosSystem { vm = nixpkgs.lib.nixosSystem {
@ -71,14 +60,6 @@
}; };
modules = [ modules = [
./hosts/vm/configuration.nix ./hosts/vm/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
home-manager.users.jonas = import ./home/jonas/home.nix;
}
]; ];
}; };
}; };

8
modules/bin/nix-scripts.nix
View File

@ -12,7 +12,7 @@
${pkgs.git}/bin/git diff -U0 ${pkgs.git}/bin/git diff -U0
echo "NixOS Rebuilding..." echo "NixOS Rebuilding..."
${pkgs.unstable.nh}/bin/nh home switch ~/.nixos ${pkgs.unstable.nh}/bin/nh home switch ~/.nixos
gen=$(home-manager generations | head -n1 | ${pkgs.gawk}/bin/awk '{print "Gen" $5 " @ " $1}') gen=$(home-manager generations | head -n1 | ${pkgs.gawk}/bin/awk '{print "Gen" $5 " @ " $1 "-" $2}')
${pkgs.git}/bin/git commit --no-gpg-sign -am "Home $gen" ${pkgs.git}/bin/git commit --no-gpg-sign -am "Home $gen"
popd popd
''; '';
@ -25,8 +25,8 @@
${pkgs.git}/bin/git diff -U0 ${pkgs.git}/bin/git diff -U0
echo "NixOS Rebuilding..." echo "NixOS Rebuilding..."
${pkgs.unstable.nh}/bin/nh os switch ~/.nixos ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos
gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current) gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print "Gen" $1 " @ " $2 "-" $3}')
${pkgs.git}/bin/git commit --no-gpg-sign -am "Generation $gen" ${pkgs.git}/bin/git commit --no-gpg-sign -am "System $gen"
popd popd
''; '';
upgrade = upgrade =
@ -42,7 +42,7 @@
nix flake update . nix flake update .
echo "NixOS Rebuilding..." echo "NixOS Rebuilding..."
${pkgs.unstable.nh}/bin/nh os switch ~/.nixos ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos
gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current) gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print "Gen" $1 " @ " $2 "-" $3}')
${pkgs.git}/bin/git commit --no-gpg-sign -am "Upgrade $gen" ${pkgs.git}/bin/git commit --no-gpg-sign -am "Upgrade $gen"
popd popd
''; '';