From a09e88cf3ebf81316173687580bdc3f6f9bbe344 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Wed, 20 Nov 2024 23:26:48 -0600 Subject: [PATCH 1/7] fix typo --- home/platforms/fabian@posixlycorrect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index 0055a83..60cf2d3 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -12,7 +12,7 @@ ./isolation.nix ]; - local.baseline = true; + local.baseline.enable = true; local.apps.terminal.enable = true; local.apps.neovim.enable = true; From 8b8aa68811101266ec62b93448cfd4f8a8817d7a Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Wed, 20 Nov 2024 23:36:29 -0600 Subject: [PATCH 2/7] modularize steam --- home/modules/default.nix | 1 + home/modules/steam/default.nix | 21 +++++++++++++++++++ .../apps => modules}/steam/package.nix | 0 .../fabian@posixlycorrect/apps/default.nix | 1 - .../apps/steam/default.nix | 14 ------------- .../fabian@posixlycorrect/default.nix | 11 +++++++--- 6 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 home/modules/steam/default.nix rename home/{platforms/fabian@posixlycorrect/apps => modules}/steam/package.nix (100%) delete mode 100644 home/platforms/fabian@posixlycorrect/apps/steam/default.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index 8b1c228..00d0787 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -8,5 +8,6 @@ ./terminal ./neovim.nix ./baseline.nix + ./steam ]; } diff --git a/home/modules/steam/default.nix b/home/modules/steam/default.nix new file mode 100644 index 0000000..2360e6b --- /dev/null +++ b/home/modules/steam/default.nix @@ -0,0 +1,21 @@ +{ + pkgs, + lib, + config, + ... +}: +with lib; let + cfg = config.local.apps.steam; +in { + options.local.apps.steam = { + enable = mkEnableOption "Steam settings"; + }; + config = mkIf cfg.enable { + home.packages = [ + (pkgs.callPackage ./package.nix {}) + pkgs.protonup + pkgs.winetricks + pkgs.protontricks + ]; + }; +} diff --git a/home/platforms/fabian@posixlycorrect/apps/steam/package.nix b/home/modules/steam/package.nix similarity index 100% rename from home/platforms/fabian@posixlycorrect/apps/steam/package.nix rename to home/modules/steam/package.nix diff --git a/home/platforms/fabian@posixlycorrect/apps/default.nix b/home/platforms/fabian@posixlycorrect/apps/default.nix index 9b071f6..cd3d789 100644 --- a/home/platforms/fabian@posixlycorrect/apps/default.nix +++ b/home/platforms/fabian@posixlycorrect/apps/default.nix @@ -5,7 +5,6 @@ ... }: { imports = [ - ./steam ]; home.packages = with pkgs; [ diff --git a/home/platforms/fabian@posixlycorrect/apps/steam/default.nix b/home/platforms/fabian@posixlycorrect/apps/steam/default.nix deleted file mode 100644 index 8ba18b9..0000000 --- a/home/platforms/fabian@posixlycorrect/apps/steam/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -with lib; { - home.packages = [ - (pkgs.callPackage ./package.nix {}) - pkgs.protonup - pkgs.winetricks - pkgs.protontricks - ]; -} diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index 60cf2d3..6480312 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -12,9 +12,14 @@ ./isolation.nix ]; - local.baseline.enable = true; - local.apps.terminal.enable = true; - local.apps.neovim.enable = true; + local = { + baseline.enable = true; + apps = { + terminal.enable = true; + neovim.enable = true; + steam.enable = true; + }; + }; nix.registry = { "system".to = { From f577fd237dc70befdb2559c6ea16fb23dc261926 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Thu, 21 Nov 2024 00:38:11 -0600 Subject: [PATCH 3/7] add basic cli packages to baseline --- home/modules/baseline.nix | 14 ++++++++++++++ .../fabian@posixlycorrect/apps/default.nix | 10 ---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index cfe2fb4..fd49b9b 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -12,5 +12,19 @@ in { }; config = mkIf cfg.enable { xdg.enable = true; + + home.packages = with pkgs; [ + calc + file + git + htop + killall + man-pages + man-pages-posix + tree + units + unzip + zip + ]; }; } diff --git a/home/platforms/fabian@posixlycorrect/apps/default.nix b/home/platforms/fabian@posixlycorrect/apps/default.nix index cd3d789..b8a3d9f 100644 --- a/home/platforms/fabian@posixlycorrect/apps/default.nix +++ b/home/platforms/fabian@posixlycorrect/apps/default.nix @@ -8,23 +8,17 @@ ]; home.packages = with pkgs; [ - calc calibre chromium darktable deluge discord - file firefox gcc gwenview - htop - killall kdenlive libreoffice-fresh lutris - man-pages - man-pages-posix mpv obs-studio openrct2 @@ -35,9 +29,6 @@ runelite spotify tdesktop - tree - units - unzip usbutils virt-manager vlc @@ -46,7 +37,6 @@ yubikey-manager yubico-pam yubikey-personalization - zip zola zoom-us ]; From f5cfd501830e310e42de7162fdd59a7dee4456b1 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Thu, 21 Nov 2024 01:42:04 -0600 Subject: [PATCH 4/7] modularize yubikey --- home/modules/default.nix | 1 + home/modules/yubikey.nix | 20 +++++++++++++++++++ .../fabian@posixlycorrect/apps/default.nix | 3 --- .../fabian@posixlycorrect/default.nix | 1 + 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 home/modules/yubikey.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index 00d0787..aa0c1ea 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -9,5 +9,6 @@ ./neovim.nix ./baseline.nix ./steam + ./yubikey.nix ]; } diff --git a/home/modules/yubikey.nix b/home/modules/yubikey.nix new file mode 100644 index 0000000..b0b3595 --- /dev/null +++ b/home/modules/yubikey.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.local.apps.yubikey; +in { + options.local.apps.yubikey = { + enable = mkEnableOption "Yubikey home settings"; + }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + yubikey-manager + yubico-pam + yubikey-personalization + ]; + }; +} diff --git a/home/platforms/fabian@posixlycorrect/apps/default.nix b/home/platforms/fabian@posixlycorrect/apps/default.nix index b8a3d9f..5d9ce2d 100644 --- a/home/platforms/fabian@posixlycorrect/apps/default.nix +++ b/home/platforms/fabian@posixlycorrect/apps/default.nix @@ -34,9 +34,6 @@ vlc vpsfree-client vscodium-fhs - yubikey-manager - yubico-pam - yubikey-personalization zola zoom-us ]; diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index 6480312..f63305f 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -18,6 +18,7 @@ terminal.enable = true; neovim.enable = true; steam.enable = true; + yubikey.enable = true; }; }; From 50943bb1421f9908c9b814651151773faf5cbe3a Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Thu, 21 Nov 2024 01:47:28 -0600 Subject: [PATCH 5/7] modularize browsers --- home/modules/browsers.nix | 19 +++++++++++++++++++ home/modules/default.nix | 1 + .../fabian@posixlycorrect/apps/default.nix | 2 -- .../fabian@posixlycorrect/default.nix | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 home/modules/browsers.nix diff --git a/home/modules/browsers.nix b/home/modules/browsers.nix new file mode 100644 index 0000000..b7996ec --- /dev/null +++ b/home/modules/browsers.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.local.apps.browsers; +in { + options.local.apps.browsers = { + enable = mkEnableOption "Browser home settings"; + }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + chromium + firefox + ]; + }; +} diff --git a/home/modules/default.nix b/home/modules/default.nix index aa0c1ea..f5bf6d5 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -10,5 +10,6 @@ ./baseline.nix ./steam ./yubikey.nix + ./browsers.nix ]; } diff --git a/home/platforms/fabian@posixlycorrect/apps/default.nix b/home/platforms/fabian@posixlycorrect/apps/default.nix index 5d9ce2d..13e8603 100644 --- a/home/platforms/fabian@posixlycorrect/apps/default.nix +++ b/home/platforms/fabian@posixlycorrect/apps/default.nix @@ -9,11 +9,9 @@ home.packages = with pkgs; [ calibre - chromium darktable deluge discord - firefox gcc gwenview kdenlive diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index f63305f..b9042cf 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -19,6 +19,7 @@ neovim.enable = true; steam.enable = true; yubikey.enable = true; + browsers.enable = true; }; }; From 2818223d9b5332ad7bc6070e41accf50e34513f9 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Thu, 21 Nov 2024 01:48:20 -0600 Subject: [PATCH 6/7] remove vlc --- home/platforms/fabian@posixlycorrect/apps/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/platforms/fabian@posixlycorrect/apps/default.nix b/home/platforms/fabian@posixlycorrect/apps/default.nix index 13e8603..49b06b4 100644 --- a/home/platforms/fabian@posixlycorrect/apps/default.nix +++ b/home/platforms/fabian@posixlycorrect/apps/default.nix @@ -29,7 +29,6 @@ tdesktop usbutils virt-manager - vlc vpsfree-client vscodium-fhs zola From edae8a4deaa2f77935029ba9d62044c6f1a79094 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Thu, 21 Nov 2024 02:09:06 -0600 Subject: [PATCH 7/7] restructure apps config --- .../{apps/default.nix => apps.nix} | 12 ++++++++++-- home/platforms/fabian@posixlycorrect/default.nix | 13 +------------ 2 files changed, 11 insertions(+), 14 deletions(-) rename home/platforms/fabian@posixlycorrect/{apps/default.nix => apps.nix} (66%) diff --git a/home/platforms/fabian@posixlycorrect/apps/default.nix b/home/platforms/fabian@posixlycorrect/apps.nix similarity index 66% rename from home/platforms/fabian@posixlycorrect/apps/default.nix rename to home/platforms/fabian@posixlycorrect/apps.nix index 49b06b4..7acf1d9 100644 --- a/home/platforms/fabian@posixlycorrect/apps/default.nix +++ b/home/platforms/fabian@posixlycorrect/apps.nix @@ -4,8 +4,16 @@ pkgs, ... }: { - imports = [ - ]; + local = { + baseline.enable = true; + apps = { + terminal.enable = true; + neovim.enable = true; + steam.enable = true; + yubikey.enable = true; + browsers.enable = true; + }; + }; home.packages = with pkgs; [ calibre diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index b9042cf..b24596e 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -6,23 +6,12 @@ ... }: { imports = [ - ./apps + ./apps.nix ./systemd ./gui ./isolation.nix ]; - local = { - baseline.enable = true; - apps = { - terminal.enable = true; - neovim.enable = true; - steam.enable = true; - yubikey.enable = true; - browsers.enable = true; - }; - }; - nix.registry = { "system".to = { type = "path";