From e9f6f85251547ffe9b7125bfc23eabb9756c45d0 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 2 Dec 2024 13:27:49 -0600
Subject: [PATCH] Home manager, too!

---
 flake.nix                         | 32 +++++++++++++++----------------
 modules/home-manager/hyprland.nix |  4 ++--
 modules/nixos/default.nix         |  9 +++++++--
 nixos/beefcake.nix                | 10 ++++++----
 nixos/dragon.nix                  |  2 +-
 5 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/flake.nix b/flake.nix
index 09010e6..e3b6a41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
     git-hooks.url = "github:cachix/git-hooks.nix";
     git-hooks.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     home-manager-unstable.url = "github:nix-community/home-manager";
@@ -245,21 +245,21 @@
         # wezterm = (import nixpkgs {inherit (prev) system;}).wezterm;
         final.wezterm = wezterm;
 
-        zellij = prev.zellij.overrideAttrs rec {
-          version = "0.41.0";
-          src = prev.fetchFromGitHub {
-            owner = "zellij-org";
-            repo = "zellij";
-            rev = "v0.41.0";
-            hash = "sha256-A+JVWYz0t9cVA8XZciOwDkCecsC2r5TU2O9i9rVg7do=";
-          };
-          cargoDeps = prev.zellij.cargoDeps.overrideAttrs (prev.lib.const {
-            name = "zellij-vendor.tar.gz";
-            inherit src;
-            outputHash = "sha256-WxrMI7fV0pNsGjbNpXLr+xnMdWYkC4WxIeN4OK3ZPIE=";
-          });
-        };
-        final.zellij = zellij;
+        # zellij = prev.zellij.overrideAttrs rec {
+        #   version = "0.41.0";
+        #   src = prev.fetchFromGitHub {
+        #     owner = "zellij-org";
+        #     repo = "zellij";
+        #     rev = "v0.41.0";
+        #     hash = "sha256-A+JVWYz0t9cVA8XZciOwDkCecsC2r5TU2O9i9rVg7do=";
+        #   };
+        #   cargoDeps = prev.zellij.cargoDeps.overrideAttrs (prev.lib.const {
+        #     name = "zellij-vendor.tar.gz";
+        #     inherit src;
+        #     outputHash = "sha256-WxrMI7fV0pNsGjbNpXLr+xnMdWYkC4WxIeN4OK3ZPIE=";
+        #   });
+        # };
+        # final.zellij = zellij;
       };
 
       unstable-packages = final: _prev: {
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index 31a6f95..f76bdd5 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -99,8 +99,8 @@ in {
 
         follow_mouse = 2;
 
-        repeat_delay = 200;
-        repeat_rate = 60;
+        repeat_delay = 180;
+        repeat_rate = 120;
 
         touchpad = {
           natural_scroll = "yes";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 940a779..0b39ebc 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -695,8 +695,13 @@
   };
 
   fonts = {pkgs, ...}: {
-    fonts.packages = with pkgs; [
-      nerd-fonts.symbols-only
+    fonts.packages = [
+      (
+        # allow nixpkgs 24.11 and unstable to both work
+        if builtins.hasAttr "nerd-fonts" pkgs
+        then (pkgs.nerd-fonts.symbols-only)
+        else (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+      )
       pkgs.iosevkaLyteTerm
     ];
   };
diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix
index 66676e6..a32e499 100644
--- a/nixos/beefcake.nix
+++ b/nixos/beefcake.nix
@@ -268,7 +268,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
         ];
       };
       services.nextcloud = {
-        enable = true;
+        enable = false;
         hostName = "nextcloud.h.lyte.dev";
         maxUploadSize = "100G";
         extraAppsEnable = true;
@@ -304,9 +304,11 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
         serviceConfig.Group = "nextcloud";
       };
 
-      services.phpfpm.pools.nextcloud.settings = {
-        "listen.owner" = "caddy";
-        "listen.group" = "caddy";
+      services.phpfpm = lib.mkIf config.services.nextcloud.enable {
+        pools.nextcloud.settings = {
+          "listen.owner" = "caddy";
+          "listen.group" = "caddy";
+        };
       };
 
       services.caddy.virtualHosts."nextcloud.h.lyte.dev" = let
diff --git a/nixos/dragon.nix b/nixos/dragon.nix
index 12b53be..c7cf1d7 100644
--- a/nixos/dragon.nix
+++ b/nixos/dragon.nix
@@ -6,7 +6,7 @@
 }: {
   imports = [
     {
-      system.stateVersion = "24.05";
+      system.stateVersion = "24.11";
       home-manager.users.daniel.home.stateVersion = "24.05";
       networking.hostName = "dragon";
     }