From a6c2119c7845cf8901ccb91071d7af9070b33656 Mon Sep 17 00:00:00 2001
From: worble <worble@worble.xyz>
Date: Thu, 2 Jan 2025 15:44:38 +0000
Subject: [PATCH] move back to stable releases; add nix-ld; readd bottles and
 gimp now they work

---
 configuration.nix            |  2 ++
 flake.lock                   | 21 +++++++++++----------
 flake.nix                    |  4 ++--
 home-manager/terminal.nix    |  2 +-
 home-manager/vscode.nix      |  2 +-
 tuxedo/home-manager/home.nix | 11 ++++++-----
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 9201cf7..7e39d78 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -144,6 +144,8 @@
 
   programs.cdemu.enable = true;
 
+  programs.nix-ld.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs;
diff --git a/flake.lock b/flake.lock
index 730bc16..72517eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,15 +61,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1735381016,
-        "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
+        "lastModified": 1735344290,
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -81,11 +82,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1735523336,
-        "narHash": "sha256-xM4qkXHvpWrTIGZaW/Cb480r7XCAQq1KJ3fBX0KkwwU=",
+        "lastModified": 1735782335,
+        "narHash": "sha256-bjz6Z5GpBHIdD6LVPO505zMPqqYUufCpsZf1RyD/8m8=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "39e0a0b8275a471d580c84bc824a701e06674eb6",
+        "rev": "384a1824dad156ca44aadd625acfc68680aea9a8",
         "type": "github"
       },
       "original": {
@@ -112,16 +113,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "lastModified": 1735669367,
+        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 2d60db6..f8ffd05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {
diff --git a/home-manager/terminal.nix b/home-manager/terminal.nix
index 4ee916c..7e52e96 100644
--- a/home-manager/terminal.nix
+++ b/home-manager/terminal.nix
@@ -18,7 +18,7 @@ in
   config = {
     home.packages = with pkgs;[
       blesh
-      nerd-fonts.space-mono
+      (nerdfonts.override { fonts = [ "SpaceMono" ]; })
     ];
 
     programs = {
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index 5ea8c74..fd6f197 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -5,7 +5,7 @@ let
 in
 {
   home.packages = with pkgs;[
-    nerd-fonts.space-mono
+    (nerdfonts.override { fonts = [ "SpaceMono" ]; })
   ];
 
   programs = {
diff --git a/tuxedo/home-manager/home.nix b/tuxedo/home-manager/home.nix
index e9fe6fa..c8b8a1f 100644
--- a/tuxedo/home-manager/home.nix
+++ b/tuxedo/home-manager/home.nix
@@ -46,9 +46,9 @@
     nextcloud-client
     ubuntu-sans
     ubuntu-sans-mono
-    nerd-fonts.space-mono
+    (nerdfonts.override { fonts = [ "SpaceMono" ]; })
     keepassxc
-    #bottles
+    bottles
     rustup
     strawberry-qt6
     rclone
@@ -61,7 +61,7 @@
       sdk_8_0
       sdk_9_0
     ])
-    #gimp-with-plugins
+    gimp-with-plugins
     ffmpeg-full
     protonup-qt
     protontricks
@@ -79,6 +79,7 @@
     azuredatastudio
     inotify-tools
     libnotify
+    electrum
   ];
 
   fonts.fontconfig = {
@@ -214,9 +215,9 @@
                 changed_rel=''${file#"/mnt/HDD1/Videos"}
                 notify-send -a "rclone-media" "rclone for $file triggered"
                 if rclone copyto "$file" media:"media-7gM2gcrxRjXqfj$changed_rel" ; then
-                  notify-send -a "rclone-media" "rclone for $file complete"
+                  notify-send -a "rclone-media" "rclone complete for $file"
                 else
-                  notify-send -a "rclone-media" "rclone for $file failed"
+                  notify-send -u critical -a "rclone-media" "rclone failed for $file"
                 fi
               done
             '';