seang96/nixos-config
1
0
Fork 0
mirror of https://github.com/buckley310/nixos-config.git synced 2024-12-21 19:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add flakes to all systems

Browse source
This commit is contained in:
Sean Buckley 2021-05-28 16:16:28 -04:00
parent 485c8f899a
commit 3a08df0cc7
6 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
default.nix
View file

@ -5,7 +5,6 @@
./modules/backports.nix ./modules/backports.nix
./modules/baseline.nix ./modules/baseline.nix
./modules/cli.nix ./modules/cli.nix
./modules/flakes.nix
./modules/gnome.nix ./modules/gnome.nix
./modules/phpipam.nix ./modules/phpipam.nix
./modules/plasma.nix ./modules/plasma.nix

1
flake.nix
View file

@ -5,7 +5,6 @@
outputs = { self, unstable, stable2009 }: { outputs = { self, unstable, stable2009 }: {
nixosModule = { ... }: { nixosModule = { ... }: {
imports = [ ./. ]; imports = [ ./. ];
config = { sconfig.flakes.enable = true; };
}; };
nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable stable2009; }; nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable stable2009; };
}; };

6
hosts/default.nix
View file

@ -28,11 +28,7 @@ builtins.mapAttrs
modules = modules ++ [ modules = modules ++ [
(./. + "/${n}/configuration.nix") (./. + "/${n}/configuration.nix")
(hardwareModule v.hardware) (hardwareModule v.hardware)
({ ... }: { ({ ... }: { networking.hostName = n; })
networking.hostName = n;
sconfig.flakes.enable = true;
sconfig.flakes.rebuildPath = "github:buckley310/nixos-config";
})
]; ];
} }
) )

4
modules/baseline.nix
View file

@ -25,6 +25,10 @@
nix = { nix = {
daemonNiceLevel = 19; daemonNiceLevel = 19;
daemonIONiceLevel = 7; daemonIONiceLevel = 7;
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';
}; };
hardware = { hardware = {

6
modules/cli.nix
View file

@ -8,6 +8,10 @@ let
"-git-assume-unchanged-size 0" "-git-assume-unchanged-size 0"
]; ];
update-cmds = map
(x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake github:buckley310/nixos-config"))
[ "switch" "build" "boot" ];
in in
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -65,7 +69,7 @@ in
echo "$(curl --silent -L ${config.system.defaultChannel}/git-revision) latest available" echo "$(curl --silent -L ${config.system.defaultChannel}/git-revision) latest available"
echo echo
'') '')
]; ] ++ update-cmds;
environment.etc."pip.conf".text = '' environment.etc."pip.conf".text = ''
[install] [install]

27
modules/flakes.nix
View file

@ -1,27 +0,0 @@
{ config, pkgs, lib, ... }:
let
cfg = config.sconfig.flakes;
in
{
options.sconfig.flakes = {
enable = lib.mkEnableOption "Enable Flakes";
rebuildPath = lib.mkOption {
default = "/etc/nixos";
type = lib.types.str;
description = "Flake to use when running nixos-rebuild helper scripts";
};
};
config = lib.mkIf cfg.enable {
nix.package = pkgs.nixFlakes;
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
environment.systemPackages = map
(x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake ${cfg.rebuildPath}"))
[ "switch" "build" "boot" ];
};
}