From a1e088fb35e65ea8569eca3746506224870a1011 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Sun, 22 Dec 2024 15:03:39 -0500
Subject: [PATCH] feat: upgrade to nixos 24.11

---
 flake.lock                         | 16 ++++++++--------
 flake.nix                          |  4 ++--
 machines/kitchen/configuration.nix |  2 --
 modules/sound.nix                  |  1 -
 nixos/hyprland/default.nix         | 26 +++++++++++++-------------
 nixos/hyprland/home.nix            | 24 +++++++++++++-----------
 6 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4f5c36e..2385906 100644
--- a/flake.lock
+++ b/flake.lock
@@ -333,16 +333,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1734366194,
+        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
         "type": "github"
       },
       "original": {
         "owner": "rycee",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -498,16 +498,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1734529975,
-        "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
+        "lastModified": 1734737257,
+        "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
+        "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },
diff --git a/flake.nix b/flake.nix
index 9e243a2..2558921 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,13 @@
   description = "Michael Thomas's NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
     unstable.url = "nixpkgs/nixos-unstable";
     master.url = "github:NixOS/nixpkgs";
     nur.url = "github:nix-community/NUR";
 
     home-manager = {
-      url = "github:rycee/home-manager/release-24.05";
+      url = "github:rycee/home-manager/release-24.11";
       inputs = {
         nixpkgs.follows = "nixpkgs";
       };
diff --git a/machines/kitchen/configuration.nix b/machines/kitchen/configuration.nix
index 8d847d2..d036549 100644
--- a/machines/kitchen/configuration.nix
+++ b/machines/kitchen/configuration.nix
@@ -19,8 +19,6 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     wget
-    micro
-    gnome.gnome-tweaks
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/modules/sound.nix b/modules/sound.nix
index e0f7994..0329e63 100644
--- a/modules/sound.nix
+++ b/modules/sound.nix
@@ -1,6 +1,5 @@
 {
   # Enable sound.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
 
diff --git a/nixos/hyprland/default.nix b/nixos/hyprland/default.nix
index 9b7e2c2..4ab2178 100644
--- a/nixos/hyprland/default.nix
+++ b/nixos/hyprland/default.nix
@@ -29,19 +29,19 @@ in {
       adw-gtk3
 
       # Applications
-      gnome.nautilus
-      gnome.sushi
-      gnome.eog
-      gnome.totem
-      gnome.cheese
-      gnome.file-roller
-      gnome.gnome-weather
-      gnome.gnome-contacts
-      gnome.gnome-calendar
-      gnome.gnome-screenshot
-      gnome.gnome-dictionary
-      gnome.gnome-font-viewer
-      gnome.gnome-system-monitor
+      nautilus
+      sushi
+      eog
+      totem
+      cheese
+      file-roller
+      gnome-weather
+      gnome-contacts
+      gnome-calendar
+      gnome-screenshot
+      wordbook
+      gnome-font-viewer
+      gnome-system-monitor
       monophony # music player
 
       # Nvim clipboard
diff --git a/nixos/hyprland/home.nix b/nixos/hyprland/home.nix
index 88aea0e..3572484 100644
--- a/nixos/hyprland/home.nix
+++ b/nixos/hyprland/home.nix
@@ -23,10 +23,7 @@ in {
 
     wayland.windowManager.hyprland = {
       enable = true;
-      settings = let
-        # No gaps or border when only one window
-        no_gaps_when_only = 1;
-      in {
+      settings = {
         "$mod" = "SUPER";
         general = {
           gaps_in = 5;
@@ -36,12 +33,6 @@ in {
           follow_mouse = 2;
           sensitivity = -0.2;
         };
-        dwindle = {
-          inherit no_gaps_when_only;
-        };
-        master = {
-          inherit no_gaps_when_only;
-        };
         exec-once = [
           "hyprctl setcursor Adwaita 24"
           "ags"
@@ -112,6 +103,17 @@ in {
         # mouse bindings
         bindm=ALT,mouse:272,movewindow
         bindm=ALT,mouse:273,resizewindow
+
+        # no gaps when only window
+        workspace = w[t1], gapsout:0, gapsin:0
+        workspace = w[tg1], gapsout:0, gapsin:0
+        workspace = f[1], gapsout:0, gapsin:0
+        windowrulev2 = bordersize 0, floating:0, onworkspace:w[t1]
+        windowrulev2 = rounding 0, floating:0, onworkspace:w[t1]
+        windowrulev2 = bordersize 0, floating:0, onworkspace:w[tg1]
+        windowrulev2 = rounding 0, floating:0, onworkspace:w[tg1]
+        windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
+        windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
       '';
     };
 
@@ -131,7 +133,7 @@ in {
     home.pointerCursor = {
       gtk.enable = true;
       name = "Adwaita";
-      package = pkgs.gnome.adwaita-icon-theme;
+      package = pkgs.adwaita-icon-theme;
       size = 24;
     };