From 28c4ff21a6ddd81086e9bf31697f525d7638d18e Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Mon, 10 Mar 2025 14:57:43 +0100
Subject: [PATCH] gimp3, disable channels

---
 .config/i3/config            |  1 -
 flake.lock                   | 17 +++++++++++++++++
 flake.nix                    |  2 ++
 modules/hardware/ryzen.nix   |  9 +++++++++
 modules/nix/settings.nix     |  1 +
 overlays.nix                 |  7 +++++++
 systems/pc/configuration.nix |  6 ++----
 7 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 modules/hardware/ryzen.nix

diff --git a/.config/i3/config b/.config/i3/config
index 21706f7..7c5221b 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -351,7 +351,6 @@ exec_always --no-startup-id sleep 5 && pactl list short sources | grep 'alsa_inp
 exec --no-startup-id /usr/bin/env dunst
 # alternative if you installed aside with XFCE4:
 # exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd &
-exec --no-startup-id sleep 5 && nvidia-settings -a "[gpu:0]/GPUGraphicsClockOffsetAllPerformanceLevels=230"
 
 # autotiling script
 # https://github.com/nwg-piotr/autotiling
diff --git a/flake.lock b/flake.lock
index 2761ad5..8a66c6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -615,6 +615,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-gimp3": {
+      "locked": {
+        "lastModified": 1735507908,
+        "narHash": "sha256-VA+khC0S0di6w5Yv1kBNRpAihnt2prT/ehQzsKMhEoA=",
+        "owner": "jtojnar",
+        "repo": "nixpkgs",
+        "rev": "771cf18187fefcfaababd35834917c621447fee8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jtojnar",
+        "ref": "gimp-meson",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1697935651,
@@ -793,6 +809,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-gimp3": "nixpkgs-gimp3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "nur": "nur",
diff --git a/flake.nix b/flake.nix
index 0b7910b..98fd209 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,7 @@
     #TODO: wait until https://github.com/NixOS/nixpkgs/pull/339641 is in unstable https://nixpk.gs/pr-tracker.html?pr=339641
     #nixpkgs-unstable.url = "github:nixos/nixpkgs/a6916c76a7d202e3c02134e620f6477b8600ce9d";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-gimp3.url = "github:jtojnar/nixpkgs/gimp-meson";
     home-manager-unstable = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -73,6 +74,7 @@
           modifications
           unstable-packages
           stable-packages
+          gimp3
           nur.overlays.default
         ];
       };
diff --git a/modules/hardware/ryzen.nix b/modules/hardware/ryzen.nix
new file mode 100644
index 0000000..8b55fef
--- /dev/null
+++ b/modules/hardware/ryzen.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }: {
+
+  boot = {
+    extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
+    kernelModules = [ "zenpower" ];
+    blacklistedKernelModules = [ "k10temp" ];
+  };
+  environment.systemPackages = with pkgs; [ zenmonitor ];
+}
diff --git a/modules/nix/settings.nix b/modules/nix/settings.nix
index 065c7b5..cc833cb 100644
--- a/modules/nix/settings.nix
+++ b/modules/nix/settings.nix
@@ -32,6 +32,7 @@ in {
         dates = "weekly";
         options = "--delete-older-than 30d";
       };
+      channel.enable = false;
       extraOptions = ''
         min-free = ${toString (100 * 1024 * 1024)}
         max-free = ${toString (1024 * 1024 * 1024)}
diff --git a/overlays.nix b/overlays.nix
index c7a9cbc..e359722 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -70,4 +70,11 @@ in {
       config.allowUnfree = true;
     };
   };
+
+  gimp3 = final: _prev: {
+    gimp3 = import inputs.nixpkgs-gimp3 {
+      system = final.system;
+      config.allowUnfree = true;
+    };
+  };
 }
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index 8f1c189..6ee44a2 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -14,6 +14,7 @@
     ../../modules/fh/writing.nix
     ../../modules/work/vpn.nix
     ../../modules/misc/faster-boot-time.nix
+    ../../modules/hardware/ryzen.nix
   ];
 
   custom = {
@@ -101,6 +102,7 @@
   environment.systemPackages = with pkgs; [
     libimobiledevice
     ifuse # optional, to mount using 'ifuse'
+    gimp3.gimp
   ];
 
   nixpkgs.config.permittedInsecurePackages = [
@@ -155,10 +157,6 @@
     EndSection
   '';
 
-  #zenpower for ryzen
-  boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
-  boot.kernelModules = [ "zenpower" ];
-  boot.blacklistedKernelModules = [ "k10temp" ];
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;