Remove Steam Deck and Jovian again, not worth the hassle

flake.nix

@@ -15,7 +15,6 @@
 
     nur.url = "github:nix-community/NUR";
     blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz";
-    jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
     hardware.url = "github:nixos/nixos-hardware/master";
 
     lanzaboote = {
@@ -31,28 +30,18 @@
   let
     mkNix = modules: nixpkgs.lib.nixosSystem {
       inherit modules;
-      specialArgs = { inherit unstable jovian hardware lanzaboote mailserver minecraft; };
+      specialArgs = { inherit unstable hardware lanzaboote mailserver minecraft; };
     };
-    mkUnstable = modules: unstable.lib.nixosSystem {
-      inherit modules;
-      specialArgs = { inherit unstable jovian hardware lanzaboote mailserver minecraft; };
-    };
-
     mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {
       inherit modules pkgs;
       extraSpecialArgs = { inherit unstable nur blender-bin; };
     };
-    mkUnHome = modules: pkgs: home-unstable.lib.homeManagerConfiguration {
-      inherit modules pkgs;
-      extraSpecialArgs = { inherit unstable nur blender-bin; };
-    };
   in {
     # nixos-rebuild switch --flake .#hostname
     nixosConfigurations = {
       # PCs and Laptops
       firefly = mkNix [ ./hosts/firefly/system ];
       shuttleworth = mkNix [ ./hosts/shuttleworth/system ];
-      jupiter = mkUnstable [ ./hosts/jupiter/system ];
       lacros = mkNix [ ./hosts/lacros/system ];
       redmond = mkNix [ ./hosts/redmond/system ];
 
@@ -65,7 +54,6 @@
     homeConfigurations = {
       "jimbo@firefly" = mkHome [ ./hosts/firefly/home ] nixpkgs.legacyPackages.x86_64-linux;
       "jimbo@shuttleworth" = mkHome [ ./hosts/shuttleworth/home ] nixpkgs.legacyPackages.aarch64-linux;
-      "jimbo@jupiter" = mkUnHome [ ./hosts/jupiter/home ] unstable.legacyPackages.x86_64-linux;
       "jimbo@lacros" = mkHome [ ./hosts/lacros/home ] nixpkgs.legacyPackages.x86_64-linux;
       "jimbo@redmond" = mkHome [ ./hosts/redmond/home ] nixpkgs.legacyPackages.x86_64-linux;
 

hosts/jupiter/home/default.nix

@@ -1,24 +0,0 @@
-{ config, nur, ... }:
-{
-  imports = [
-    # Apps and programs
-    ../../../modules/home
-    ../../../modules/home/users
-    ../../../modules/home/files
-    ../../../modules/home/settings
-    ../../../modules/home/programs
-    ../../../modules/home/programs/misc/production
-    ../../../modules/home/programs/misc/gaming/launchers
-    ../../../modules/home/programs/misc/remote-desktop
-    ../../../modules/home/sway
-    ../../../modules/home/utils
-
-    # Misc
-    ../../../overlays
-    ../../../variables
-    ../../../variables/look/colors/green
-
-    # Imports
-    nur.nixosModules.nur
-  ];
-}

hosts/jupiter/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDp5gYwago24NiWu4Q7XZxy5Me/PL7RQCcM3rQxzWs1 jimbo@nixos

hosts/jupiter/system/boot/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  boot.kernel.sysctl."vm.max_map_count" = 2147483642;       
-}

hosts/jupiter/system/default.nix

@@ -1,34 +0,0 @@
-{ config, lib, jovian, ... }:
-{
-  imports = [
-    ./hardware
-    ./boot
-
-    # Apps and programs
-    ../../../modules/system
-    ../../../modules/system/accounts
-    ../../../modules/system/desktop/qt
-    ../../../modules/system/desktop/wayland
-    ../../../modules/system/desktop/sway
-    ../../../modules/system/programs
-    ../../../modules/system/services
-
-    # Devices and hardware
-    ../../../modules/system/devices
-    ../../../modules/system/devices/boot/systemd
-    ../../../modules/system/devices/networking/wireless
-    ../../../modules/system/devices/networking/firewall/pc
-    ../../../modules/system/devices/networking/wireguard/pc
-
-    # Extras
-    ../../../overlays
-    ../../../variables
-
-    # Imports
-    jovian.nixosModules.default
-  ];
-
-  networking.hostName = "jupiter";
-  networking.wireguard.interfaces."${config.ips.wgInt}".ips = [ "${config.ips.wgSpan}.21/24" ];
-  system.stateVersion = lib.mkForce "24.11";
-}

hosts/jupiter/system/hardware/default.nix

@@ -1,51 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "usbhid"
-        "usb_storage"
-        "sd_mod"
-        "sdhci_pci"
-      ];
-      kernelModules = [
-	"kvm-amd"
-      ];
-    };
-  };
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/182b2841-88a8-4845-9a29-0c1cdc01102d";
-      fsType = "btrfs";
-    };
-    "/boot" = {
-      device = "/dev/disk/by-uuid/10A5-1022";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-    "/mnt/Mount" = {
-      device = "/dev/disk/by-uuid/a026c6c7-04a0-4f34-82bb-ea7e4f3e85c5";
-      fsType = "ext4";
-    };
-    "/home/jimbo/JimboNFS" = {
-      device = "${config.ips.wgSpan}.1:/export/JimboNFS";
-      fsType = "nfs4";
-      options = ["x-systemd.automount" "_netdev" "nofail" "noauto"];
-    };
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/552f8899-a255-4e2b-a22c-e361ceaa527a"; }
-  ];
-
-  networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

modules/home/sway/hotkeys/default.nix

@@ -231,7 +231,7 @@
         "${primeMod}+${secMod}+Right" = ''resize grow width ${resizeAmount} px or 5 ppt'';
 
         # Scratchpads
-        "Ctrl+Shift+Delete" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888'';
+        "Shift+Ctrl+Delete" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888'';
         "${primeMod}+Shift+m" = ''[app_id="music"] scratchpad show, move position center, resize set 1006 657'';
         "${primeMod}+Shift+v" = ''[app_id="sound"] scratchpad show, move position center, resize set 1000 800'';
         "${primeMod}+Shift+Backslash" = ''[app_id="com.github.wwmm.easyeffects"] scratchpad show, move position center, resize set 1000 800'';

modules/system/services/pc/jovian/default.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  jovian = {
-    steam = {
-      enable = true;
-      autoStart = true;
-      user = "jimbo";
-      desktopSession = "sway";
-    };
-    decky-loader.enable = true;
-    devices.steamdeck.enable = true;
-    steamos.useSteamOSConfig = true;
-  };
-}