From 17cfa46cd80c9aa56ea4890b99c346a44392ee5c Mon Sep 17 00:00:00 2001
From: Noah Pederson <noah@packetlost.dev>
Date: Tue, 20 Feb 2024 21:43:59 -0600
Subject: [PATCH] Fixes

---
 aerc/aerc.conf    |  4 ++--
 configuration.nix |  8 ++++++--
 noah-home.nix     | 11 ++++++++---
 sway/odin         |  3 +++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/aerc/aerc.conf b/aerc/aerc.conf
index 232393a..2631f4a 100644
--- a/aerc/aerc.conf
+++ b/aerc/aerc.conf
@@ -68,7 +68,7 @@ next-message-on-delete=true
 # list of directories.
 #
 # default: /usr/local/share/aerc/stylesets/
-stylesets-dirs=/usr/local/share/aerc/stylesets/
+#stylesets-dirs=/usr/local/share/aerc/stylesets/
 
 # Sets the styleset to use for the aerc ui elements.
 #
@@ -184,7 +184,7 @@ new-email=
 # list of directories.
 #
 # default: /usr/local/share/aerc/templates/
-template-dirs=/usr/local/share/aerc/templates/
+#template-dirs=/usr/local/share/aerc/templates/
 
 # The template to be used for quoted replies.
 #
diff --git a/configuration.nix b/configuration.nix
index f1dc382..cad868f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -103,13 +103,15 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    neovim
     pkgs.appimage-run
     wget
     kitty
     w3m
     fishPlugins.fzf-fish
     fzf
+    qemu
+    OVMF
   ];
 
   # Fonts
@@ -120,6 +122,7 @@
     noto-fonts-cjk
     noto-fonts-emoji
     noto-fonts-extra
+    (nerdfonts.override { fonts = ["FiraCode"]; })
   ];
 
   # Fix dynamically linked libraries for unpackaged binaries
@@ -128,7 +131,7 @@
     libraries = with pkgs; [
       # Add missing dynamic libraries for unpackaged programs HERE
       # NOT in environment.systemPackages
-      zlib
+      zlib	
     ];
   };
 
@@ -213,6 +216,7 @@
       "spotify"
       "obsidian"
       "tailscale"
+      "rust-rover"
     ];
   # Logseq uses an ancient version of Electron, so we enable that
   nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
diff --git a/noah-home.nix b/noah-home.nix
index f0f0056..c299ae8 100644
--- a/noah-home.nix
+++ b/noah-home.nix
@@ -1,4 +1,4 @@
-{ pkgs, ...}: {
+{ pkgs, lib, ...}: {
   home.packages = with pkgs; [
     # main tool
     firefox-devedition
@@ -18,7 +18,6 @@
     catgirl
     netcat
     stunnel
-    aerc
     fzf
 
     # Dev tools
@@ -45,6 +44,9 @@
     ghc
     nil
 
+    # JetBrains
+    jetbrains-toolbox
+
     # GUI tools
     i3status
     slurp
@@ -57,7 +59,6 @@
     discord
     spotify
     tailscale
-    
   ];
   programs.fish.enable = true;
   programs.neovim = {
@@ -74,6 +75,7 @@
     userName = "Noah Pederson";
     userEmail = "noah@packetlost.dev";
   };
+  programs.aerc.enable = true;
   programs.ssh.enable = true;
   programs.ssh.extraConfig = ''
     AddKeysToAgent yes
@@ -192,10 +194,12 @@
     recursive = true;
   };
 
+  /*
   xdg.configFile.aerc = {
     source = ./aerc;
     recursive = true;
   };
+  */
 
   xdg.configFile.sway = {
     source = ./sway;
@@ -208,4 +212,5 @@
   };
 
   home.stateVersion = "23.11";
+
 }
diff --git a/sway/odin b/sway/odin
index d128390..72a53a4 100644
--- a/sway/odin
+++ b/sway/odin
@@ -10,3 +10,6 @@ output DP-9 adaptive_sync on
 # Sometimes the DP identifier changes for some reason
 output DP-6 pos -430 1440
 output DP-6 adaptive_sync on
+# The HDMI gets messed up too :(
+output HDMI-A-2 pos 0 0
+output HDMI-A-2 adaptive_sync off
-- 
2.51.2