diff --git a/flake.nix b/flake.nix index 877e5fb..c4e76b3 100644 --- a/flake.nix +++ b/flake.nix @@ -59,14 +59,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-raspberrypi = { - url = "github:mjallen18/nixos-raspberrypi"; - # url = "git+file:///home/admin/dev/nixos-raspberrypi"; - inputs.nixpkgs.follows = "nixpkgs-stable"; - }; - - jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; - darwin.url = "github:LnL7/nix-darwin/nix-darwin-25.11"; nix-homebrew.url = "github:zhaofengli/nix-homebrew"; @@ -189,23 +181,6 @@ ]; }; - # ###################################################### - # allyx # - # ###################################################### - allyx = { - modules = with inputs; [ - disko.nixosModules.disko - jovian.nixosModules.jovian - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-cpu-amd-pstate - # nixos-hardware.nixosModules.common-cpu-amd-zenpower - nixos-hardware.nixosModules.common-gpu-amd - nixos-hardware.nixosModules.common-hidpi - nixos-hardware.nixosModules.common-pc - lsfg-vk.nixosModules.default - ]; - }; - # ###################################################### # NUC # # ###################################################### @@ -227,12 +202,6 @@ pi4 = { modules = with inputs; [ disko.nixosModules.disko - # nixos-raspberrypi.nixosModules.raspberry-pi-4.base - # nixos-raspberrypi.nixosModules.raspberry-pi-4.display-vc4 - # nixos-raspberrypi.nixosModules.nixpkgs-rpi - # nixos-raspberrypi.nixosModules.trusted-nix-caches - # nixos-raspberrypi.lib.inject-overlays - # nixos-raspberrypi.lib.inject-overlays-global ]; }; @@ -242,14 +211,6 @@ pi5 = { modules = with inputs; [ disko.nixosModules.disko - # nixos-raspberrypi.nixosModules.raspberry-pi-5.base - # nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4 - # nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth - # nixos-raspberrypi.nixosModules.raspberry-pi-5.page-size-16k - # nixos-raspberrypi.nixosModules.nixpkgs-rpi - # nixos-raspberrypi.nixosModules.trusted-nix-caches - # nixos-raspberrypi.lib.inject-overlays - # nixos-raspberrypi.lib.inject-overlays-global ]; }; diff --git a/scripts/build-all.sh b/scripts/build-all.sh index caed172..533cdc7 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eu -for flavor in {jallen-nas,matt-nixos,nuc-nixos,steamdeck}; do +for flavor in {jallen-nas,matt-nixos,nuc-nixos}; do nh os build --cores=20 --hostname="${flavor}" --out-link="result-${flavor}" done diff --git a/systems/x86_64-linux/steamdeck/boot.nix b/systems/x86_64-linux/steamdeck/boot.nix deleted file mode 100755 index a60a3f3..0000000 --- a/systems/x86_64-linux/steamdeck/boot.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ pkgs, namespace, ... }: -let - kernel = pkgs.${namespace}.linuxPackages_cachyos-deckify-lto; -in -{ - # Configure bootloader with lanzaboot and secureboot - boot = { - consoleLogLevel = 0; - initrd.verbose = false; - kernelModules = [ "nct6775" ]; - loader = { - systemd-boot = { - consoleMode = "5"; - }; - }; - - lanzaboote = { - settings = { - console-mode = "max"; - timeout = "5"; - }; - }; - - plymouth = { - enable = true; - }; - - kernelPackages = kernel; - - kernelParams = [ - "quiet" - "amdgpu.ppfeaturemask=0xffffffff" - "splash" - "rd.systemd.show_status=false" - "rd.udev.log_level=3" - "udev.log_priority=3" - "loglevel=0" - "vt.global_cursor_default=0" - "rd.shell=0" - # Disable audit messages - "audit=0" - # Disable CPU mitigations messages - "mitigations=off" - ]; - - bootspec.enable = true; - }; - - # Further reduce systemd output - systemd = { - services.systemd-udev-settle.enable = false; - }; -} diff --git a/systems/x86_64-linux/steamdeck/default.nix b/systems/x86_64-linux/steamdeck/default.nix deleted file mode 100644 index b04cd3f..0000000 --- a/systems/x86_64-linux/steamdeck/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - pkgs, - namespace, - ... -}: -{ - imports = [ - ./boot.nix - ./jovian.nix - ]; - - ${namespace} = { - hardware.disko.enable = true; - impermanence.enable = true; - bootloader.lanzaboote.enable = true; - desktop.cosmic.enable = true; - user = { - name = "matt"; - hashedPassword = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06"; - }; - network = { - hostName = "allyx"; - }; - }; - - environment = { - systemPackages = with pkgs; [ - # unigine-superposition - ]; - variables = { - STEAM_FORCE_DESKTOPUI_SCALING = "1.0"; - GDK_SCALE = "1"; - LSFG_DLL_PATH = "/home/deck/.steam/steam/steamapps/common/Lossless Scaling/Lossless.dll"; - }; - }; - - services.displayManager.gdm.enable = lib.mkForce false; - services.displayManager.cosmic-greeter.enable = lib.mkForce false; -} diff --git a/systems/x86_64-linux/steamdeck/jovian.nix b/systems/x86_64-linux/steamdeck/jovian.nix deleted file mode 100755 index 7a02578..0000000 --- a/systems/x86_64-linux/steamdeck/jovian.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - ... -}: -{ - # services.greetd.settings.default_session.command = - # lib.mkForce ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" ${lib.getExe' config.services.displayManager.cosmic-greeter.package "cosmic-greeter-start"}''; - # services.greetd.settings.default_session.user = lib.mkForce "cosmic-greeter"; - jovian = { - steam = { - enable = true; - autoStart = true; - user = "matt"; - desktopSession = "cosmic"; - }; - - steamos = { - useSteamOSConfig = true; - }; - - devices.steamdeck.enable = false; - - hardware.has.amd.gpu = true; - }; - - # specialisation."vanilla".configuration = { - # services.desktopManager.gdm.enable = true; - # jovian = { - # steam = { - # enable = true; - # autoStart = false; - # user = "deck"; - # desktopSession = "gnome"; - # }; - - # steamos = { - # useSteamOSConfig = true; - # }; - - # devices = { - # steamdeck = { - # enable = true; - # enableGyroDsuService = true; # If enabled, motion data from the gyroscope can be used in Cemu with Cemuhoo - # }; - # }; - - # hardware.has.amd.gpu = true; - # }; - # }; -}