From 4a27ffe6eba56dae9feaa284eb528c5a394e1900 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sat, 14 Dec 2024 03:14:59 +0300 Subject: [PATCH] Live: Add all the packages. --- config/Package.nix | 2 +- config/Purpose.nix | 21 +++++++++++++++++++-- host/x86_64-linux/dasha/default.nix | 2 +- host/x86_64-linux/laptop/default.nix | 10 +++++----- host/x86_64-linux/live/default.nix | 10 +++++++++- host/x86_64-linux/max/default.nix | 8 ++++---- host/x86_64-linux/pocket/default.nix | 8 ++++---- host/x86_64-linux/work/default.nix | 10 +++++----- option/Package.nix | 14 +++++++------- option/Purpose.nix | 19 ++++++++++--------- 10 files changed, 65 insertions(+), 39 deletions(-) diff --git a/config/Package.nix b/config/Package.nix index 528d5311..cf3358d8 100644 --- a/config/Package.nix +++ b/config/Package.nix @@ -75,7 +75,7 @@ in { }) # Creativity. - (lib.mkIf cfg.creativity { + (lib.mkIf cfg.creative { environment.systemPackages = package.creative; }) diff --git a/config/Purpose.nix b/config/Purpose.nix index 0ddb9db7..e6bc5879 100644 --- a/config/Purpose.nix +++ b/config/Purpose.nix @@ -6,10 +6,10 @@ cfg = config.module.purpose; in { config = lib.mkMerge [ - (lib.mkIf cfg.creativity { + (lib.mkIf cfg.creative { module = { tablet.enable = true; - package.creativity = true; + package.creative = true; }; }) @@ -61,6 +61,23 @@ in { }; }) + (lib.mkIf cfg.live { + module = { + keyd.enable = true; + sway.enable = true; + kernel.enable = true; + package = { + common = true; + core = true; + creative = true; + desktop = true; + dev = true; + extra = true; + gaming = true; + }; + }; + }) + (lib.mkIf cfg.phone { }) diff --git a/host/x86_64-linux/dasha/default.nix b/host/x86_64-linux/dasha/default.nix index 18826939..e0f72a0a 100644 --- a/host/x86_64-linux/dasha/default.nix +++ b/host/x86_64-linux/dasha/default.nix @@ -12,7 +12,7 @@ package.extra = true; print.enable = true; purpose = { - creativity = true; + creative = true; desktop = true; disown = true; gaming = true; diff --git a/host/x86_64-linux/laptop/default.nix b/host/x86_64-linux/laptop/default.nix index 0fa28738..545752ca 100644 --- a/host/x86_64-linux/laptop/default.nix +++ b/host/x86_64-linux/laptop/default.nix @@ -11,11 +11,11 @@ display.primary = "eDP-1"; print.enable = true; purpose = { - creativity = true; - disown = true; - gaming = true; - laptop = true; - work = true; + creative = true; + disown = true; + gaming = true; + laptop = true; + work = true; }; syncthing = { enable = true; diff --git a/host/x86_64-linux/live/default.nix b/host/x86_64-linux/live/default.nix index 5e13f770..b3271265 100644 --- a/host/x86_64-linux/live/default.nix +++ b/host/x86_64-linux/live/default.nix @@ -18,5 +18,13 @@ # Root user setup. home.nixos.enable = true; - user.root = true; + user = { + root = true; + voronind = true; + }; + + module = { + builder.client.enable = true; + purpose.live = true; + }; } diff --git a/host/x86_64-linux/max/default.nix b/host/x86_64-linux/max/default.nix index 06936ad6..1139d842 100644 --- a/host/x86_64-linux/max/default.nix +++ b/host/x86_64-linux/max/default.nix @@ -12,10 +12,10 @@ print.enable = true; syncthing.enable = true; purpose = { - creativity = true; - gaming = true; - laptop = true; - work = true; + creative = true; + gaming = true; + laptop = true; + work = true; }; display = { primary = "eDP-1"; diff --git a/host/x86_64-linux/pocket/default.nix b/host/x86_64-linux/pocket/default.nix index 321255f7..1ac0c8bf 100644 --- a/host/x86_64-linux/pocket/default.nix +++ b/host/x86_64-linux/pocket/default.nix @@ -10,10 +10,10 @@ package.extra = true; print.enable = true; purpose = { - creativity = true; - gaming = true; - laptop = true; - work = true; + creative = true; + gaming = true; + laptop = true; + work = true; }; display = { primary = "DSI-1"; diff --git a/host/x86_64-linux/work/default.nix b/host/x86_64-linux/work/default.nix index 69f3fa48..e16f38cd 100644 --- a/host/x86_64-linux/work/default.nix +++ b/host/x86_64-linux/work/default.nix @@ -17,11 +17,11 @@ builder.client.enable = true; powerlimit.thinkpad.enable = true; purpose = { - creativity = true; - disown = true; - gaming = true; - laptop = true; - work = true; + creative = true; + disown = true; + gaming = true; + laptop = true; + work = true; }; hwmon = { file = "temp1_input"; diff --git a/option/Package.nix b/option/Package.nix index d2b4ec41..ca1cfc47 100644 --- a/option/Package.nix +++ b/option/Package.nix @@ -3,12 +3,12 @@ ... }: { options.module.package = { - common = lib.mkEnableOption "Common Apps."; - core = lib.mkEnableOption "Core apps."; - creativity = lib.mkEnableOption "Creative Apps."; - desktop = lib.mkEnableOption "Desktop Apps."; - dev = lib.mkEnableOption "Dev Apps."; - extra = lib.mkEnableOption "Extra Apps."; - gaming = lib.mkEnableOption "Gaming Apps."; + common = lib.mkEnableOption "Common Apps."; + core = lib.mkEnableOption "Core apps."; + creative = lib.mkEnableOption "Creative Apps."; + desktop = lib.mkEnableOption "Desktop Apps."; + dev = lib.mkEnableOption "Dev Apps."; + extra = lib.mkEnableOption "Extra Apps."; + gaming = lib.mkEnableOption "Gaming Apps."; }; } diff --git a/option/Purpose.nix b/option/Purpose.nix index 885708a4..409151ce 100644 --- a/option/Purpose.nix +++ b/option/Purpose.nix @@ -3,14 +3,15 @@ ... }: { options.module.purpose = { - creativity = lib.mkEnableOption "creativity modules"; - desktop = lib.mkEnableOption "desktop modules."; - disown = lib.mkEnableOption "modules for machines not used by me."; - gaming = lib.mkEnableOption "gaming modules."; - laptop = lib.mkEnableOption "laptop modules."; - phone = lib.mkEnableOption "phone modules."; - router = lib.mkEnableOption "router modules."; - server = lib.mkEnableOption "server modules."; - work = lib.mkEnableOption "work modules."; + creative = lib.mkEnableOption "creativity modules."; + desktop = lib.mkEnableOption "desktop modules."; + disown = lib.mkEnableOption "modules for machines not used by me."; + gaming = lib.mkEnableOption "gaming modules."; + laptop = lib.mkEnableOption "laptop modules."; + live = lib.mkEnableOption "live modules."; + phone = lib.mkEnableOption "phone modules."; + router = lib.mkEnableOption "router modules."; + server = lib.mkEnableOption "server modules."; + work = lib.mkEnableOption "work modules."; }; }