1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

diff --git a/apps/gui/default.nix b/apps/gui/default.nix
index 8263c8a0ec80fad4cdc9e259a71fd229c7b8390e..a2b81e99a7543d5d6b279102e18a8d8ad542f3fa 100644
--- a/apps/gui/default.nix
+++ b/apps/gui/default.nix
@@ -7,8 +7,10 @@     # ./flameshot.nix
     ./ghostty.nix
     ./niri.nix
     # ./obs.nix
+    ./sherlock.nix
     ./spotify.nix
     ./swaylock.nix
+    ./vesktop.nix
     ./waybar.nix
     # ./wezterm.nix
     ./wlogout.nix
@@ -19,7 +21,6 @@     swaylock.enable = true;
   };
   home = {
     packages = with pkgs; [
-      discord
       obsidian
       gimp
     ];

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/apps/gui/niri.kdl b/apps/gui/niri.kdl
index 05442f64464259e301fef8f2b0dce8e2c8bdff80..92a072a7ed9ee56d3b5bff45df318feab512a689 100644
--- a/apps/gui/niri.kdl
+++ b/apps/gui/niri.kdl
@@ -73,7 +73,7 @@ binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
 
     Mod+T hotkey-overlay-title="Open a Terminal: ghostty" { spawn "ghostty"; }
-    Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
+    Mod+D hotkey-overlay-title="Run an Application: sherlock" { spawn "sherlock"; }
     Mod+B hotkey-overlay-title="Open a Browser: firefox" { spawn "firefox"; }
     Super+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
 

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112

diff --git a/apps/gui/sherlock.nix b/apps/gui/sherlock.nix
new file mode 100644
index 0000000000000000000000000000000000000000..58c9099b54278dbc60a9adf3c83f6ab2cfb53cbd
--- /dev/null
+++ b/apps/gui/sherlock.nix
@@ -0,0 +1,106 @@
+{
+  programs.sherlock = {
+    enable = true;
+    settings = {
+      status_bar.enable = false;
+    };
+    launchers = [
+      {
+        actions = [
+          {
+            exit = false;
+            icon = "media-seek-forward";
+            method = "inner.next";
+            name = "Skip";
+          }
+          {
+            exit = false;
+            icon = "media-seek-backward";
+            method = "inner.previous";
+            name = "Previous";
+          }
+        ];
+        args = { };
+        async = true;
+        binds = [
+          {
+            bind = "Return";
+            callback = "playpause";
+            exit = false;
+          }
+          {
+            bind = "l";
+            callback = "next";
+            exit = false;
+          }
+          {
+            bind = "h";
+            callback = "previous";
+            exit = false;
+          }
+        ];
+        exit = true;
+        home = "OnlyHome";
+        name = "Spotify";
+        priority = 1;
+        shortcut = true;
+        spawn_focus = false;
+        type = "audio_sink";
+      }
+      {
+        args = {
+          capabilities = [
+            "calc.math"
+            "calc.units"
+          ];
+        };
+        async = false;
+        exit = true;
+        home = "Search";
+        name = "Calculator";
+        on_return = "copy";
+        priority = 1;
+        shortcut = true;
+        spawn_focus = true;
+        type = "calculation";
+      }
+      {
+        alias = "app";
+        args = { };
+        async = false;
+        exit = true;
+        home = "Home";
+        name = "App Launcher";
+        priority = 3;
+        shortcut = true;
+        spawn_focus = true;
+        type = "app_launcher";
+      }
+      {
+        alias = "kill";
+        async = false;
+        exit = true;
+        home = "Search";
+        name = "Kill Process";
+        priority = 0;
+        shortcut = true;
+        spawn_focus = true;
+        type = "process";
+      }
+      {
+        alias = "kagi";
+        args = {
+          icon = "firefox";
+          search_engine = "https://kagi.com/search?q={keyword}";
+        };
+        display_name = "Kagi";
+        name = "Web Search";
+        priority = 100;
+        tag_start = "{keyword}";
+        type = "web_launcher";
+      }
+    ];
+    # causes issues with inheriting env etc
+    systemd.enable = false;
+  };
+}

1
2
3
4
5
6
7
8
9

diff --git a/apps/gui/vesktop.nix b/apps/gui/vesktop.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b5af79f6f9183314b847677386d5324fa7dc5eec
--- /dev/null
+++ b/apps/gui/vesktop.nix
@@ -0,0 +1,3 @@
+{
+  programs.vesktop.enable = true;
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix
index 53a11fe1cea4e81a534e3374256b656f22c87630..95622cdd355c9a0e168b541fc720697a1d20b400 100644
--- a/apps/nogui/nushell.nix
+++ b/apps/nogui/nushell.nix
@@ -27,6 +27,7 @@       $env.GOPATH = "${config.xdg.dataHome}/go"
       $env.PATH = ($env.PATH | split row (char esep) | prepend '${config.xdg.dataHome}/go/bin')
       $env.SPECTRE_USERNAME = "jolheiser"
       $env.SPECTRE_SECRET-FILE = "${config.age.secrets.spectre-pw.path}"
+      $env.NIXOS_OZONE_WL = "1"
     '';
   };
   xdg.configFile = {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

diff --git a/flake.nix b/flake.nix
index 26369edafe53f48145e401194e612ffe75f97f86..9fcb0bef3e0038ab90627877555c386359cbf5a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,6 +116,9 @@       };
       nixosConfigurations = {
         "genmaicha" = nixpkgs.lib.nixosSystem {
           inherit system;
+          specialArgs = {
+            inherit jolheiser;
+          };
           modules = [
             nixos-hardware.nixosModules.framework-13-7040-amd
             catppuccin.nixosModules.catppuccin

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22

diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
index 6b2fe0d23e5165434088dfd3615123e4d854f895..701b0bc1dcc3dfe26f15167b3262e496617f7709 100644
--- a/machines/common/gui/default.nix
+++ b/machines/common/gui/default.nix
@@ -32,10 +32,11 @@     iosevka
     jetbrains-mono
     monaspace
   ];
-  environment.systemPackages = with pkgs; [
-    tailscale-systray
-    fuzzel
-    mako
-    swayidle
-  ];
+  environment = {
+    sessionVariables.NIXOS_OZONE_WL = "1";
+    systemPackages = with pkgs; [
+      tailscale-systray
+      mako
+    ];
+  };
 }