palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell.nix improvements

Browse source
This commit is contained in:
Ingolf Wagner 2020-01-31 23:18:17 +13:00
parent aaccab5823
commit 615feaf22e
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
2 changed files with 33 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
configs/porani/hardware-configuration.nix
View file

@ -55,18 +55,18 @@
# partitions # partitions
# ---------- # ----------
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/77a3e839-5a80-4777-93c3-31be7f0cb99d"; device = "/dev/disk/by-uuid/77a3e839-5a80-4777-93c3-31be7f0cb99d";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/FBFB-8DA5"; device = "/dev/disk/by-uuid/FBFB-8DA5";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/disk/by-uuid/192a8bd6-e5f7-4e66-b69e-f3da701da343"; device = "/dev/disk/by-uuid/192a8bd6-e5f7-4e66-b69e-f3da701da343";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ ]; swapDevices = [ ];

55
shell.nix
View file

@ -114,6 +114,7 @@ let
ref = "76260ad60cd99d40ab25df1400b0663d48e736db"; ref = "76260ad60cd99d40ab25df1400b0663d48e736db";
}; };
# enable only on workhorse
# wetten.file = toString ./wetten; # wetten.file = toString ./wetten;
}; };
@ -126,41 +127,27 @@ let
{ host ? (hostPattern name), target ? "/var/src/", user ? "root" { host ? (hostPattern name), target ? "/var/src/", user ? "root"
, commandPrefix ? "deploy", enableSwitch ? true }: , commandPrefix ? "deploy", enableSwitch ? true }:
with ops; with ops;
jobs "${commandPrefix}-${name}" "${user}@${host}${target}" ( jobs "${commandPrefix}-${name}" "${user}@${host}${target}"
populateCommands (populateCommands ++ (if enableSwitch then [ switch ] else [ ]));
++ (if enableSwitch then [ switch ] else [ ]));
#serverDeployment = name: serverDeployment = name:
# { host ? (hostPattern name), target ? "/var/src/", user ? "root" with ops;
# , commandPrefix ? "deploy", enableSwitch ? true }: deployment [
# with ops; (populate source.nixPkgs)
# jobs "${commandPrefix}-${name}" "${user}@${host}${target}" ([ (populate source.modules)
# ] ++ (if enableSwitch then [ switch ] else [ ])); (populate (source.secrets name))
serverDeployment = name: deployment [ (populate (source.system name))
(ops.populate source.nixPkgs) ] name;
(ops.populate source.modules)
(ops.populate (source.secrets name))
(ops.populate (source.system name))
] name;
#desktopDeployment = name: desktopDeployment = name:
# { host ? (hostPattern name), target ? "/var/src/", user ? "root" with ops;
# , commandPrefix ? "deploy", enableSwitch ? true }: deployment [
# with ops; (populate source.nixPkgs)
# jobs "${commandPrefix}-${name}" "${user}@${host}${target}" ([ (populate source.modules)
# (populate source.nixPkgs) (populate (source.secrets name))
# (populate source.modules) (populate (source.system name))
# (populate (source.secrets name)) (populate source.desktopSecrets)
# (populate (source.system name)) ] name;
# (populate source.desktopSecrets)
# ] ++ (if enableSwitch then [ switch ] else [ ]));
desktopDeployment = name: deployment [
(ops.populate source.nixPkgs)
(ops.populate source.modules)
(ops.populate (source.secrets name))
(ops.populate (source.system name))
(ops.populate source.desktopSecrets)
] name;
cleanupNix = name: cleanupNix = name:
let let
@ -191,7 +178,7 @@ let
target = "/mnt/var/src"; target = "/mnt/var/src";
enableSwitch = false; enableSwitch = false;
}); });
in deployments ++ cleanup ++ install ; in deployments ++ cleanup ++ install;
desktops = with lib; desktops = with lib;
let let