From 27dc382f9e817168dd6079dfcd5bf406d6f15503 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Fri, 5 Jul 2024 02:29:05 +0530 Subject: [PATCH] all: gets module treatment --- flake.nix | 4 ++++ hosts/layne/default.nix | 25 ++++--------------------- hosts/layne/programs/default.nix | 3 +-- hosts/rico0/programs/default.nix | 2 +- hosts/rico1/default.nix | 25 ++++--------------------- hosts/rico1/programs/default.nix | 3 +-- hosts/rico2/default.nix | 25 ++++--------------------- hosts/rico2/programs/default.nix | 3 +-- hosts/wynne/default.nix | 25 ++++--------------------- hosts/wynne/programs/default.nix | 3 +-- 10 files changed, 25 insertions(+), 93 deletions(-) diff --git a/flake.nix b/flake.nix index 3bb1c67..1e52b1b 100644 --- a/flake.nix +++ b/flake.nix @@ -131,6 +131,7 @@ sops-nix.nixosModules.sops ./common ./hosts/rico1 + self.nixosModules.default ]; }; Rico2 = @@ -151,6 +152,7 @@ } lix-module.nixosModules.default sops-nix.nixosModules.sops + self.nixosModules.default ./common ./hosts/rico2 ]; @@ -173,6 +175,7 @@ } lix-module.nixosModules.default sops-nix.nixosModules.sops + self.nixosModules.default ./common ./hosts/wynne ]; @@ -195,6 +198,7 @@ } lix-module.nixosModules.default sops-nix.nixosModules.sops + self.nixosModules.default ./common ./hosts/layne ]; diff --git a/hosts/layne/default.nix b/hosts/layne/default.nix index 2556b93..7f24d20 100644 --- a/hosts/layne/default.nix +++ b/hosts/layne/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: { +_: { imports = [ ./hardware ./programs @@ -7,26 +7,9 @@ ./security.nix ]; - nix.gc = { - automatic = true; - dates = "Fri *-*-* 00:00:00"; - options = "--delete-old"; - randomizedDelaySec = "1h"; - }; - - documentation = { - enable = lib.mkDefault false; - doc.enable = lib.mkDefault false; - info.enable = lib.mkDefault false; - man.enable = lib.mkDefault false; - nixos.enable = lib.mkDefault false; - }; - - xdg = { - autostart.enable = lib.mkDefault false; - icons.enable = lib.mkDefault false; - mime.enable = lib.mkDefault false; - sounds.enable = lib.mkDefault false; + nodeconfig = { + minimize = true; + nix.auto-gc = true; }; i18n = { diff --git a/hosts/layne/programs/default.nix b/hosts/layne/programs/default.nix index 06e0843..4c7faaa 100644 --- a/hosts/layne/programs/default.nix +++ b/hosts/layne/programs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { imports = [ ./neovim.nix ./starship.nix @@ -6,7 +6,6 @@ ]; programs = { - command-not-found.enable = lib.mkDefault false; git.enable = true; }; diff --git a/hosts/rico0/programs/default.nix b/hosts/rico0/programs/default.nix index 4bde076..3bc319f 100644 --- a/hosts/rico0/programs/default.nix +++ b/hosts/rico0/programs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { imports = [ ./neovim.nix ./starship.nix diff --git a/hosts/rico1/default.nix b/hosts/rico1/default.nix index 662850a..59c4244 100644 --- a/hosts/rico1/default.nix +++ b/hosts/rico1/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: { +_: { imports = [ ./hardware ./programs @@ -8,26 +8,9 @@ ./security.nix ]; - nix.gc = { - automatic = true; - dates = "Fri *-*-* 00:00:00"; - options = "--delete-old"; - randomizedDelaySec = "1h"; - }; - - documentation = { - enable = lib.mkDefault false; - doc.enable = lib.mkDefault false; - info.enable = lib.mkDefault false; - man.enable = lib.mkDefault false; - nixos.enable = lib.mkDefault false; - }; - - xdg = { - autostart.enable = lib.mkDefault false; - icons.enable = lib.mkDefault false; - mime.enable = lib.mkDefault false; - sounds.enable = lib.mkDefault false; + nodeconfig = { + minimize = true; + nix.auto-gc = true; }; # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243 diff --git a/hosts/rico1/programs/default.nix b/hosts/rico1/programs/default.nix index 931dc2d..3bc319f 100644 --- a/hosts/rico1/programs/default.nix +++ b/hosts/rico1/programs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { imports = [ ./neovim.nix ./starship.nix @@ -6,7 +6,6 @@ ]; programs = { - command-not-found.enable = lib.mkDefault false; git.enable = true; }; diff --git a/hosts/rico2/default.nix b/hosts/rico2/default.nix index 662850a..59c4244 100644 --- a/hosts/rico2/default.nix +++ b/hosts/rico2/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: { +_: { imports = [ ./hardware ./programs @@ -8,26 +8,9 @@ ./security.nix ]; - nix.gc = { - automatic = true; - dates = "Fri *-*-* 00:00:00"; - options = "--delete-old"; - randomizedDelaySec = "1h"; - }; - - documentation = { - enable = lib.mkDefault false; - doc.enable = lib.mkDefault false; - info.enable = lib.mkDefault false; - man.enable = lib.mkDefault false; - nixos.enable = lib.mkDefault false; - }; - - xdg = { - autostart.enable = lib.mkDefault false; - icons.enable = lib.mkDefault false; - mime.enable = lib.mkDefault false; - sounds.enable = lib.mkDefault false; + nodeconfig = { + minimize = true; + nix.auto-gc = true; }; # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243 diff --git a/hosts/rico2/programs/default.nix b/hosts/rico2/programs/default.nix index 931dc2d..3bc319f 100644 --- a/hosts/rico2/programs/default.nix +++ b/hosts/rico2/programs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { imports = [ ./neovim.nix ./starship.nix @@ -6,7 +6,6 @@ ]; programs = { - command-not-found.enable = lib.mkDefault false; git.enable = true; }; diff --git a/hosts/wynne/default.nix b/hosts/wynne/default.nix index 2556b93..7f24d20 100644 --- a/hosts/wynne/default.nix +++ b/hosts/wynne/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: { +_: { imports = [ ./hardware ./programs @@ -7,26 +7,9 @@ ./security.nix ]; - nix.gc = { - automatic = true; - dates = "Fri *-*-* 00:00:00"; - options = "--delete-old"; - randomizedDelaySec = "1h"; - }; - - documentation = { - enable = lib.mkDefault false; - doc.enable = lib.mkDefault false; - info.enable = lib.mkDefault false; - man.enable = lib.mkDefault false; - nixos.enable = lib.mkDefault false; - }; - - xdg = { - autostart.enable = lib.mkDefault false; - icons.enable = lib.mkDefault false; - mime.enable = lib.mkDefault false; - sounds.enable = lib.mkDefault false; + nodeconfig = { + minimize = true; + nix.auto-gc = true; }; i18n = { diff --git a/hosts/wynne/programs/default.nix b/hosts/wynne/programs/default.nix index 06e0843..4c7faaa 100644 --- a/hosts/wynne/programs/default.nix +++ b/hosts/wynne/programs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: { +{ pkgs, ... }: { imports = [ ./neovim.nix ./starship.nix @@ -6,7 +6,6 @@ ]; programs = { - command-not-found.enable = lib.mkDefault false; git.enable = true; };