diff --git a/flake.nix b/flake.nix index 07546f4..25e4586 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ }; }; - outputs = { self, nixpkgs, sops, nur, home-manager, disko, ... }@inputs: + outputs = { self, nixpkgs, sops, nur, home-manager, disko, ... }@inputs: let system = "x86_64-linux"; targets = [ @@ -32,8 +32,6 @@ "eove" ]; pkgs = import nixpkgs { inherit system; }; - inputNames = builtins.filter (name: name != "self") (builtins.attrNames inputs); - inputUpdates = builtins.foldl' (acc: input: acc ++ [ "--update-input" (builtins.toString "${input}") ]) [ ] inputNames; xadetPackages = import ./packages { inherit pkgs self disko system targets; }; nixosMachine = configFile: nixpkgs.lib.nixosSystem rec { inherit system; @@ -51,17 +49,6 @@ inputs.nixos-facter-modules.nixosModules.facter "${./.}/machines/${configFile}.nix" ./modules - { - system = { - autoUpgrade = { - enable = true; - dates = "13:00"; - persistent = true; - flake = "/home/xadet/nixos-configuration/flake.nix#${configFile}"; - flags = [ "--refresh" ] ++ inputUpdates; - }; - }; - } { options = { usedFlake = pkgs.lib.mkOption { diff --git a/install/iso.nix b/install/iso.nix index cb984aa..cef2a7b 100644 --- a/install/iso.nix +++ b/install/iso.nix @@ -1,13 +1,13 @@ { self, system, nixpkgs, pkgs, targets, ... }: let - scripts = builtins.map (target: self.packages."${system}"."install-script-${target}") targets; + scripts = builtins.map (target: self.packages."${system}"."install-script-${target}") targets; in (nixpkgs.lib.nixosSystem { inherit system; modules = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" #"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" - ({config, ...}:{ + ({ config, ... }: { isoImage = { squashfsCompression = "gzip -Xcompression-level 1"; isoBaseName = "nixos-xadet-installer-${config.system.nixos.release}"; diff --git a/machines/desktop-home.nix b/machines/desktop-home.nix index aef8428..3803ee3 100644 --- a/machines/desktop-home.nix +++ b/machines/desktop-home.nix @@ -8,7 +8,7 @@ in { imports = [ - (import ./luks-interactive-login.nix {inherit device;}) + (import ./luks-interactive-login.nix { inherit device; }) ]; xadetComputer = { type = "desktop"; diff --git a/machines/eove.nix b/machines/eove.nix index 51f8b1b..6a6d678 100644 --- a/machines/eove.nix +++ b/machines/eove.nix @@ -2,13 +2,13 @@ let nixos-hardware = inputs.nixos-hardware; - suitable_disk = builtins.head (builtins.filter (d: d ? "bus_type" && ! builtins.any (s: s == "usb" ) d.class_list) config.facter.report.hardware.disk); + suitable_disk = builtins.head (builtins.filter (d: d ? "bus_type" && ! builtins.any (s: s == "usb") d.class_list) config.facter.report.hardware.disk); device = suitable_disk.unix_device_name; in { imports = [ - (import ./luks-interactive-login.nix {inherit device;}) + (import ./luks-interactive-login.nix { inherit device; }) ]; facter.reportPath = ./facter-eove.json; diff --git a/modules/hardware/keyboard.nix b/modules/hardware/keyboard.nix index 9aedbb2..6cea862 100644 --- a/modules/hardware/keyboard.nix +++ b/modules/hardware/keyboard.nix @@ -2,7 +2,7 @@ { console = { - earlySetup =true; + earlySetup = true; useXkbConfig = true; }; services = { diff --git a/modules/system/upgrade.nix b/modules/system/upgrade.nix new file mode 100644 index 0000000..811c621 --- /dev/null +++ b/modules/system/upgrade.nix @@ -0,0 +1,13 @@ +{ config, ... }: + +{ + system = { + autoUpgrade = { + enable = true; + dates = "13:00"; + persistent = true; + flake = "/home/xadet/nixos-configuration#${config.usedFlake}"; + flags = [ "--refresh" "--recreate-lock-file" ]; + }; + }; +}