From e39e0534c28a82773c3853610c13acbb1e3db3e0 Mon Sep 17 00:00:00 2001 From: Bun Date: Thu, 17 Jul 2025 00:30:42 -0400 Subject: [PATCH] jovian changes and such --- hosts/jupiter/filesystems/default.nix | 16 +++++++--------- hosts/jupiter/jovian/default.nix | 17 ++++++++--------- hosts/jupiter/services/default.nix | 10 +--------- hosts/jupiter/services/nginx/default.nix | 6 ------ .../jupiter/services/nginx/nixfox/default.nix | 10 ---------- modules/system/secrets/networks/default.nix | Bin 1464 -> 1518 bytes .../services/general/vmware/default.nix | 2 +- 7 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 hosts/jupiter/services/nginx/default.nix delete mode 100644 hosts/jupiter/services/nginx/nixfox/default.nix diff --git a/hosts/jupiter/filesystems/default.nix b/hosts/jupiter/filesystems/default.nix index 7f734c26..7c1feb2d 100644 --- a/hosts/jupiter/filesystems/default.nix +++ b/hosts/jupiter/filesystems/default.nix @@ -1,13 +1,11 @@ { config, ... }: { - fileSystems = { - "/mnt/Games" = { - device = "/dev/disk/by-uuid/cb109a85-846d-4417-9c50-a2279bd20803"; - fsType = "btrfs"; - options = [ - "nofail" - "nosuid" - ]; - }; + fileSystems."/mnt/Games" = { + device = "/dev/disk/by-uuid/cb109a85-846d-4417-9c50-a2279bd20803"; + fsType = "btrfs"; + options = [ + "nofail" + "nosuid" + ]; }; } diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix index c6c170d8..30fca6b4 100644 --- a/hosts/jupiter/jovian/default.nix +++ b/hosts/jupiter/jovian/default.nix @@ -3,14 +3,6 @@ imports = [ ./desktop ]; config = lib.mkIf config.jovian.steam.enable { - # Kernel and hardware - boot = { - kernelPackages = lib.mkForce pkgs.linuxPackages_jovian; - supportedFilesystems.nfs = lib.mkForce false; - }; - - hardware.xone.enable = true; - # Steam and Jovian services jovian = { steam = { @@ -27,9 +19,16 @@ }; }; + # Disable NFS mounts + boot.supportedFilesystems.nfs = lib.mkForce false; + + # Steam input on Wayland desktops programs.steam.extest.enable = true; - # Networkmanager for UI compatibility + # Xbox controller support + hardware.xone.enable = true; + + # NetworkManager for UI compatibility networking.networkmanager.enable = true; # Disable conflicting services diff --git a/hosts/jupiter/services/default.nix b/hosts/jupiter/services/default.nix index 4aec46c2..c6b46c7d 100644 --- a/hosts/jupiter/services/default.nix +++ b/hosts/jupiter/services/default.nix @@ -7,15 +7,7 @@ virtualisation = { libvirtd.enable = true; - vmware.host.enable = true; - }; - - services.nginx = { - enable = true; - virtualHosts."localhost" = { - default = true; - root = "/var/www/landing-page"; - }; + #vmware.host.enable = true; }; }; } diff --git a/hosts/jupiter/services/nginx/default.nix b/hosts/jupiter/services/nginx/default.nix deleted file mode 100644 index 99142a59..00000000 --- a/hosts/jupiter/services/nginx/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ ./nixfox ]; - - services.nginx.enable = true; -} diff --git a/hosts/jupiter/services/nginx/nixfox/default.nix b/hosts/jupiter/services/nginx/nixfox/default.nix deleted file mode 100644 index 3b9860c6..00000000 --- a/hosts/jupiter/services/nginx/nixfox/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, ... }: -{ - services.nginx = { - enable = true; - virtualHosts."localhost" = { - default = true; - root = "/var/www/landing-page"; - }; - }; -} diff --git a/modules/system/secrets/networks/default.nix b/modules/system/secrets/networks/default.nix index 23f458ada08bdb0d3125ba0805290739c9dd50ec..7f54d4d125dce417f1ec560db6bff5078944975b 100644 GIT binary patch literal 1518 zcmZQ@_Y83kiVO&0`21np%AM@0(-!Zm&h>IQ!g^sz*T=YJPiz!rL}hMjecEY#V&+k< z*>i6EFf*;3TU0BM*Q=(tEWLH&b*B@DRI~LqJ2l=7H*YUtp8IBFzUX8P!wIaZlip;6 zT@cM*C}r#aY~{DtcQ!;O#I>CG_58DZO96XEFmG4tj5qZccWs!)I`Ldm*}2c|y5Tdg zO!V1(%(z^KStou`)AP%_y?kC)>F#2*zp=x)GEFHZj;tn(o3o=Uw!<YPT&)t1Q_wcbr_aiMoTzyc>rub2;Q#xb5 zf5P;xjH$uGb#s?AWzPuAo3&@#Y45IN{-%|Sc}|3>zl`4zkhSYu&~&$WOVyMGNjul^ z`x+cpFHCu{($%hU$DDofo_Du>JNGhee>KC4heFGqD_%}MnApEJCRRIQq`0|=}f(yc{l|)_{`0k8hNHqHTU<0qzyFBdZSm(O`!a3qTB!GbU*ncz|Msbww3j+sKD?rz zb!BqUX?!L;=&i22rU`t7RuvSxO{P}Fh zs6+BU&s{jPt@Nhn(bc~HqMnw257fASD#oLxAmWu=byId^0oNR zgPXgGql)5h?tZkSOL!vt?#Iy&<8S0wOW&UM@bX%%S2D4a_kNwX$4C0Mes$}~d*aI; zcyHakVfw3oPi8#*u3c+W!zpU``awmqsv=`wz|75N?{WS;|>|eWBZ;5BkRsN8~mio_m`ADbtiFxBY9rw! zDw#oix>(|_)C*^{`c=43o)(@_7s|WCs=~MX(d&#=LL7W|y5(d}F>XH>(0;7#wMlV( z{)3K>OCHZRRW~ZtJYAWYBc@%vsXW2W=}}+*nO?2gddGbgubgH2BUQxzH=ZN)n2VCp ze%*A5ua3FSRvDE?S#E^BiM!)xvvP;n)BLX`{`QQDg-Jc0m(!jt-26vgV#$fFzul_I zOx1pI=QeL(Iv5oG)lH%M`m>gjNYiz*KTGK3W(pNYvv|MdDZRe;$RvByaBpej_cF)# zKI^)9d}G|&7a#w5p7=GT$!+VmBRM=;&e1XToBsZ&3|+M5Ve`)S`n+L6MsGznAJEaA ww(tHeSJ%h#H|_`&ymUEyqOkth-4D0ZUfpfsWb>%PS*%$4qD<(K!Tx*)` zy*RGExaUH3{d*3R3qKnenSU1UJ#)c`U!wN>4%_$x2R^-=>HEmvaz@HKM|REX$A=uQ zvt%&TAABddRd~j!D*{h{9NjpN+4Glw&jtOrI;ZmY$h@KDK9Wv8v|mS%+V4y-}@t=49A^YwK=}+xtF*a!ldMZ}&(cV$Vaz0F~|1KT&V3_Rm+J za$?0C#{c~{kL52q`}lvxpZr_@-aObeA#0`FHjBq9ewsIT^s3K$F?aU2;MvmuBj#xa zIM(PqPMImjF>|ex%gNjEUyWx(Jn^bCQ{DL?+}m-l&qtQa$=79`);Q_c@}+Z&8C6P{g};{JA%Q>Q`M%QyTkc`T*|i{;BDZy)bCBqd|7b>nV$l*Xc}Uym(yl z%tMPbrd6pG+bZv>^#2vVExR?LJM552#-2jOjNJI&Z*^K%GVkr*AfFTZSY9tg{QK0m zxo^C>o^4To>V4?x;;sD?KVM^6SI|F2$nCc^#YUOBI>UT$YJuI+-aXlabAI&#}~G--qQoTW{|cuYC7UXI+Hc zk#O(%Z_@aUw^z2Xn!4QH<|*-L=E;TY7q#44B)t`_~uTfykqnR-m%3&)BztcmgGqGNxw zuec)hCL(moa>2qWjX&7;wI1fI=s!CBsS5K0W8VgayV3D-$}JV%Ydn`n9qXv%2|QF( zcJ1=A*1ubR9Wi&iUu)^-L5R-OR>H$~MB diff --git a/modules/system/services/general/vmware/default.nix b/modules/system/services/general/vmware/default.nix index e7541157..9cb6c44f 100644 --- a/modules/system/services/general/vmware/default.nix +++ b/modules/system/services/general/vmware/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { config = lib.mkIf config.virtualisation.vmware.host.enable { virtualisation.vmware.host.extraConfig = ''