From 3398c611b72416107f00ad8a12c2c2af23e985cc Mon Sep 17 00:00:00 2001 From: Bun Date: Mon, 30 Jun 2025 11:04:46 -0400 Subject: [PATCH] Simplify home profile activation by folding it into the tags logic --- flake.nix | 1 - hosts/flight/boot/default.nix | 11 ---- hosts/flight/default.nix | 17 ------ hosts/flight/filesystems/default.nix | 14 ----- hosts/flight/hardware/default.nix | 35 ------------ hosts/flight/root/default.nix | 54 ------------------ hosts/flight/user/default.nix | 7 --- hosts/hidden/default.nix | 6 +- hosts/hidden/user/default.nix | 7 --- hosts/intuos/default.nix | 6 +- hosts/intuos/user/default.nix | 7 --- hosts/jupiter/default.nix | 8 ++- hosts/jupiter/user/default.nix | 8 --- hosts/midas/services/default.nix | 4 +- hosts/tower/default.nix | 7 ++- hosts/tower/user/default.nix | 4 -- modules/home/profiles/default.nix | 2 - modules/home/profiles/guifull/default.nix | 12 ---- modules/home/programs/terminal/default.nix | 2 +- .../home/programs/terminal/tmux/default.nix | 24 ++++++++ .../home/programs/terminal/zellij/default.nix | 10 ---- modules/home/services/mpd/default.nix | 9 +++ .../devices/networking/hosts/default.nix | 1 - modules/system/secrets/default.nix | Bin 1640 -> 1611 bytes .../services/server/mailserver/default.nix | 4 +- .../server/minecraft/common/default.nix | 21 ++++--- modules/system/users/main/default.nix | 9 ++- 27 files changed, 74 insertions(+), 216 deletions(-) delete mode 100644 hosts/flight/boot/default.nix delete mode 100644 hosts/flight/default.nix delete mode 100644 hosts/flight/filesystems/default.nix delete mode 100644 hosts/flight/hardware/default.nix delete mode 100644 hosts/flight/root/default.nix delete mode 100644 hosts/flight/user/default.nix delete mode 100644 hosts/hidden/user/default.nix delete mode 100644 hosts/intuos/user/default.nix delete mode 100644 hosts/jupiter/user/default.nix delete mode 100644 hosts/tower/user/default.nix delete mode 100644 modules/home/profiles/guifull/default.nix create mode 100644 modules/home/programs/terminal/tmux/default.nix delete mode 100644 modules/home/programs/terminal/zellij/default.nix diff --git a/flake.nix b/flake.nix index 03a9d53f..693a1ef8 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,6 @@ # Laptops intuos.imports = [ ./hosts/intuos ]; jupiter.imports = [ ./hosts/jupiter ]; - flight.imports = [ ./hosts/flight ]; # Servers midas.imports = [ ./hosts/midas ]; diff --git a/hosts/flight/boot/default.nix b/hosts/flight/boot/default.nix deleted file mode 100644 index 2d553d61..00000000 --- a/hosts/flight/boot/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib, pkgs, ... }: -{ - boot = { - kernelPackages = pkgs.linuxPackages; - loader.limine = { - enable = true; - biosDevice = lib.mkForce "/dev/disk/by-id/ata-XSTAR_SSD_64GB_XSFA2011000462"; - }; - plymouth.enable = true; - }; -} diff --git a/hosts/flight/default.nix b/hosts/flight/default.nix deleted file mode 100644 index fe3b545a..00000000 --- a/hosts/flight/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: -{ - imports = [ - ./boot - ./filesystems - ./hardware - ./root - ./user - ]; - - system = { - nixos.tags = [ "pc" ]; - stateVersion = "25.05"; - }; - - deployment.targetHost = "409:b2b1:966c:b13:6d67:2d6b:45e2:f048"; -} diff --git a/hosts/flight/filesystems/default.nix b/hosts/flight/filesystems/default.nix deleted file mode 100644 index 8a568d0f..00000000 --- a/hosts/flight/filesystems/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - fileSystems = { - "/persist/storage" = { - device = "/dev/disk/by-uuid/3d6f81f2-7fa5-40a2-85bb-56f4cab63773"; - fsType = "btrfs"; - options = [ - "nofail" - "nosuid" - "subvol=storage" - ]; - }; - }; -} diff --git a/hosts/flight/hardware/default.nix b/hosts/flight/hardware/default.nix deleted file mode 100644 index fa1b984c..00000000 --- a/hosts/flight/hardware/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, modulesPath, ... }: -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - initrd = { - availableKernelModules = [ - "ehci_pci" - "ahci" - "xhci_pci" - "usb_storage" - "sd_mod" - "sr_mod" - ]; - kernelModules = [ "dm-snapshot" ]; - }; - kernelModules = [ "kvm-intel" ]; - }; - - services.xserver.videoDrivers = [ "nvidia" ]; - - hardware = { - cpu.intel.updateMicrocode = true; - nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.legacy_390; - prime = { - sync.enable = true; - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; - }; - }; - }; - - nixpkgs.hostPlatform = "x86_64-linux"; -} diff --git a/hosts/flight/root/default.nix b/hosts/flight/root/default.nix deleted file mode 100644 index 7bccd4b8..00000000 --- a/hosts/flight/root/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ config, name, ... }: -{ - boot.initrd.luks.devices."${name}-disk".device = "/dev/disk/by-uuid/0fc43c11-c382-4e37-812b-8866b1b20e68"; - - fileSystems = { - "/boot" = { - device = "/dev/disk/by-uuid/FA96-EF11"; - fsType = "vfat"; - options = [ "umask=0077" ]; - }; - - "/" = { - device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483"; - fsType = "btrfs"; - options = [ - "compress=zstd" - "ssd" - "subvol=root" - ]; - }; - "/prev" = { - device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483"; - fsType = "btrfs"; - options = [ - "compress=zstd" - "noexec" - "ssd" - "subvol=prev" - ]; - }; - "/nix" = { - device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483"; - fsType = "btrfs"; - options = [ - "compress=zstd" - "ssd" - "subvol=nix" - ]; - }; - - "/persist" = { - device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483"; - fsType = "btrfs"; - neededForBoot = true; - options = [ - "compress=zstd" - "ssd" - "subvol=persist" - ]; - }; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/93ac8c5c-c947-4b45-a12a-146e87398517"; } ]; -} diff --git a/hosts/flight/user/default.nix b/hosts/flight/user/default.nix deleted file mode 100644 index e408de6a..00000000 --- a/hosts/flight/user/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, ... }: -{ - home-manager.users."${config.vars.mainUser}" = { - home.guifull.enable = true; - wayland.windowManager.sway.extraSessionCommands = lib.mkForce ""; - }; -} diff --git a/hosts/hidden/default.nix b/hosts/hidden/default.nix index c0da8fb6..d64e2118 100644 --- a/hosts/hidden/default.nix +++ b/hosts/hidden/default.nix @@ -5,11 +5,13 @@ ./disko ./hardware ./services - ./user ]; system = { - nixos.tags = [ "pc" ]; + nixos.tags = [ + "pc" + "school" + ]; stateVersion = "24.11"; }; diff --git a/hosts/hidden/user/default.nix b/hosts/hidden/user/default.nix deleted file mode 100644 index 60e0e93a..00000000 --- a/hosts/hidden/user/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, ... }: -{ - home-manager.users."${config.vars.mainUser}".home = { - desktop.enable = true; - school.enable = true; - }; -} diff --git a/hosts/intuos/default.nix b/hosts/intuos/default.nix index 4e3a9f3b..7725d47d 100644 --- a/hosts/intuos/default.nix +++ b/hosts/intuos/default.nix @@ -4,11 +4,13 @@ ./boot ./disko ./hardware - ./user ]; system = { - nixos.tags = [ "pc" ]; + nixos.tags = [ + "pc" + "production" + ]; stateVersion = "24.11"; }; diff --git a/hosts/intuos/user/default.nix b/hosts/intuos/user/default.nix deleted file mode 100644 index 256a66ed..00000000 --- a/hosts/intuos/user/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, ... }: -{ - home-manager.users."${config.vars.mainUser}".home = { - desktop.enable = true; - production.enable = true; - }; -} diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix index 7271d00e..1a9c5076 100644 --- a/hosts/jupiter/default.nix +++ b/hosts/jupiter/default.nix @@ -7,11 +7,15 @@ ./hardware ./jovian ./services - ./user ]; system = { - nixos.tags = [ "pc" ]; + nixos.tags = [ + "pc" + "gaming" + "production" + "school" + ]; stateVersion = "24.11"; }; diff --git a/hosts/jupiter/user/default.nix b/hosts/jupiter/user/default.nix deleted file mode 100644 index 43b57345..00000000 --- a/hosts/jupiter/user/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, ... }: -{ - home-manager.users."${config.vars.mainUser}".home = { - guifull.enable = true; - school.enable = true; - enableNixpkgsReleaseCheck = false; - }; -} diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix index cddcad85..6a45e683 100644 --- a/hosts/midas/services/default.nix +++ b/hosts/midas/services/default.nix @@ -20,11 +20,9 @@ minecraft-servers = { enable = true; servers = { - velocity.enable = true; johnside.enable = true; - marsh.enable = true; - cornworld.enable = true; skyblock.enable = true; + velocity.enable = true; }; }; }; diff --git a/hosts/tower/default.nix b/hosts/tower/default.nix index bb1ea3e0..11daf4cb 100644 --- a/hosts/tower/default.nix +++ b/hosts/tower/default.nix @@ -5,11 +5,14 @@ ./disko ./filesystems ./hardware - ./user ]; system = { - nixos.tags = [ "pc" ]; + nixos.tags = [ + "pc" + "gaming" + "production" + ]; stateVersion = "24.05"; }; diff --git a/hosts/tower/user/default.nix b/hosts/tower/user/default.nix deleted file mode 100644 index bdfb086b..00000000 --- a/hosts/tower/user/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ config, ... }: -{ - home-manager.users."${config.vars.mainUser}".home.guifull.enable = true; -} diff --git a/modules/home/profiles/default.nix b/modules/home/profiles/default.nix index 4c658ec6..7b85ee23 100644 --- a/modules/home/profiles/default.nix +++ b/modules/home/profiles/default.nix @@ -1,7 +1,5 @@ { lib, ... }: { - imports = [ ./guifull ]; - options.home = with lib; { desktop.enable = mkEnableOption "Desktop programs and services"; gaming.enable = mkEnableOption "Gaming apps and programs"; diff --git a/modules/home/profiles/guifull/default.nix b/modules/home/profiles/guifull/default.nix deleted file mode 100644 index a322678d..00000000 --- a/modules/home/profiles/guifull/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: -{ - options.home = with lib; { - guifull.enable = mkEnableOption "Enable most other GUI profiles"; - }; - - config.home = lib.mkIf config.home.guifull.enable { - desktop.enable = true; - gaming.enable = true; - production.enable = true; - }; -} diff --git a/modules/home/programs/terminal/default.nix b/modules/home/programs/terminal/default.nix index 5fbad56b..43a041ea 100644 --- a/modules/home/programs/terminal/default.nix +++ b/modules/home/programs/terminal/default.nix @@ -14,8 +14,8 @@ ./nix-index ./ranger ./ssh + ./tmux ./yt-dlp - ./zellij ./zoxide ./zsh ]; diff --git a/modules/home/programs/terminal/tmux/default.nix b/modules/home/programs/terminal/tmux/default.nix new file mode 100644 index 00000000..338fa76e --- /dev/null +++ b/modules/home/programs/terminal/tmux/default.nix @@ -0,0 +1,24 @@ +{ ... }: +{ + programs.tmux = { + enable = true; + keyMode = "vi"; + mouse = true; + terminal = "st-256color"; + historyLimit = 4096; + baseIndex = 1; + extraConfig = '' + set -g status on + set -g status-left "" + set -g status-position bottom + set -g status-right "#[bg=brightblack]#[fg=dark_purple] #T " + set -g status-style "bg=black" + + set -g set-titles on + set -g set-titles-string "#T" + + setw -g window-status-format "#[bg=brightmagenta]#[fg=black] #I #[bg=brightblack]#[fg=white] #W " + setw -g window-status-current-format "#[bg=brightmagenta]#[fg=black] #I #[bg=white]#[fg=black] #W " + ''; + }; +} diff --git a/modules/home/programs/terminal/zellij/default.nix b/modules/home/programs/terminal/zellij/default.nix deleted file mode 100644 index 2b0546b6..00000000 --- a/modules/home/programs/terminal/zellij/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, ... }: -{ - programs.zellij.enable = true; - - home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = - with lib; with config.home; with config.xdg; [ - "state/${removePrefix "${homeDirectory}/" cacheHome}/zellij" - "state/${removePrefix "${homeDirectory}/" configHome}/zellij" - ]; -} diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix index e842508a..4dd256a8 100644 --- a/modules/home/services/mpd/default.nix +++ b/modules/home/services/mpd/default.nix @@ -14,6 +14,15 @@ } ''; }; + + mpdscribble = { + enable = true; + endpoints."last.fm" = { + username = "viceebun"; + passwordFile = "${config.xdg.dataHome}/mpd/lastfm_password"; + }; + }; + mpd-mpris.enable = true; mpd-discord-rpc.enable = true; }; diff --git a/modules/system/devices/networking/hosts/default.nix b/modules/system/devices/networking/hosts/default.nix index c2f38678..8d27ab61 100644 --- a/modules/system/devices/networking/hosts/default.nix +++ b/modules/system/devices/networking/hosts/default.nix @@ -6,7 +6,6 @@ "${hidden.config.deployment.targetHost}" = [ "hidden" ]; "${intuos.config.deployment.targetHost}" = [ "intuos" ]; "${jupiter.config.deployment.targetHost}" = [ "jupiter" ]; - "${flight.config.deployment.targetHost}" = [ "flight" ]; # Servers "${midas.config.deployment.targetHost}" = [ "midas" ]; diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix index 0ba12e4de6f9928092c284e094e53ad653279aa7..66805622b409911e6a584d9ba87a2489fdae8eeb 100644 GIT binary patch literal 1611 zcmZQ@_Y83kiVO&0V7f1vb?e0J-w(`7v{%UHFH=2U%<<)UvCLe(RTsne^;+(Jr2D&m zyZ-#ToXP;Lsk{Ym7g!~=`)QU~O;A{G7dJsqPAz0x_>uej^SpMmyjw1op~$v$!Ty`a z%<8U7sr+YOzAE0TaZ~7;JE;kkmC5R7!dkhtq80OekLh^EeL1c4Fu3LI^?HZLe(l@e zDQi^ksc`XqrY1l2f_wdK;YS~=1T(I`%H6&tHdp;`jkF=#mxqBpKWFk^PfR_^`#CW5 z$o9}JMV-5~%;s3G-CmUW^piv(CMrGkLx<8f>p{)^hBbR zwRd)}>+#&+BR@~-sODr{7p3)2Z`{4Uq^F__gZV&&pddWVr_k5?;EBU5LR&AGH zG5bRk8CSU$EseB@laKSRmf8n>;6PFz<%Uf{Nrc|`tzbTZ_>9a-i zzg^4qt&f;~+d2Q=75*s^55F31`X6_PO@DQs_`l49vEnQa7p>0a`CqTB?oq6?oqdm; zeNFH+2Cgeh5(Ov!lGc=v>gAAYGLM$I)*B{&+C8N?eY4QXXJ<3!Rj9K$_QUorM8SOhA>D7h8xF_sg$d@AVM^e182)%y}} zavxDD;^&PuKI;~AT$hdEoNGN#(TiU~pZ<8hI#x7i-u}DmJ_sJ$V5U&D>VU=~liJ_e zA3L=?zN-HcyuZ)QUCL|WIbZHX-!RT^JX|||tzg=Ca`6?%(;O>ecI&-QT=B@;sbZVx z?`9^0HCAa!Ii)Y8#F~5dUgy|%>i)fNi+ubPFVvV#HPks{wCky$@3W;hl~14_M7hN{zi|%R7FPwr!FI}f>zoR>?V)v2851;?4T}+bR&^}=~ zf2DcPKF7SQCn0r{Pq8f1bLufEHeugYw|(ups%2`z)hRD^o(aEXs}Ia8bv&4PJ2blD zFH?qi$D6~(TMSMW>=bI;B=Uaxo2dP{$F{t`&gR_kO1kFfyL)P9+P~j@aQVmATK3z` z(H14Y4*a<0^0ef#hHB1F4lCZ@QM%r zW;#Ag5@oI;Bq)tHoJseVu(e9xs?YXK}Z=!<^pb3>|ra*99x0m;BkDnjv#` zyUd3zNoH%7yGu=<+|sheF?`-r_d{H)LIE6i9-RE%S!bZ~?vFZOZcN&*o5hbdr|!r~ zaa!fqA(~=ovh*zLxl8G-@$0G#OZjFmi+XThPp-4S#PwRr z4vT+0-)4v1JilaD?hk`&jMpAK?mAGwVQf(yX81GX!$g)3A-M|+mgIL%i#S)RIrX~! z@O<&FN^E*#oy9eL`g^{WF`$F_Rq-v4o?Zo<39 zmm7BrZPd8d^db0H$&{s!l{{WQ^qg#J=zHRvQ2|G?!`JKCis zuX1MLv#KRKw{aa&np&Q*YE!L^R;UA)3k#Eq~*_8Og?xec)CQB{iX-*{rcZyq`z61 z7wnniX1QY7roaA&tn?H35>*z(WsBGH?FwQ4xjK03$MTFTjPA|lMLQx&*G_6!BCKfU z`enZDg5KYZvO>Z-^BleRtZR_(OqCT_)WIh9+%iWd=zm1y;>h>co&QP7GGA|Bsr)+s krNpYmXM?`@?pk-R+D@10zOsb%gLyAkNIhHCaD!_y04ahHL;wH) literal 1640 zcmZQ@_Y83kiVO&0V5??zZe6CEkfN}3SEXUH_ZqLSe-@aOE)I_9m9sc>Z3a8@wdCg} z?Iw?FKRcTpx@$M@>Y7D@^9=ZymQ+s6Te!7&(`&8(>7M$aOT|{tRBkK$@ZZ#&HucP` z#d8y9_AXl+IqUFBY4Pv-sz2Tkjksf!Y~%RKIO?mF#ENM(GiFZq+wlEap7o4hNu6aD zQg*Zcz0*_n&Nun7B>jftW5#%uj~17G?fOdgOx^L~Ck>n%a_457`&%!X zI`gu`eto`$lWh)6PkVpSR(zh@#^Mu)57_8Dj>wz1Pr?6pxV75ZX(@4w$e<^qG<~+H+^fV=|$V#sh`jZ}S z)K2P~^gaJu@Bf6E>|%bCDh?i(n3r}xZiOsNw!csKTfXgBuk7}xeZ%xe@`3l_j<>h1Qk!{~xbc)5@8} z+vm9O*_U_G)2yQSA8l4$UZ%Hd(QAuc{JH6Vzb{l)u3vZk`^CfWs$! #-!^B-JFi zJgL8b_r1U4GN*c1yng@SyaBS*qX_Gnr34KC|7!a%!im1S{~K zh_%YTeM#8Rd#!nnwr{}&b6)95HXZ848)kfVJ#V$JvZp0-!pU0>iS~LOl{PPrW>n58 z;t-H1|37Qit9@T!{={WpWN{SE{WfG9_w!~ zQK#-Fm*=$x(VqVc1lHy){ShBkV7!oR^S7Xosf}veXYGpTRC=`KCfDrgpXTnk7iMy~ z;o=f`jRpHHar{MfsuR3$ssF;u$0$-!@SG<$Y? zXtV6aMH+KG7u+~9;qmFIyXA%F%eaR&iSJuIe*=%>1C19;CaKNR?>}tx&pa->e4=?; z>4ywo20{IWSF4Xrypr+x%*3q18J=@A%Pj6?_XZxFZnS#qpOs1(_ZzBgE(kqR(D|ODwh}ywY9E(Aq?+l2xJy)ta4v- zse4iIv5DEb7bYFJuI*!zy4Bk5wQbcD*4aDqJ|ACf@YW`EL3H8WlGzES9{%4AV;9)w z=N~?QH$drmo3j1!uPciAj;!w6<33IOw<*u$Eva^CHX6ohjT@M3mw($O@T8?{>t;0r znbLHRCkNRr@3AJ&zAyc>q02gOS4mo}@sDs5~+3BaiCsXYqMu{oBRelc9&<%+klQ@pbxUWeTgyZh{o|A8Q5ZN*AO*(-B6H+3o3 z_ITL%S8J}GrvB-q#0$2Lw9Exl9;@_yJbuYM=kba^e^owy^7{Oa=eeivl?~4Bh7zhP z*C@Ucysa2Iea4Zs?!_DGIbU+IGghT5wFKP$c6_6Pu0Xxo?;D!Q$3FhNIPcS?U2~N+ VqOQG4{@dBbRF%PZVS2IG8UTI>D@6bR diff --git a/modules/system/services/server/mailserver/default.nix b/modules/system/services/server/mailserver/default.nix index 744cde04..96fe9b52 100644 --- a/modules/system/services/server/mailserver/default.nix +++ b/modules/system/services/server/mailserver/default.nix @@ -25,9 +25,9 @@ "jimbo@nixfox.ca" = { hashedPassword = config.secrets.mailHash.bun; aliases = [ - "james@nixfox.ca" - "bun@nixfox.ca" + "aubun@nixfox.ca" + "bun@bloxelcom.net" "contact@nixfox.ca" diff --git a/modules/system/services/server/minecraft/common/default.nix b/modules/system/services/server/minecraft/common/default.nix index 6b7bdb5e..41b47284 100644 --- a/modules/system/services/server/minecraft/common/default.nix +++ b/modules/system/services/server/minecraft/common/default.nix @@ -18,17 +18,20 @@ # Common whitelist whitelist = { - K5G = "8656dc10-6050-4a17-b29e-88c4babbc54c"; - JimmJam = "2f7affee-e10b-450f-a5e2-44c79a14a109"; - Viceebun = "f583f591-ad9b-4a30-8d91-514881b31394"; + # Me! + viceebun = "f583f591-ad9b-4a30-8d91-514881b31394"; + monarchbun = "2f7affee-e10b-450f-a5e2-44c79a14a109"; + aubund = "8656dc10-6050-4a17-b29e-88c4babbc54c"; + + # Everyone else + Ankha3000 = "dd65a277-f618-411e-812c-900c9c7e82d9"; DewDemolisher = "9205524f-3886-483d-b471-82bb9905671a"; Freecorn1854 = "8299cd8d-3cd4-4779-8180-0d9db6dc12a9"; Freemid1854 = "cf430607-3c2e-4c8b-8183-28299e801fa5"; - Tinyattack09 = "aaa8e9e2-4e51-4925-b9df-8a9504aec5d5"; - Ankha3000 = "dd65a277-f618-411e-812c-900c9c7e82d9"; - catoiico = "01f10cdf-c146-437e-99b1-2278b5dbe420"; - Sp0ok7 = "016c3daa-3dd5-4631-ae79-3a6f48d7cbe6"; PooxterMooxter = "c973f4b5-ab50-45e3-b3eb-36286a6f66aa"; + Sp0ok7 = "016c3daa-3dd5-4631-ae79-3a6f48d7cbe6"; + Tinyattack09 = "aaa8e9e2-4e51-4925-b9df-8a9504aec5d5"; + catoiico = "01f10cdf-c146-437e-99b1-2278b5dbe420"; }; # Common plugins @@ -45,10 +48,6 @@ url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/Il6UOBoH/voicechat-bukkit-2.5.27.jar"; sha256 = "1k95sy0hf74y80fzk7960ww8wk210phyaiqkn4q7wlagdq48mxqm"; }; - "plugins/ViaVersion.jar" = builtins.fetchurl { - url = "https://cdn.modrinth.com/data/P1OZGk5p/versions/cdC9vQSF/ViaVersion-5.3.2.jar"; - sha256 = "0q1jrd3n6pyki8pyvckhm0d2jgh3lhzkq99cngskj3mlfb9pr57l"; - }; }; # Config files diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix index dee9152e..88ccf70d 100644 --- a/modules/system/users/main/default.nix +++ b/modules/system/users/main/default.nix @@ -40,8 +40,15 @@ uid = 1000; }; + # Import hm config, enable profiles based on system tags home-manager.users."${config.vars.mainUser}" = { imports = [ ../../../home ]; - home.stateVersion = lib.mkForce config.system.stateVersion; + home = { + desktop.enable = builtins.elem "pc" config.system.nixos.tags; + gaming.enable = builtins.elem "gaming" config.system.nixos.tags; + production.enable = builtins.elem "production" config.system.nixos.tags; + school.enable = builtins.elem "school" config.system.nixos.tags; + stateVersion = lib.mkForce config.system.stateVersion; + }; }; }