From abdeddf751401325db5b1164c52cbd3193675f26 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 19 Dec 2025 17:05:58 -0600 Subject: [PATCH] darwin --- .../matt@macbook-pro-nixos/default.nix | 8 ----- homes/aarch64-linux/matt@pi4/default.nix | 15 -------- homes/aarch64-linux/matt@pi5/default.nix | 11 ------ .../x86_64-linux/admin@jallen-nas/default.nix | 14 -------- homes/x86_64-linux/deck@steamdeck/default.nix | 8 ----- modules/home/stylix/default.nix | 2 +- modules/nixos/gaming/default.nix | 34 ++++++++----------- 7 files changed, 16 insertions(+), 76 deletions(-) diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index 49bac93..13faa98 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -6,12 +6,6 @@ }: let inherit (lib.${namespace}) enabled disabled; - shellAliases = { - update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3"; - update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.3"; - update-flake = "nix flake update mac-nixpkgs mac-nixos-apple-silicon mac-home-manager mac-impermanence mac-sops-nix --flake /etc/nixos"; - update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.3 --build-host admin@10.0.1.3 --flake ~/nix-config#jallen-nas"; - }; # Displays display = { input = "eDP-1"; @@ -142,7 +136,5 @@ in programs = { password-store = enabled; - - zsh.shellAliases = shellAliases; }; } diff --git a/homes/aarch64-linux/matt@pi4/default.nix b/homes/aarch64-linux/matt@pi4/default.nix index 34a6ebf..f5b15b3 100755 --- a/homes/aarch64-linux/matt@pi4/default.nix +++ b/homes/aarch64-linux/matt@pi4/default.nix @@ -5,21 +5,6 @@ in { home.username = "matt"; - ${namespace} = { - shell-aliases = { - enable = true; - flakeInputs = [ - "pi4-nixpkgs" - "pi4-home-manager" - "pi4-impermanence" - "pi4-sops-nix" - "pi4-nixos-hardware" - "pi4-nixos-raspberrypi" - "pi4-disko" - ]; - }; - }; - sops = { age.keyFile = "/home/matt/.config/sops/age/keys.txt"; defaultSopsFile = "/etc/nixos/secrets/secrets.yaml"; diff --git a/homes/aarch64-linux/matt@pi5/default.nix b/homes/aarch64-linux/matt@pi5/default.nix index 55d8acc..77f20c1 100755 --- a/homes/aarch64-linux/matt@pi5/default.nix +++ b/homes/aarch64-linux/matt@pi5/default.nix @@ -6,13 +6,6 @@ }: let inherit (lib.${namespace}) enabled disabled; - shellAliases = { - update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3"; - update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.3"; - update-flake = "nix flake update pi5-nixpkgs pi5-home-manager pi5-impermanence pi5-nixos-hardware pi5-sops-nix nixos-raspberrypi --flake /etc/nixos"; - update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.3 --build-host admin@10.0.1.3 --flake ~/nix-config#jallen-nas"; - nas-ssh = "kitten ssh admin@10.0.1.3"; - }; in { @@ -57,10 +50,6 @@ in }; }; - programs = { - zsh.shellAliases = shellAliases; - }; - services = { nextcloud-client = lib.mkForce disabled; kdeconnect = { diff --git a/homes/x86_64-linux/admin@jallen-nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix index 51bbd91..0087fe4 100755 --- a/homes/x86_64-linux/admin@jallen-nas/default.nix +++ b/homes/x86_64-linux/admin@jallen-nas/default.nix @@ -4,20 +4,6 @@ ${namespace} = { sops.enable = true; - shell-aliases = { - enable = true; - buildHost = ""; # NAS builds locally - flakeInputs = [ - "nas-nixpkgs" - "nas-authentik-nix" - "nas-cosmic" - "nas-home-manager" - "nas-impermanence" - "nas-lanzaboote" - "nas-nixos-hardware" - "nas-sops-nix" - ]; - }; }; sops = { diff --git a/homes/x86_64-linux/deck@steamdeck/default.nix b/homes/x86_64-linux/deck@steamdeck/default.nix index 299ad88..724d07c 100755 --- a/homes/x86_64-linux/deck@steamdeck/default.nix +++ b/homes/x86_64-linux/deck@steamdeck/default.nix @@ -1,12 +1,6 @@ { lib, pkgs, namespace, ... }: let inherit (lib.${namespace}) enabled disabled; - shellAliases = { - update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3"; - update-switch = "sudo nixos-rebuild switch --max-jobs 10"; - update-flake = "nix flake update steamdeck-nixpkgs steamdeck-chaotic steamdeck-home-manager steamdeck-impermanence steamdeck-jovian steamdeck-lanzaboote steamdeck-nixos-hardware steamdeck-sops-nix steamdeck-steam-rom-manager --flake /etc/nixos"; - nas-ssh = "ssh admin@10.0.1.3"; - }; in { home.username = "deck"; @@ -69,8 +63,6 @@ in }; }; }; - - zsh.shellAliases = shellAliases; }; home.packages = with pkgs; [ diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix index beeb03c..07a2795 100644 --- a/modules/home/stylix/default.nix +++ b/modules/home/stylix/default.nix @@ -23,7 +23,7 @@ let # schemeVariants = [ iconScheme ]; # colorVariants = [ iconThemeVariant ]; # }; - isDarwin = system == "aarch64_darwin"; + isDarwin = system == "aarch64-darwin"; in { stylix = { diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix index c0d566b..d528d7d 100755 --- a/modules/nixos/gaming/default.nix +++ b/modules/nixos/gaming/default.nix @@ -18,6 +18,21 @@ in # Configure programs programs.steam = { enable = true; + package = pkgs.steam.override { + extraPkgs = + _pkgs: with pkgs; [ + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + libkrb5 + keyutils + ]; + }; # Open ports in the firewall for Steam Remote Play remotePlay.openFirewall = true; # Open ports in the firewall for Source Dedicated Server @@ -65,24 +80,5 @@ in STEAM_FORCE_DESKTOPUI_SCALING = "1.0"; }; }; - - # Configure nixpkgs - nixpkgs.config.packageOverrides = pkgs: { - steam = pkgs.steam.override { - extraPkgs = - _pkgs: with pkgs; [ - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXScrnSaver - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - libkrb5 - keyutils - ]; - }; - }; }; }