diff --git a/.gitignore b/.gitignore index d138305..7dea58b 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ hosts/nas/*.conf hosts/nas/*.users -result +result* *.raw .codegpt .direnv diff --git a/flake.nix b/flake.nix index 6b60982..c3d0107 100644 --- a/flake.nix +++ b/flake.nix @@ -258,6 +258,7 @@ permittedInsecurePackages = [ # ... "libsoup-2.74.3" + "mbedtls-2.28.10" ]; }; diff --git a/homes/x86_64-linux/deck@steamdeck/default.nix b/homes/x86_64-linux/deck@steamdeck/default.nix index 9fe438a..b4efc46 100755 --- a/homes/x86_64-linux/deck@steamdeck/default.nix +++ b/homes/x86_64-linux/deck@steamdeck/default.nix @@ -10,7 +10,7 @@ in { home.username = "deck"; - ${namespace}.desktop.gnome.enable = true; + ${namespace}.desktop.gnome.enable = false; sops = { age.keyFile = "/home/deck/.config/sops/age/keys.txt"; diff --git a/result-pi4 b/result-pi4 deleted file mode 120000 index 8a50aec..0000000 --- a/result-pi4 +++ /dev/null @@ -1 +0,0 @@ -/nix/store/4n58g6iv3i5d287y9ylgqghm4r76fm67-nixos-system-pi4-6.12.44-unstable_20250829-raspberry-pi-4-uboot-25.11.20251021.dacb109 \ No newline at end of file diff --git a/result-pi5 b/result-pi5 deleted file mode 120000 index 3a8960f..0000000 --- a/result-pi5 +++ /dev/null @@ -1 +0,0 @@ -/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/x86_64-linux/steamdeck/boot.nix b/systems/x86_64-linux/steamdeck/boot.nix index 951a8f0..587850c 100755 --- a/systems/x86_64-linux/steamdeck/boot.nix +++ b/systems/x86_64-linux/steamdeck/boot.nix @@ -8,22 +8,22 @@ in consoleLogLevel = 0; initrd.verbose = false; kernelModules = [ "nct6775" ]; - loader = { - systemd-boot = { - enable = false; - configurationLimit = 5; - extraInstallCommands = '' - ${lib.getExe' pkgs.uutils-coreutils "uutils-echo"} "timeout 0 - console-mode 1 - default nixos-*" > /boot/loader/loader.conf - ''; - }; + # loader = { + # systemd-boot = { + # enable = false; + # configurationLimit = 5; + # extraInstallCommands = '' + # ${lib.getExe' pkgs.uutils-coreutils "uutils-echo"} "timeout 0 + # console-mode 1 + # default nixos-*" > /boot/loader/loader.conf + # ''; + # }; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - }; + # efi = { + # canTouchEfiVariables = true; + # efiSysMountPoint = "/boot"; + # }; + # }; lanzaboote = { settings = { diff --git a/systems/x86_64-linux/steamdeck/default.nix b/systems/x86_64-linux/steamdeck/default.nix index a3ed90e..56497d7 100644 --- a/systems/x86_64-linux/steamdeck/default.nix +++ b/systems/x86_64-linux/steamdeck/default.nix @@ -12,8 +12,9 @@ ${namespace} = { hardware.disko.enable = true; impermanence.enable = true; - bootloader.lanzaboote.enable = true; - desktop.gnome.enable = true; + boot.systemd-boot.enable = true; + bootloader.lanzaboote.enable = false; + desktop.cosmic.enable = true; user = { name = "deck"; }; diff --git a/systems/x86_64-linux/steamdeck/jovian.nix b/systems/x86_64-linux/steamdeck/jovian.nix index 6984e52..c5ae3f1 100755 --- a/systems/x86_64-linux/steamdeck/jovian.nix +++ b/systems/x86_64-linux/steamdeck/jovian.nix @@ -1,11 +1,13 @@ -{ ... }: +{ config, lib, pkgs, ... }: { + 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 = "deck"; - desktopSession = "gnome"; + desktopSession = "cosmic"; }; steamos = {