From 6d3ceccf934762ace497e0e80032579c0c99c82e Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Mon, 20 Oct 2025 14:10:18 -0300
Subject: [PATCH] finalising niri config on io

---
 flake.lock                        | 21 +++++++++++++++++++++
 flake.nix                         |  5 +++++
 homeConfigurations.nix            |  6 ++++--
 hosts/modules/desktop/desktop.nix |  1 +
 users/modules/comma.nix           |  7 +++++++
 users/modules/desktop/desktop.nix | 13 ++++++++++++-
 users/modules/desktop/niri.nix    |  1 +
 7 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 users/modules/comma.nix

diff --git a/flake.lock b/flake.lock
index d5792a2..a742089 100644
--- a/flake.lock
+++ b/flake.lock
@@ -548,6 +548,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760846226,
+        "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nix-options-doc": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -823,6 +843,7 @@
         "niri": "niri",
         "niri-flake": "niri-flake",
         "nix-flatpak": "nix-flatpak",
+        "nix-index-database": "nix-index-database",
         "nixos-cli": "nixos-cli",
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-stable": "nixpkgs-stable_2",
diff --git a/flake.nix b/flake.nix
index fc1c117..07e2353 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,6 +46,11 @@
     niri-flake.url = "github:sodiboo/niri-flake";
 
     niri.url = "github:baduhai/niri/auto-center-when-space-available";
+
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
diff --git a/homeConfigurations.nix b/homeConfigurations.nix
index a6866c8..296abfa 100644
--- a/homeConfigurations.nix
+++ b/homeConfigurations.nix
@@ -12,8 +12,9 @@ in
       username = "user";
       hostname = "rotterdam";
       tags = [
-        "btop"
         "desktop"
+        "btop"
+        "comma"
         "direnv"
         "gaming"
         "helix"
@@ -28,8 +29,9 @@ in
       username = "user";
       hostname = "io";
       tags = [
-        "btop"
         "desktop"
+        "btop"
+        "comma"
         "direnv"
         "helix"
         "starship"
diff --git a/hosts/modules/desktop/desktop.nix b/hosts/modules/desktop/desktop.nix
index f3a9f3a..1c1b6c9 100644
--- a/hosts/modules/desktop/desktop.nix
+++ b/hosts/modules/desktop/desktop.nix
@@ -102,6 +102,7 @@
       uninstallUnmanaged = true;
       update.auto.enable = true;
     };
+    gvfs.enable = true;
   };
 
   security.rtkit.enable = true; # Needed for pipewire to acquire realtime priority
diff --git a/users/modules/comma.nix b/users/modules/comma.nix
new file mode 100644
index 0000000..0aad530
--- /dev/null
+++ b/users/modules/comma.nix
@@ -0,0 +1,7 @@
+{ inputs, ... }:
+
+{
+  imports = [ inputs.nix-index-database.homeModules.nix-index ];
+
+  programs.nix-index-database.comma.enable = true;
+}
diff --git a/users/modules/desktop/desktop.nix b/users/modules/desktop/desktop.nix
index ab84c77..21a9451 100644
--- a/users/modules/desktop/desktop.nix
+++ b/users/modules/desktop/desktop.nix
@@ -1,4 +1,9 @@
-{ inputs, pkgs, ... }:
+{
+  config,
+  inputs,
+  pkgs,
+  ...
+}:
 
 {
   fonts.fontconfig.enable = true;
@@ -18,6 +23,7 @@
           sha256 = "sha256:0g2lgqjdrn3c51glry7x2z30y7ml0y61arl5ykmf4yj0p85s5f41";
         }}";
         bell-features = "border";
+        gtk-titlebar-style = "tabs";
         keybind = [ "shift+enter=esc:\\x1b[13;2u" ];
       };
     };
@@ -42,4 +48,9 @@
       gtk-decoration-layout = "appmenu:";
     };
   };
+
+  xdg = {
+    enable = true;
+    userDirs.enable = true;
+  };
 }
diff --git a/users/modules/desktop/niri.nix b/users/modules/desktop/niri.nix
index d7c4df2..4bab001 100644
--- a/users/modules/desktop/niri.nix
+++ b/users/modules/desktop/niri.nix
@@ -150,6 +150,7 @@ in
         Ctrl+Alt+Shift+A allow-when-locked=true { spawn "toggleaudiosink"; }
         Mod+W repeat=false { toggle-overview; }
         Mod+Q { close-window; }
+        Alt+Shift+Q { close-window;}
         Super+Shift+L hotkey-overlay-title="Lock Screen" { spawn "dms" "ipc" "call" "lock" "lock"; }
         Mod+Shift+Q { close-window; }
         Mod+V hotkey-overlay-title="Clipboard Manager" { spawn "dms" "ipc" "call" "clipboard" "toggle"; }