From 73d471faaaca699ce79320bfedd93a2b965a8d74 Mon Sep 17 00:00:00 2001
From: Zeph Levy <171337931+ZephLevy@users.noreply.github.com>
Date: Tue, 18 Nov 2025 20:33:59 +0100
Subject: [PATCH] Add a synth (still not working, but closer) & emojis

---
 flake.lock                                 | 18 +++++++++---------
 home-manager/modules/desktop_overrides.nix |  6 ++++++
 home-manager/modules/hypr/hyprland.nix     |  4 +++-
 nixos/configuration.nix                    |  7 +++++++
 nixos/pkgs.nix                             |  3 +++
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index e52162c..1aff652 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763228015,
-        "narHash": "sha256-1rYieMVUyZ3kK/cBIr8mOusxrOEJ1/+2MsOg0oJ7b3A=",
+        "lastModified": 1763416652,
+        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "96156a9e86281c4bfc451236bc2ddfe4317e6f39",
+        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762977756,
-        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "lastModified": 1763283776,
+        "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+        "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1763049705,
-        "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
+        "lastModified": 1763334038,
+        "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
+        "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/modules/desktop_overrides.nix b/home-manager/modules/desktop_overrides.nix
index c092666..638e61b 100644
--- a/home-manager/modules/desktop_overrides.nix
+++ b/home-manager/modules/desktop_overrides.nix
@@ -32,6 +32,12 @@
       noDisplay = true;
     };
 
+    "surge-xt" = {
+      name = "Surge XT";
+      exec = "\"${pkgs.surge-XT}/bin/Surge XT\"";
+      terminal = false;
+    };
+
 
     # Fixes missing icons
     # TODO: Doesn't work
diff --git a/home-manager/modules/hypr/hyprland.nix b/home-manager/modules/hypr/hyprland.nix
index 4f39130..a36b510 100644
--- a/home-manager/modules/hypr/hyprland.nix
+++ b/home-manager/modules/hypr/hyprland.nix
@@ -111,6 +111,7 @@
     "$terminal" = "foot";
     "$fileManager" = "thunar";
     "$menu" = "fuzzel";
+    "$emoji" = "BEMOJI_PICKER_CMD=\"fuzzel --dmenu\" bemoji -t --private";
     
     bind = [
       "$mainMod, RETURN, exec, $terminal"
@@ -118,11 +119,12 @@
       "$mainMod, T, exec, $fileManager"
       "$mainMod, V, togglefloating,"
       "$mainMod, SPACE, exec, $menu"
+      "$mainMod SHIFT, SPACE, exec, $emoji"
       "$mainMod, P, pseudo,"
       "$mainMod, J, togglesplit,"
       "$mainMod, F, fullscreen, 0"
 
-      "$mainMod, N, movefocus, l"
+      "$mainMod, N, movefocus, l" 
       "$mainMod, O, movefocus, r"
       "$mainMod, I, movefocus, u"
       "$mainMod, E, movefocus, d"
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 6f21ef6..7866d89 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -37,9 +37,16 @@
   
   services.pipewire = {
     enable = true;
+
+    alsa.enable = true;
+    alsa.support32Bit = true;
+
     pulse.enable = true;
+    jack.enable = true;
   };
 
+  security.rtkit.enable = true;
+
   services.pipewire.wireplumber.extraConfig.no-ucm = {
     "monitor.alsa.properties" = {
       "alsa.use-ucm" = false;
diff --git a/nixos/pkgs.nix b/nixos/pkgs.nix
index a23c965..7376bd7 100644
--- a/nixos/pkgs.nix
+++ b/nixos/pkgs.nix
@@ -55,10 +55,13 @@
     godot
     libreoffice
     mpv
+    surge-XT
     gimp
 
     # Important hypr* things
     fuzzel
+    bemoji
+    wtype
     hyprpaper
     hyprpolkitagent
     hyprsunset