diff --git a/hosts/algiz/default.nix b/hosts/algiz/default.nix index f8556a5..85e4887 100644 --- a/hosts/algiz/default.nix +++ b/hosts/algiz/default.nix @@ -3,20 +3,20 @@ pkgs, lib, ... -}: -let inherit (lib) enabled; +}: let + inherit (lib) enabled; in { imports = with self.nixosModules; [ restic ]; - oizys = {languages = [ - "nim" - "python" - ]; - docker = enabled; - -}; + oizys = { + languages = [ + "nim" + "python" + ]; + docker = enabled; + }; environment.systemPackages = with pkgs; [ rclone diff --git a/hosts/algiz/hardware-configuration.nix b/hosts/algiz/hardware-configuration.nix index a48d849..1aaae03 100644 --- a/hosts/algiz/hardware-configuration.nix +++ b/hosts/algiz/hardware-configuration.nix @@ -2,9 +2,7 @@ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { - config, lib, - pkgs, modulesPath, ... }: { diff --git a/hosts/mannaz/default.nix b/hosts/mannaz/default.nix index 57539c5..8321b73 100644 --- a/hosts/mannaz/default.nix +++ b/hosts/mannaz/default.nix @@ -1,4 +1,10 @@ -{self, lib, ...}: let inherit (lib) enabled; in { +{ + self, + lib, + ... +}: let + inherit (lib) enabled; +in { imports = with self.nixosModules; [ nix-ld ]; @@ -6,7 +12,7 @@ oizys = { desktop = enabled; nix-ld = enabled; -}; + }; # Enable the X11 windowing system. services.xserver = { diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index e02632d..4b74df6 100644 --- a/hosts/othalan/default.nix +++ b/hosts/othalan/default.nix @@ -4,36 +4,30 @@ lib, ... }: let - inherit (lib) enabled enableAttrs; - + inherit (lib) enableAttrs; in { imports = with self.nixosModules; [ restic ]; - oizys = { - languages = [ - "misc" - "python" - "nim" - "tex" - "node" + oizys = + { + languages = [ + "misc" + "python" + "nim" + "tex" + "node" + ]; + } + // enableAttrs [ + "chrome" + "desktop" + "docker" + "nix-ld" + "vbox" + "vpn" ]; - } // enableAttrs [ - "chrome" - "desktop" - "docker" - "nix-ld" - "vbox" - "vpn" - ]; - # nix-ld = enabled; - # docker = enabled; - # vbox = enabled; - # desktop = enabled; - # vpn = enabled; - # chrome = enabled; - # }; environment.systemPackages = with pkgs; [ zk diff --git a/lib/extended.nix b/lib/extended.nix index f3e32e4..a381906 100644 --- a/lib/extended.nix +++ b/lib/extended.nix @@ -4,11 +4,21 @@ final: prev: let in rec { enabled = {enable = true;}; disabled = {enable = false;}; - + # ["a" "b"] -> {a.enable = true; b.enable = true;} - enableAttrs = attrs: builtins.listToAttrs (map (attr: {name = attr; value = enabled; }) attrs); + enableAttrs = attrs: + builtins.listToAttrs (map (attr: { + name = attr; + value = enabled; + }) + attrs); # ["a" "b"] -> {a.enable = false; b.enable = false;} - disableAttrs = attrs: builtins.listToAttrs (map (attr: {name = attr; value = disabled; }) attrs); + disableAttrs = attrs: + builtins.listToAttrs (map (attr: { + name = attr; + value = disabled; + }) + attrs); isNixFile = path: hasSuffix ".nix" path; mkIfIn = name: list: prev.mkIf (builtins.elem name list); diff --git a/modules/languages/default.nix b/modules/languages/default.nix index 39751d2..a05b37a 100644 --- a/modules/languages/default.nix +++ b/modules/languages/default.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: let +{lib, ...}: let inherit (lib) mkOption types literalExpression mdDoc; in { imports = [./nim.nix ./tex.nix ./misc.nix ./node.nix ./python.nix]; diff --git a/modules/storage/restic.nix b/modules/storage/restic.nix index d47e0aa..9a856ff 100644 --- a/modules/storage/restic.nix +++ b/modules/storage/restic.nix @@ -2,7 +2,7 @@ services.restic.backups.gdrive = { # BUG: if .conda/environments.txt doesn't exist then this won't work # workaround for now `mkdir ~/.conda && touch ~/.conda/environments.txt` - + extraBackupArgs = [ "--exclude-file /home/daylin/.config/restic/excludes.txt" "--exclude-file /home/daylin/.conda/environments.txt" diff --git a/modules/virtualization/docker.nix b/modules/virtualization/docker.nix index d0d5fd1..b4c6066 100644 --- a/modules/virtualization/docker.nix +++ b/modules/virtualization/docker.nix @@ -1,4 +1,5 @@ -{pkgs, +{ + pkgs, config, lib, ... @@ -9,10 +10,9 @@ in { options.oizys.docker.enable = mkEnableOption "enable docker support"; config = mkIf cfg.enable { - - virtualisation.docker.enable = true; - environment.systemPackages = with pkgs; [ - lazydocker - ]; -}; + virtualisation.docker.enable = true; + environment.systemPackages = with pkgs; [ + lazydocker + ]; + }; } diff --git a/modules/virtualization/virtualbox.nix b/modules/virtualization/virtualbox.nix index 9b1d4c6..5080525 100644 --- a/modules/virtualization/virtualbox.nix +++ b/modules/virtualization/virtualbox.nix @@ -9,7 +9,6 @@ in { options.oizys.vbox.enable = mkEnableOption "enable virtualbox host"; config = mkIf cfg.enable { - virtualisation.virtualbox = { host.enable = true; };