Remove axolotl update the lock and such

flake.lock

@@ -5,12 +5,12 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1732104555,
+        "lastModified": 1734963688,
-        "narHash": "sha256-BS1EcK6ChKS0073IPEMsYXr56sax9fut8Rfm8uk8YJw=",
+        "narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=",
-        "rev": "35b4a56ef326c382c01d148142f45cb83374b654",
+        "rev": "91297beb20864e611af6017c5eeef1b4564d7157",
-        "revCount": 128,
+        "revCount": 132,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.11/0193497b-0d96-7d62-b941-1fe51ce62934/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.12/01940c9d-feca-7111-a812-8d8ba9dd4fbd/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735048446,
+        "lastModified": 1735468753,
-        "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=",
+        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21",
+        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
         "type": "github"
       },
       "original": {
@@ -315,11 +315,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1735263966,
+        "lastModified": 1735507061,
-        "narHash": "sha256-/HP7IySllvThIeyGLQhP2Cmiv9i1YFYk5fBgY6BOxs8=",
+        "narHash": "sha256-4DubvZKQasU+6bydwHqQi9gZ6X8O4S7iKW7FCx3qNKc=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "e030d9dbae3804c4faef9b7cd47b879b47c3e465",
+        "rev": "732d8272931b1e4ffc3f82ada7cfffb4a9035754",
         "type": "github"
       },
       "original": {
@@ -330,15 +330,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722221733,
+        "lastModified": 1733808091,
+        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12bf09802d77264e441f48e25459c10c93eada2e",
+        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },
@@ -406,11 +407,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1735141468,
+        "lastModified": 1735264675,
-        "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=",
+        "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce",
+        "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966",
         "type": "github"
       },
       "original": {
@@ -442,11 +443,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735337462,
+        "lastModified": 1735507377,
-        "narHash": "sha256-B+PNIYtTmgnTV/wdA/qrYohmeBHaYrDwVAueODdvtlo=",
+        "narHash": "sha256-MzWlW6MqbzJ4cCQAAI3e0j8YQQ6Le91+PhRYtLjlkrA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "538f624930cdfb852e4e3dd055f79e932d5b3c16",
+        "rev": "632397d1b87a4eaedcddfe0e0532f8005c0fb25e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -76,7 +76,6 @@
       tower = mkNix [ ./hosts/tower ]; # Main Desktop
 
       envy = mkNix [ ./hosts/envy ]; # HP Convertable
-      axolotl = mkNix [ ./hosts/axolotl ]; # PineBook Pro
       lacros = mkNix [ ./hosts/lacros ]; # Dell Chromebook
       redmond = mkNix [ ./hosts/redmond ]; # Lenovo Dual-Boot
       extern = mkNix [ ./hosts/extern ]; # External Drive/USB

hosts/axolotl/boot/default.nix

@@ -1,40 +0,0 @@
-{ pkgs, ... }:
-{
-  boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    kernel.sysctl."vm.max_map_count" = 2147483642;
-
-    initrd = {
-      systemd = {
-        enable = true;
-        services.root-reset = {
-          description = "Reset BTRFS root and snapshot last boot";
-          wantedBy = [ "initrd.target" ];
-          after = [ "dev-nixos-root.device" ];
-          before = [ "sysroot.mount" ];
-          unitConfig.DefaultDependencies = "no";
-          serviceConfig.Type = "oneshot";
-          script = ''
-            mkdir -p /mnt
-            mount /dev/nixos/root /mnt
-
-            if [[ -e /mnt/@prev ]]; then
-              btrfs subvolume delete /mnt/@prev
-            fi
-
-            btrfs subvolume snapshot /mnt/@ /mnt/@prev
-
-            btrfs subvolume list -o /mnt/@ | cut -f9 -d' ' | while read subvolume; do
-              btrfs subvolume delete "/mnt/$subvolume"
-            done
-
-            btrfs subvolume delete /mnt/@
-            btrfs subvolume create /mnt/@
-
-            umount /mnt
-          '';
-        };
-      };
-    };
-  };
-}

hosts/axolotl/default.nix

@@ -1,29 +0,0 @@
-{ config, ... }:
-{
-  imports = [
-    ./boot
-    ./disko
-    ./hardware
-
-    # Apps and programs
-    ../../modules/system
-    ../../modules/system/accounts
-    ../../modules/system/desktop
-    ../../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
-  ];
-
-  networking.hostName = "redmond";
-  networking.wireguard.interfaces."${config.ips.wgInt}".ips = [ "${config.ips.wgSpan}.20/24" ];
-}

hosts/axolotl/disko/default.nix

@@ -1,96 +0,0 @@
-{ disko, config, ... }:
-{
-  imports = [ disko.nixosModules.disko ];
-
-  disko.devices = {
-    disk = {
-      "${config.networking.hostName}" = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "fmask=0022" "dmask=0022" ];
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "crypt-nvme";
-                settings.allowDiscards = true;
-                passwordFile = "/tmp/secret.key";
-                content = {
-                  type = "lvm_pv";
-                  vg = "${config.networking.hostName}";
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-
-    lvm_vg = {
-      "${config.networking.hostName}" = {
-        type = "lvm_vg";
-        lvs = {
-          root = {
-            size = "100%";
-            content = {
-              type = "btrfs";
-              extraArgs = [ "-f" ];
-              subvolumes = {
-                "/root" = {
-                  mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                };
-                "/prev" = {
-                  mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                };
-                "/nix" = {
-                  mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                };
-
-                # Impermanence
-                "/persist" = {
-                  mountpoint = "/persist";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                };
-                "/persist/.snapshots" = { };
-
-                "/jimbo" = {
-                  mountpoint = "/persist/home/jimbo";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                };
-                "/jimbo/.snapshots" = { };
-              };
-            };
-          };
-          swap = {
-            size = "8G";
-            content = {
-              type = "swap";
-              discardPolicy = "both";
-            };
-          };
-        };
-      };
-    };
-  };
-
-  # Needed for impermanence
-  fileSystems = {
-    "/persist".neededForBoot = true;
-    "/persist/home/jimbo".neededForBoot = true;
-  };
-}

hosts/axolotl/hardware/default.nix

@@ -1,29 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-{
-  boot = {
-    kernelModules = [ "kvm-amd" ];
-    initrd = {
-      availableKernelModules = [
-        "xhci_pci"
-        "ahci"
-        "ehci_pci"
-        "sd_mod"
-        "sr_mod"
-        "sdhci_pci"
-        "rtsx_usb_sdmmc"
-      ];
-    };
-  };
-
-  fileSystems = {
-    "/home/jimbo/JimboNFS" = {
-      device = "${config.ips.wgSpan}.1:/export/JimboNFS";
-      fsType = "nfs4";
-      options = ["x-systemd.automount" "_netdev" "nofail" "noauto"];
-    };
-  };
-
-  networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/axolotl/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9uITpyw5WgxT7UnswueFtyWxAqQCZv4h9DfcDkr+kn

hosts/tower/boot/default.nix

@@ -19,9 +19,6 @@ in {
     kernelPackages = pkgs.unstable.linuxPackages_zen;
     kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
 
-    # Enable cross-compilation
-    binfmt.emulatedSystems = [ "aarch64-linux" ];
-
     # Needed for GPU passthrough
     initrd.kernelModules = [
       "vfio"

modules/system/accounts/users/jimbo/default.nix

@@ -8,7 +8,6 @@
       (builtins.readFile ../../../../../hosts/tower/id_ed25519.pub)
 
       (builtins.readFile ../../../../../hosts/envy/id_ed25519.pub)
-      (builtins.readFile ../../../../../hosts/axolotl/id_ed25519.pub)
       (builtins.readFile ../../../../../hosts/lacros/id_ed25519.pub)
       (builtins.readFile ../../../../../hosts/redmond/id_ed25519.pub)