From f8476a6dcc0c56ffe99aefd2b1fdeb46ffc5a1c0 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:03:34 -0500
Subject: [PATCH 01/11] Enable JACK audio server

---
 oscar/configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index fc035c8..16bb95e 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -103,7 +103,7 @@
     alsa.support32Bit = true;
     pulse.enable = true;
     # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
+    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)

From 9a9380901581006876713b9e7215e0517a420500 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:04:04 -0500
Subject: [PATCH 02/11] Install direnv and nix-direnv

---
 oscar/configuration.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 16bb95e..25ae11e 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -129,6 +129,13 @@
     ];
 
     programs.bash.enable = true;
+
+    programs.direnv = {
+      enable = true;
+      enableBashIntegration = true;
+      nix-direnv.enable = true;
+    };
+
     programs.emacs = {
       enable = true;
       extraPackages = epkgs: [

From 95a21db341f846c6f86cbc2ed4056b5e4918544e Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:05:08 -0500
Subject: [PATCH 03/11] Install Chromium (mostly for web troubleshooting)

---
 oscar/configuration.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 25ae11e..4037e5d 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -193,6 +193,13 @@
 #       };
     };
 
+    programs.chromium = {
+      enable = true;
+      extensions = [
+        { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # ublock origin
+      ];
+    };
+
     home.stateVersion = "23.11";
   };
 

From cdc0c72cfad02d5a65453226ba18e53ef06885fb Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:05:24 -0500
Subject: [PATCH 04/11] Switch to pgtk emacs for better wayland integration

---
 oscar/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 4037e5d..ed10cdb 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -138,6 +138,7 @@
 
     programs.emacs = {
       enable = true;
+      package = pkgs.emacs-gtk;
       extraPackages = epkgs: [
         epkgs.nix-mode
         epkgs.magit

From a5805ff4522630ea1ba35408a5a4732954ea14f9 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:06:27 -0500
Subject: [PATCH 05/11] Install atuin

---
 oscar/configuration.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index ed10cdb..fc0fdf2 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -201,6 +201,13 @@
       ];
     };
 
+    programs.atuin = {
+      enable = true;
+      flags = [
+        "--disable-up-arrow"
+      ];
+    };
+
     home.stateVersion = "23.11";
   };
 

From c002898a9bf028e3b9963ad56c0800ae51fa03e0 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:06:47 -0500
Subject: [PATCH 06/11] Enable kdeconnect

---
 oscar/configuration.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index fc0fdf2..4c0b77b 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -208,6 +208,8 @@
       ];
     };
 
+    services.kdeconnect.enable = true;
+
     home.stateVersion = "23.11";
   };
 

From 8ea69c6f23f25e21f4cd12618d8c956e48e09996 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:16:49 -0500
Subject: [PATCH 07/11] Install additional applications

---
 oscar/configuration.nix | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 4c0b77b..1d3776f 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -121,11 +121,35 @@
   users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" "cdrom" ];
   home-manager.users.chandler = { pkgs, ... }: {
     home.packages = with pkgs; [
+      # applications
+      blender
+      freecad
+      frescobaldi
+      gimp
+      josm
       kate
-      prismlauncher
+      kicad
       libreoffice-qt
+      prismlauncher
+      qgis
+      thunderbird
 
-    #  thunderbird
+      # command line applications
+      beets
+      iperf
+      units
+
+      # command line utilities
+      dig
+      file
+      killall
+      pv
+      wl-clipboard
+
+      # a few basic compilers
+      clang
+      go
+      rustc
     ];
 
     programs.bash.enable = true;

From d1dbf62076d547132999b7e4aa095c9afda66d4f Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:20:09 -0500
Subject: [PATCH 08/11] Install nonfree packages inline with home-manager

---
 oscar/configuration.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 1d3776f..359f9d1 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -13,11 +13,9 @@
     ];
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "factorio-alpha"
     "steam"
     "steam-original"
     "steam-run"
-    "discord"
   ];
 
   # https://discourse.nixos.org/t/github-strategies-for-configuration-nix/1983/14
@@ -120,6 +118,12 @@
   users.users.chandler.description = "Chandler Swift";
   users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" "cdrom" ];
   home-manager.users.chandler = { pkgs, ... }: {
+
+    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+      "factorio-alpha"
+      "discord"
+    ];
+
     home.packages = with pkgs; [
       # applications
       blender
@@ -150,6 +154,10 @@
       clang
       go
       rustc
+
+      # Unfree:
+      discord
+      factorio
     ];
 
     programs.bash.enable = true;
@@ -242,8 +250,6 @@
   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
-  discord
-  factorio
   ];
 
   # Some programs need SUID wrappers, can be configured further or are

From aec67617670853527a8140a547b74c244ac46b12 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:22:04 -0500
Subject: [PATCH 09/11] Add alsa-utils

This was useful at VBS for playing music with aplay, and I sometimes use arecord. Plus alsamixer is in here\!
---
 oscar/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 359f9d1..7e4e395 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -144,6 +144,7 @@
       units
 
       # command line utilities
+      alsa-utils
       dig
       file
       killall

From 8ff279e2cfd5388acf7de892b7608d12ffb6ea7f Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:52:26 -0500
Subject: [PATCH 10/11] Add power-profiles-daemon

Required for automatically switching profiles, apparently:

https://pointieststick.com/2021/07/23/this-week-in-kde-power-profiles-and-a-more-polished-kickoff/#comment-23715
---
 oscar/configuration.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 7e4e395..bba5083 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -249,8 +249,7 @@
   # 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
+    power-profiles-daemon
   ];
 
   # Some programs need SUID wrappers, can be configured further or are

From 6ff49adc70fdec752c67446fc0638162247f0a50 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sun, 20 Oct 2024 00:21:02 -0500
Subject: [PATCH 11/11] Use home-manager thunderbird option

---
 oscar/configuration.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index bba5083..4fb7c2d 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -136,7 +136,6 @@
       libreoffice-qt
       prismlauncher
       qgis
-      thunderbird
 
       # command line applications
       beets
@@ -161,6 +160,8 @@
       factorio
     ];
 
+    programs.thunderbird.enable = true;
+
     programs.bash.enable = true;
 
     programs.direnv = {