From ee486f52bb75c36be8b18a5f2b757192362c060f Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Wed, 22 Oct 2025 19:10:44 -0500 Subject: [PATCH] fixes --- checks/disksnstuff.sh | 12 ++++----- .../matt@macbook-pro-nixos/default.nix | 1 + modules/home/home/default.nix | 26 ++++++++++--------- modules/home/programs/code/default.nix | 4 ++- modules/home/programs/hyprland/default.nix | 6 ++--- modules/home/programs/onlyoffice/default.nix | 4 +-- modules/nixos/home/default.nix | 3 ++- modules/nixos/programs/default.nix | 9 ++++--- overlays/rcon/default.nix | 7 ++--- result-pi5 | 1 + .../macbook-pro-nixos/default.nix | 2 +- .../macbook-pro-nixos/services.nix | 6 ++--- systems/aarch64-linux/pi4/boot.nix | 2 ++ systems/aarch64-linux/pi5/boot.nix | 3 ++- systems/aarch64-linux/pi5/default.nix | 2 ++ 15 files changed, 52 insertions(+), 36 deletions(-) create mode 120000 result-pi5 diff --git a/checks/disksnstuff.sh b/checks/disksnstuff.sh index 1c21f19..c2504b4 100644 --- a/checks/disksnstuff.sh +++ b/checks/disksnstuff.sh @@ -1,11 +1,11 @@ mount -t tmpfs -o mode=755 none /mnt mkdir -p /mnt/{boot,home,root,etc,nix,var/log} -mount /dev/sda1 /mnt/boot -mount /dev/sda3 -o compress=zstd,subvol=home /mnt/home -mount /dev/sda3 -o compress=zstd,noatime,subvol=root /mnt/root -mount /dev/sda3 -o compress=zstd,noatime,subvol=etc /mnt/etc -mount /dev/sda3 -o compress=zstd,noatime,subvol=nix /mnt/nix -mount /dev/sda3 -o compress=zstd,noatime,subvol=log /mnt/var/log +mount /dev/sdb1 /mnt/boot +mount /dev/sdb3 -o compress=zstd,subvol=home /mnt/home +mount /dev/sdb3 -o compress=zstd,noatime,subvol=root /mnt/root +mount /dev/sdb3 -o compress=zstd,noatime,subvol=etc /mnt/etc +mount /dev/sdb3 -o compress=zstd,noatime,subvol=nix /mnt/nix +mount /dev/sdb3 -o compress=zstd,noatime,subvol=log /mnt/var/log wpa_passphrase "Joey's Jungle 5G" "kR8v&3Qd" > 5g.conf wpa_supplicant -i wlp6s0 -c 5g.conf -B diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index d216909..1f88f00 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -31,6 +31,7 @@ in programs.hyprland = { enable = true; primaryDisplay = "eDP-1"; + display1 = display; wallpaper = [ "${display.input}, /run/wallpaper.jpg" diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index 533a324..6472597 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + hasDestopEnvironment, ... }: { @@ -10,17 +11,10 @@ homeDirectory = lib.mkDefault "/home/${config.home.username}"; packages = with pkgs; [ age - chromium clinfo cpufetch deadnix - firefox - gamescope - gamescope-wsi - goverlay - gparted lm_sensors - mission-center nano nixfmt-rfc-style pciutils @@ -31,11 +25,19 @@ tailscale tree usbutils - vesktop vim vulkan-tools wget - ]; + ] ++ (if hasDestopEnvironment then [ + chromium + firefox + gamescope + gamescope-wsi + gparted + goverlay + mission-center + vesktop + ] else [ ]); stateVersion = lib.mkDefault "23.11"; }; @@ -47,7 +49,7 @@ java = { enable = lib.mkDefault true; }; - mangohud.enable = lib.mkDefault true; + mangohud.enable = lib.mkDefault hasDestopEnvironment; password-store.enable = true; nh = { enable = true; @@ -110,10 +112,10 @@ }; services = { - nextcloud-client.enable = lib.mkDefault true; + nextcloud-client.enable = lib.mkDefault hasDestopEnvironment; pass-secret-service.enable = lib.mkDefault true; kdeconnect = { - enable = lib.mkDefault true; + enable = lib.mkDefault hasDestopEnvironment; indicator = lib.mkDefault true; }; }; diff --git a/modules/home/programs/code/default.nix b/modules/home/programs/code/default.nix index c8f10aa..03c65fb 100644 --- a/modules/home/programs/code/default.nix +++ b/modules/home/programs/code/default.nix @@ -3,10 +3,12 @@ pkgs, system, namespace, + hasDestopEnvironment, ... }: let isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system); + x86_only = with pkgs; [ vscode-extensions.redhat.vscode-xml ]; @@ -20,7 +22,7 @@ in programs = { vscode = { - enable = true; + enable = hasDestopEnvironment; package = pkgs.vscodium; mutableExtensionsDir = false; profiles = { diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix index 9975cb9..84cc9a8 100644 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -116,8 +116,8 @@ in settings = { preload = [ "/run/wallpaper.jpg" ]; wallpaper = [ - "DP-1, /run/wallpaper.jpg" - "DP-2, /run/wallpaper.jpg" + "${cfg.display1.input}, /run/wallpaper.jpg" + "${cfg.display2.input}, /run/wallpaper.jpg" ]; splash = false; }; @@ -183,7 +183,7 @@ in { size = "200, 50"; position = "0, -80"; - monitor = "DP-1"; + monitor = cfg.primaryDisplay; dots_center = true; fade_on_empty = true; font_color = "rgb(202, 211, 245)"; diff --git a/modules/home/programs/onlyoffice/default.nix b/modules/home/programs/onlyoffice/default.nix index 23452fc..ab0fb6b 100644 --- a/modules/home/programs/onlyoffice/default.nix +++ b/modules/home/programs/onlyoffice/default.nix @@ -1,10 +1,10 @@ -{ lib, system, ... }: +{ lib, system, hasDestopEnvironment, ... }: let isArm = builtins.match "aarch64*" system != null; in { programs.onlyoffice = { - enable = lib.mkDefault (!isArm); + enable = lib.mkDefault (!isArm && hasDestopEnvironment); settings = { UITheme = "theme-contrast-dark"; forcedRtl = false; diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index 5136c8f..82bd827 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -9,6 +9,7 @@ }: let isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system); + hasDestopEnvironment = config.${namespace}.desktop.cosmic.enable || config.${namespace}.desktop.gnome.enable || config.${namespace}.desktop.hyprland.enable; in { @@ -47,7 +48,7 @@ in # Pass inputs so external modules can access them extraSpecialArgs = { - inherit inputs namespace; + inherit inputs namespace hasDestopEnvironment; overlays = with inputs; [ nix-vscode-extensions.overlays.default ]; diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index 69d01c6..5223435 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -1,4 +1,7 @@ -{ pkgs, lib, ... }: +{ config, pkgs, lib, namespace, ... }: +let + hasDestopEnvironment = config.${namespace}.desktop.cosmic.enable || config.${namespace}.desktop.gnome.enable || config.${namespace}.desktop.hyprland.enable; +in { programs = { zsh.enable = lib.mkDefault true; @@ -13,7 +16,7 @@ }; nix-ld = { - enable = lib.mkDefault true; + enable = lib.mkDefault hasDestopEnvironment; libraries = with pkgs; [ alsa-lib bash @@ -62,7 +65,7 @@ libgbm ]; }; - seahorse.enable = lib.mkDefault true; + seahorse.enable = lib.mkDefault hasDestopEnvironment; }; environment = { systemPackages = with pkgs; [ diff --git a/overlays/rcon/default.nix b/overlays/rcon/default.nix index 76a6a50..6c0b2a9 100644 --- a/overlays/rcon/default.nix +++ b/overlays/rcon/default.nix @@ -4,14 +4,15 @@ final: prev: { open-webui = inputs.nixpkgs-stable.legacyPackages.${prev.system}.open-webui; nextcloud-client = inputs.nixpkgs-stable.legacyPackages.${prev.system}.nextcloud-client; calibre = inputs.nixpkgs-stable.legacyPackages.${prev.system}.calibre; - # immich-machine-learning = inputs.nixpkgs-stable.legacyPackages.${prev.system}.immich-machine-learning; + hyprland-qtutils = inputs.nixpkgs-stable.legacyPackages.${prev.system}.hyprland-qtutils; dolphin-emu = inputs.nixpkgs-stable.legacyPackages.${prev.system}.dolphin-emu; pcsx2 = inputs.nixpkgs-stable.legacyPackages.${prev.system}.pcsx2; - # fex = inputs.nixpkgs-stable.legacyPackages.${prev.system}.fex; + fex = inputs.nixpkgs-stable.legacyPackages.${prev.system}.fex; # gjs = inputs.nixpkgs-stable.legacyPackages.${prev.system}.gjs; # libsecret = inputs.nixpkgs-stable.legacyPackages.${prev.system}.libsecret; # electron = inputs.nixpkgs-stable.legacyPackages.${prev.system}.electron; - # sdl3 = inputs.nixpkgs-stable.legacyPackages.${prev.system}.sdl3; + lsp-plugins = inputs.nixpkgs-stable.legacyPackages.${prev.system}.lsp-plugins; + hyprsysteminfo = inputs.nixpkgs-stable.legacyPackages.${prev.system}.hyprsysteminfo; } diff --git a/result-pi5 b/result-pi5 new file mode 120000 index 0000000..3a8960f --- /dev/null +++ b/result-pi5 @@ -0,0 +1 @@ +/nix/store/mxa3zhj368qr5kx0xjazhcshknplax39-nixos-system-pi5-6.12.44-unstable_20250829-kernelboot-raspberry-pi-5-25.11.20251021.dacb109 \ No newline at end of file diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix index 4cd9c2e..8193ed6 100755 --- a/systems/aarch64-linux/macbook-pro-nixos/default.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix @@ -42,7 +42,7 @@ desktop = { hyprland = { enable = true; - wallpaperSource = "nasa"; + wallpaperSource = "bing"; }; gnome.enable = false; }; diff --git a/systems/aarch64-linux/macbook-pro-nixos/services.nix b/systems/aarch64-linux/macbook-pro-nixos/services.nix index 6be1b7d..c5cf165 100644 --- a/systems/aarch64-linux/macbook-pro-nixos/services.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/services.nix @@ -2,7 +2,7 @@ { services = { auto-cpufreq = { - enable = true; + enable = false; settings = { # settings for when connected to a power source charger = { @@ -17,7 +17,7 @@ # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html # to use this feature, uncomment the following line and set the value accordingly scaling_min_freq = 912000; - scaling_max_freq = 2424000; + scaling_max_freq = 3500000; # scaling_min_freq = 702000; # scaling_max_freq = 1968000; @@ -37,7 +37,7 @@ # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html # to use this feature, uncomment the following line and set the value accordingly scaling_min_freq = 912000; - scaling_max_freq = 2004000; + scaling_max_freq = 2424000; # turbo boost setting (always, auto, or never) turbo = "auto"; diff --git a/systems/aarch64-linux/pi4/boot.nix b/systems/aarch64-linux/pi4/boot.nix index ffa97dc..40c7a4c 100755 --- a/systems/aarch64-linux/pi4/boot.nix +++ b/systems/aarch64-linux/pi4/boot.nix @@ -1,5 +1,6 @@ { pkgs, + lib, ... }: let @@ -12,6 +13,7 @@ in variant = "4"; }; kernelPackages = kernelBundle.linuxPackages_rpi4; + supportedFilesystems = lib.mkForce [ ]; }; hardware.raspberry-pi.config = { diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix index a3a53bc..11a5567 100755 --- a/systems/aarch64-linux/pi5/boot.nix +++ b/systems/aarch64-linux/pi5/boot.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let kernelBundle = pkgs.linuxAndFirmware.latest; in @@ -6,6 +6,7 @@ in boot = { loader.raspberry-pi.firmwarePackage = kernelBundle.raspberrypifw; kernelPackages = kernelBundle.linuxPackages_rpi5; + supportedFilesystems = lib.mkForce [ ]; }; hardware.raspberry-pi.config = { diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix index 9550f3f..89ee8ee 100644 --- a/systems/aarch64-linux/pi5/default.nix +++ b/systems/aarch64-linux/pi5/default.nix @@ -99,4 +99,6 @@ "nofail" ]; }; + + programs.seahorse.enable = false; }