From 9770d8fc75c351609400d2bdbacd9d19c8693444 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Tue, 22 Oct 2024 13:12:01 -0400
Subject: [PATCH] tweaks

---
 home/home.nix                  | 17 +++++++++++++----
 system/eddie/configuration.nix | 30 ++++++++++++++----------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 706bd85..c5310b6 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -35,6 +35,7 @@
       silver-searcher
       xclip
       maestral
+      maestral-gui
 
       sane-airscan
       xsane
@@ -49,6 +50,7 @@
       coreutils
       binutils
       libgcc
+      cmake
       raylib
       SDL2.dev
       protonplus
@@ -99,7 +101,7 @@
 
       nixd
 
-      bottles-unwrapped
+      # bottles-unwrapped
 
       fishPlugins.foreign-env
       fishPlugins.z
@@ -144,7 +146,7 @@
       planify
       # fuzzel
       borgbackup
-
+      
       wineWowPackages.stagingFull
       wineWowPackages.fonts
       winetricks
@@ -184,6 +186,7 @@
       yabridge
       yabridgectl
       ansel
+      krita
       rawtherapee
       inkscape
       gimp
@@ -203,7 +206,6 @@
       amberol
       ardour
       parinfer-rust-emacs
-      ardour
 
       # Audio plugins (LV2, VST2, VST3, LADSPA)
       eq10q
@@ -218,7 +220,10 @@
       chow-phaser
       chow-centaur
       chow-tape-model
-     
+      easyeffects
+      vcv-rack
+      cardinal
+
       # Fonts
       fira-code
       fira
@@ -277,6 +282,7 @@
       extraPackages = epkgs: [
         epkgs.mu4e
         epkgs.vterm
+        epkgs.sly
         epkgs.sly-quicklisp
       ];
     };
@@ -357,6 +363,9 @@
       switch-to-application-8 = ["disabled"];
       switch-to-application-9 = ["disabled"];
       switch-to-application-10 = ["disabled"];
+    };
+
+    "org/gnome/desktop/wm/keybindings" = {
       switch-to-workspace-up = ["disabled"];
       switch-to-workspace-down = ["disabled"];
       move-to-workspace-up = ["disabled"];
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index 5fa0df7..2fdd764 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -33,22 +33,6 @@
     ulauncher
   ];
 
-  # services.razer-laptop-control = {
-  #   enable = true;
-  # };
-
-  #services.upower.enable = true;
-
-  # systemd.user.services."razerdaemon" = {
-  #   description = "Razer laptop control daemon";
-  #   serviceConfig = {
-  #     Type = "simple";
-  #     ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p %h/.local/share/razercontrol";
-  #     ExecStart = "${pkgs.razer-laptop-control}/libexec/daemon";
-  #   };
-  #   wantedBy = [ "default.target" ];
-  # };
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -61,6 +45,20 @@
 
   systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"];
 
+  nixpkgs.config.packageOverrides = pkgs: {
+    openrazer-daemon = pkgs.openrazer-daemon.overrideDerivation (previous: {
+      name = "openrazer-daemon390";
+      src = pkgs.fetchFromGitHub {
+        owner = "openrazer";
+        repo = "openrazer";
+        hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY=";
+        rev = "ae5791101e39b91518abb16f26978f2f0eea5e03";
+      };
+      # patches = [""];
+    });
+  };
+
+
   hardware = {
     openrazer = {
       enable = true;