From 1e35472464720663be621f9e2fb430c39462eb69 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 08:49:22 -0500
Subject: [PATCH 1/8] Init crash

---
 flake.nix                              |  58 ++++++----
 home-manager/machines/crash/home.nix   |  51 +++++++++
 nixos/machines/crash/configuration.nix | 148 +++++++++++++++++++++++++
 nixos/machines/crash/hardware.nix      |  40 +++++++
 nixos/machines/crash/machine.nix       |  49 ++++++++
 5 files changed, 323 insertions(+), 23 deletions(-)
 create mode 100644 home-manager/machines/crash/home.nix
 create mode 100644 nixos/machines/crash/configuration.nix
 create mode 100644 nixos/machines/crash/hardware.nix
 create mode 100644 nixos/machines/crash/machine.nix

diff --git a/flake.nix b/flake.nix
index 0f06d06..d40d6bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,40 +21,52 @@
   };
 
   outputs =
-    inputs@{ flake-parts, ... }:
+    inputs@{ flake-parts, self, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         inputs.devshell.flakeModule
         ./nixos/machines/wsl/configuration.nix
         ./nixos/machines/installer/configuration.nix
+        ./nixos/machines/crash/machine.nix
         ./home-manager/machines/wsl/home.nix
+        ./home-manager/machines/crash/home.nix
         ./devshells/rust.nix
         ./devshells/idris2.nix
         ./devshells/raku.nix
       ];
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "aarch64-darwin"
-        "x86_64-darwin"
-      ];
-      perSystem =
-        {
-          config,
-          self',
-          inputs',
-          pkgs,
-          system,
-          ...
-        }:
-        {
-          # Per-system attributes can be defined here. The self' and inputs'
-          # module parameters provide easy access to attributes of the same
-          # system.
+      config = {
+        systems = [
+          "x86_64-linux"
+          "aarch64-linux"
+          "aarch64-darwin"
+          "x86_64-darwin"
+        ];
+        perSystem =
+          {
+            config,
+            self',
+            inputs',
+            pkgs,
+            system,
+            ...
+          }:
+          {
+            # Per-system attributes can be defined here. The self' and inputs'
+            # module parameters provide easy access to attributes of the same
+            # system.
+
+            # Equivalent to  inputs'.nixpkgs.legacyPackages.hello;
+            packages.default = pkgs.hello;
+          };
+      };
+      options = with inputs.nixpkgs.lib; {
+        flake = flake-parts.lib.mkSubmoduleOptions {
+          homeConfigurations = mkOption {
+            type = types.lazyAttrsOf types.raw;
+            default = { };
+          };
 
-          # Equivalent to  inputs'.nixpkgs.legacyPackages.hello;
-          packages.default = pkgs.hello;
         };
-      flake = { };
+      };
     };
 }
diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix
new file mode 100644
index 0000000..8d565bd
--- /dev/null
+++ b/home-manager/machines/crash/home.nix
@@ -0,0 +1,51 @@
+{ withSystem, inputs, ... }:
+{
+  # perSystem = { ... }: { config.packages.hello = ...; };
+
+  flake.homeConfigurations.crash = withSystem "x86_64-linux" (
+    ctx@{ config, inputs', ... }:
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
+      extraSpecialArgs = {
+        inherit inputs inputs';
+        packages = config.packages;
+      };
+      modules = [
+        (
+          {
+            config,
+            lib,
+            pkgs,
+            ...
+          }:
+          {
+            imports = [
+              ../../modules/programs/shell.nix
+              ../../modules/programs/neovim.nix
+              (import ../../modules/programs/git.nix { })
+              ../../modules/programs/core.nix
+              ../../modules/programs/devel.nix
+              ../../modules/programs/ssh.nix
+              (import ../../modules/programs/emacs.nix { })
+              ../../modules/programs/fonts.nix
+            ];
+            home.username = "nathan";
+            home.homeDirectory = "/home/nathan/";
+            programs.command-not-found.enable = true;
+            home.stateVersion = "24.11";
+            programs.home-manager.enable = true;
+
+            # Allow unfree packages
+            nixpkgs.config.allowUnfree = true;
+
+            # Machine specific configuration
+            programs.nushell.environmentVariables = {
+              VISUAL = "nvim";
+              EDITOR = "nvim";
+            };
+          }
+        )
+      ];
+    }
+  );
+}
diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix
new file mode 100644
index 0000000..adecdab
--- /dev/null
+++ b/nixos/machines/crash/configuration.nix
@@ -0,0 +1,148 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ 
+    ];
+
+  nix.settings.trusted-users = [ "root" "nathan" ];
+
+programs.ssh.extraConfig = ''
+  Host eu.nixbuild.net
+  PubkeyAcceptedKeyTypes ssh-ed25519
+  ServerAliveInterval 60
+  IPQoS throughput
+  IdentityFile /home/nathan/.ssh/id_ed25519
+'';
+
+programs.ssh.knownHosts = {
+  nixbuild = {
+    hostNames = [ "eu.nixbuild.net" ];
+    publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
+  };
+};
+
+nix = {
+  distributedBuilds = true;
+  buildMachines = [
+    { hostName = "eu.nixbuild.net";
+      system = "x86_64-linux";
+      maxJobs = 100;
+      supportedFeatures = [ "benchmark" "big-parallel" ];
+    }
+  ];
+};
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "crash"; # Define your hostname.
+
+  services.tailscale.enable = true;
+
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/New_York";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = true;
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.nathan = {
+    extraGroups = [ "networkmanager" ];
+  };
+
+  # Install firefox.
+  programs.firefox.enable = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+
+  system.stateVersion = "24.11"; # Did you read the comment?
+
+}
diff --git a/nixos/machines/crash/hardware.nix b/nixos/machines/crash/hardware.nix
new file mode 100644
index 0000000..5a7ca38
--- /dev/null
+++ b/nixos/machines/crash/hardware.nix
@@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/D1C9-AFA9";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/nixos/machines/crash/machine.nix b/nixos/machines/crash/machine.nix
new file mode 100644
index 0000000..97b4aec
--- /dev/null
+++ b/nixos/machines/crash/machine.nix
@@ -0,0 +1,49 @@
+{ withSystem, inputs, ... }:
+{
+  # perSystem = { ... }: { config.packages.hello = ...; };
+
+  flake.nixosConfigurations.crash = withSystem "x86_64-linux" (
+    ctx@{ config, inputs', ... }:
+    inputs.nixpkgs.lib.nixosSystem {
+      # Expose `packages`, `inputs` and `inputs'` as module arguments.
+      # Use specialArgs permits use in `imports`.
+      # Note: if you publish modules for reuse, do not rely on specialArgs, but
+      # on the flake scope instead. See also https://flake.parts/define-module-in-separate-file.html
+      specialArgs = {
+        packages = config.packages;
+        inherit inputs inputs';
+      };
+      modules = [
+        (
+          {
+            config,
+            lib,
+            pkgs,
+            ...
+          }:
+
+          {
+            imports = [
+              # Hardware support
+	      inputs.nixos-hardware.nixosModules.microsoft-surface-common
+              # Our modules
+              (import ../../modules/base.nix { inherit inputs; })
+              (import ./configuration.nix)
+              (import ./hardware.nix)
+              (import ../../modules/user.nix {
+                inherit inputs;
+                mutableUsers = false;
+              })
+            ];
+
+            nix.settings.experimental-features = [
+              "nix-command"
+              "flakes"
+            ];
+
+          }
+        )
+      ];
+    }
+  );
+}

From cf648f81adbdb348a72db0a77fda8012800ef36e Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 10:58:16 -0500
Subject: [PATCH 2/8] Nixfmt

---
 devshells/idris2.nix                   |  5 +-
 home-manager/modules/programs/ssh.nix  |  5 +-
 nixos/machines/crash/configuration.nix | 70 ++++++++++++++------------
 nixos/machines/crash/hardware.nix      | 48 +++++++++++-------
 nixos/machines/crash/machine.nix       |  2 +-
 nixos/machines/wsl/configuration.nix   |  2 +-
 nixos/modules/user.nix                 |  2 +-
 7 files changed, 78 insertions(+), 56 deletions(-)

diff --git a/devshells/idris2.nix b/devshells/idris2.nix
index 0a03015..69508ac 100644
--- a/devshells/idris2.nix
+++ b/devshells/idris2.nix
@@ -23,7 +23,10 @@
               "/share"
             ];
           };
-          libPackages = with pkgs; [ readline70 openssl ];
+          libPackages = with pkgs; [
+            readline70
+            openssl
+          ];
         in
         pkgs.mkShell {
           buildInputs =
diff --git a/home-manager/modules/programs/ssh.nix b/home-manager/modules/programs/ssh.nix
index f3a2f24..8211f7c 100644
--- a/home-manager/modules/programs/ssh.nix
+++ b/home-manager/modules/programs/ssh.nix
@@ -19,8 +19,7 @@
     controlMaster = "auto";
     controlPersist = "10m";
     # Configure known hosts
-    matchBlocks =
-      {
-      };
+    matchBlocks = {
+    };
   };
 }
diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix
index adecdab..f5661c1 100644
--- a/nixos/machines/crash/configuration.nix
+++ b/nixos/machines/crash/configuration.nix
@@ -5,37 +5,43 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ 
-    ];
-
-  nix.settings.trusted-users = [ "root" "nathan" ];
-
-programs.ssh.extraConfig = ''
-  Host eu.nixbuild.net
-  PubkeyAcceptedKeyTypes ssh-ed25519
-  ServerAliveInterval 60
-  IPQoS throughput
-  IdentityFile /home/nathan/.ssh/id_ed25519
-'';
-
-programs.ssh.knownHosts = {
-  nixbuild = {
-    hostNames = [ "eu.nixbuild.net" ];
-    publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
-  };
-};
-
-nix = {
-  distributedBuilds = true;
-  buildMachines = [
-    { hostName = "eu.nixbuild.net";
-      system = "x86_64-linux";
-      maxJobs = 100;
-      supportedFeatures = [ "benchmark" "big-parallel" ];
-    }
+  imports = [
   ];
-};
+
+  nix.settings.trusted-users = [
+    "root"
+    "nathan"
+  ];
+
+  programs.ssh.extraConfig = ''
+    Host eu.nixbuild.net
+    PubkeyAcceptedKeyTypes ssh-ed25519
+    ServerAliveInterval 60
+    IPQoS throughput
+    IdentityFile /home/nathan/.ssh/id_ed25519
+  '';
+
+  programs.ssh.knownHosts = {
+    nixbuild = {
+      hostNames = [ "eu.nixbuild.net" ];
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
+    };
+  };
+
+  nix = {
+    distributedBuilds = true;
+    buildMachines = [
+      {
+        hostName = "eu.nixbuild.net";
+        system = "x86_64-linux";
+        maxJobs = 100;
+        supportedFeatures = [
+          "benchmark"
+          "big-parallel"
+        ];
+      }
+    ];
+  };
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -113,8 +119,8 @@ nix = {
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
+    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    #  wget
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/nixos/machines/crash/hardware.nix b/nixos/machines/crash/hardware.nix
index 5a7ca38..cca4031 100644
--- a/nixos/machines/crash/hardware.nix
+++ b/nixos/machines/crash/hardware.nix
@@ -1,32 +1,46 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/D1C9-AFA9";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; }
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/D1C9-AFA9";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/nixos/machines/crash/machine.nix b/nixos/machines/crash/machine.nix
index 97b4aec..be21325 100644
--- a/nixos/machines/crash/machine.nix
+++ b/nixos/machines/crash/machine.nix
@@ -25,7 +25,7 @@
           {
             imports = [
               # Hardware support
-	      inputs.nixos-hardware.nixosModules.microsoft-surface-common
+              inputs.nixos-hardware.nixosModules.microsoft-surface-common
               # Our modules
               (import ../../modules/base.nix { inherit inputs; })
               (import ./configuration.nix)
diff --git a/nixos/machines/wsl/configuration.nix b/nixos/machines/wsl/configuration.nix
index a79c28d..1d6b1e0 100644
--- a/nixos/machines/wsl/configuration.nix
+++ b/nixos/machines/wsl/configuration.nix
@@ -45,7 +45,7 @@
 
             services.tailscale.enable = true;
 
-            nix.settings.system-features = ["x86_64-linux"];
+            nix.settings.system-features = [ "x86_64-linux" ];
 
             nix.settings.experimental-features = [
               "nix-command"
diff --git a/nixos/modules/user.nix b/nixos/modules/user.nix
index 168cb26..dfab48a 100644
--- a/nixos/modules/user.nix
+++ b/nixos/modules/user.nix
@@ -27,7 +27,7 @@
       ];
       hashedPassword = "$6$ShBAPGwzKZuB7eEv$cbb3erUqtVGFo/Vux9UwT2NkbVG9VGCxJxPiZFYL0DIc3t4GpYxjkM0M7fFnh.6V8MoSKLM/TvOtzdWbYwI58.";
       openssh.authorizedKeys.keys = [
-	"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos"
       ];
     };
 

From 55427d92386d702b4b412531bf98a72d82fa6b6b Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 11:09:08 -0500
Subject: [PATCH 3/8] Bluetooth for crash

---
 nixos/machines/crash/configuration.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix
index f5661c1..364dd65 100644
--- a/nixos/machines/crash/configuration.nix
+++ b/nixos/machines/crash/configuration.nix
@@ -80,6 +80,9 @@
   services.displayManager.sddm.enable = true;
   services.desktopManager.plasma6.enable = true;
 
+  # Setup bluetooth
+  hardware.bluetooth.enable = true;
+
   # Configure keymap in X11
   services.xserver.xkb = {
     layout = "us";

From 99c4179cb500dfc8cf33b3c70e62dcb2711d9bd8 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 11:41:29 -0500
Subject: [PATCH 4/8] Emacs service

---
 home-manager/machines/crash/home.nix    | 5 +----
 home-manager/modules/programs/emacs.nix | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix
index 8d565bd..bab9b46 100644
--- a/home-manager/machines/crash/home.nix
+++ b/home-manager/machines/crash/home.nix
@@ -39,10 +39,7 @@
             nixpkgs.config.allowUnfree = true;
 
             # Machine specific configuration
-            programs.nushell.environmentVariables = {
-              VISUAL = "nvim";
-              EDITOR = "nvim";
-            };
+            services.emacs.defaultEditor = true;
           }
         )
       ];
diff --git a/home-manager/modules/programs/emacs.nix b/home-manager/modules/programs/emacs.nix
index cf61e4d..18301c8 100644
--- a/home-manager/modules/programs/emacs.nix
+++ b/home-manager/modules/programs/emacs.nix
@@ -72,4 +72,8 @@ in
         ))
       ];
   };
+  services.emacs = {
+    enable = true;
+    client.enable = true;
+  };
 }

From bcd0288107fc6035c3ace20aa2c8098ca4c46c32 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 11:59:37 -0500
Subject: [PATCH 5/8] Seperate out raku from idris environment

---
 devshells/idris2.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/devshells/idris2.nix b/devshells/idris2.nix
index 69508ac..358cfea 100644
--- a/devshells/idris2.nix
+++ b/devshells/idris2.nix
@@ -11,18 +11,6 @@
     {
       devShells.idris2 =
         let
-          rakudo_env = pkgs.buildEnv {
-            name = "rakudo-env";
-            paths = with pkgs; [
-              rakudo
-              zef
-            ];
-            pathsToLink = [
-              "/bin"
-              "/lib"
-              "/share"
-            ];
-          };
           libPackages = with pkgs; [
             readline70
             openssl
@@ -40,7 +28,6 @@
               gnumake
               chez
               rlwrap
-              rakudo_env
             ]
             ++ libPackages;
           shellHook = ''

From faef61c066eb5dab47bcaf4421a8749942447053 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 12:03:03 -0500
Subject: [PATCH 6/8] Add syncthing

---
 home-manager/machines/crash/home.nix      |  8 ++++++++
 home-manager/modules/programs/desktop.nix | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 home-manager/modules/programs/desktop.nix

diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix
index bab9b46..29d578f 100644
--- a/home-manager/machines/crash/home.nix
+++ b/home-manager/machines/crash/home.nix
@@ -28,6 +28,7 @@
               ../../modules/programs/ssh.nix
               (import ../../modules/programs/emacs.nix { })
               ../../modules/programs/fonts.nix
+              ../../modules/programs/desktop.nix
             ];
             home.username = "nathan";
             home.homeDirectory = "/home/nathan/";
@@ -40,6 +41,13 @@
 
             # Machine specific configuration
             services.emacs.defaultEditor = true;
+
+            systemd.user.targets.tray = {
+              Unit = {
+                Description = "Home Manager System Tray";
+                Requires = [ "graphical-session-pre.target" ];
+              };
+            };
           }
         )
       ];
diff --git a/home-manager/modules/programs/desktop.nix b/home-manager/modules/programs/desktop.nix
new file mode 100644
index 0000000..0647cae
--- /dev/null
+++ b/home-manager/modules/programs/desktop.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  home.packages = with pkgs; [
+  ];
+
+  services.syncthing = {
+    enable = true;
+    tray = {
+      enable = true;
+    };
+  };
+}

From 8df25e2fc8bb4a345c69e82eea68842e1a6ade6f Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 12:41:28 -0500
Subject: [PATCH 7/8] Basic desktop application configuration

---
 home-manager/modules/programs/desktop.nix | 8 ++++++++
 nixos/machines/crash/configuration.nix    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/home-manager/modules/programs/desktop.nix b/home-manager/modules/programs/desktop.nix
index 0647cae..a76748b 100644
--- a/home-manager/modules/programs/desktop.nix
+++ b/home-manager/modules/programs/desktop.nix
@@ -2,11 +2,18 @@
   config,
   lib,
   pkgs,
+  inputs',
   ...
 }:
 
 {
   home.packages = with pkgs; [
+    webcord-vencord
+    spotify
+    protonmail-desktop
+    inputs'.nixpkgs-unstable.legacyPackages.ente-web
+    protonvpn-gui
+    calibre
   ];
 
   services.syncthing = {
@@ -15,4 +22,5 @@
       enable = true;
     };
   };
+
 }
diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix
index 364dd65..9916a6b 100644
--- a/nixos/machines/crash/configuration.nix
+++ b/nixos/machines/crash/configuration.nix
@@ -79,7 +79,7 @@
   # Enable the KDE Plasma Desktop Environment.
   services.displayManager.sddm.enable = true;
   services.desktopManager.plasma6.enable = true;
-
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
   # Setup bluetooth
   hardware.bluetooth.enable = true;
 

From 0b933dc9a57b28bfae87e65479e31f35b98153d2 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 9 Jan 2025 12:45:49 -0500
Subject: [PATCH 8/8] Auto-optimize store

---
 nixos/machines/crash/configuration.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix
index 9916a6b..50138ba 100644
--- a/nixos/machines/crash/configuration.nix
+++ b/nixos/machines/crash/configuration.nix
@@ -8,11 +8,6 @@
   imports = [
   ];
 
-  nix.settings.trusted-users = [
-    "root"
-    "nathan"
-  ];
-
   programs.ssh.extraConfig = ''
     Host eu.nixbuild.net
     PubkeyAcceptedKeyTypes ssh-ed25519
@@ -29,6 +24,18 @@
   };
 
   nix = {
+    settings = {
+      auto-optimise-store = true;
+      trusted-users = [
+        "root"
+        "nathan"
+      ];
+    };
+    gc = {
+      automatic = true;
+      dates = "hourly";
+      options = "--delete-older-than 7d";
+    };
     distributedBuilds = true;
     buildMachines = [
       {