merge things idk

10 files changed, 126 insertions, 41 deletions

diff --git a/modules/packages/environment.nix b/modules/packages/environment.nix
index e1fa882..8fadce7 100644
--- a/modules/packages/environment.nix
+++ b/modules/packages/environment.nix
@@ -28,6 +28,8 @@
 
         pkgs.alejandra
         pkgs.bluetui
+        pkgs.brightnessctl
+        pkgs.btop
         pkgs.lazygit
         pkgs.p7zip
         pkgs.rsync
diff --git a/modules/packages/fish.nix b/modules/packages/fish.nix
index 8467dd1..f33b5a5 100644
--- a/modules/packages/fish.nix
+++ b/modules/packages/fish.nix
@@ -3,7 +3,11 @@
   lib,
   ...
 }: {
-  perSystem = {pkgs, self', ...}: let
+  perSystem = {
+    pkgs,
+    self',
+    ...
+  }: let
     fishConf = pkgs.writeText "fishConf" ''
       function fish_greeting
         ${lib.getExe self'.packages.fastfetch}
diff --git a/modules/packages/kitty.nix b/modules/packages/kitty.nix
index 4e204ad..53580cb 100644
--- a/modules/packages/kitty.nix
+++ b/modules/packages/kitty.nix
@@ -19,6 +19,7 @@
 
       shell_integration = "enabled";
       allow_remote_control = "yes";
+      confirm_os_window_close = -1;
 
       # Gruvbox Material Dark Hard
       background = "#1d2021";
diff --git a/modules/packages/niri/hosts/tiamat.nix b/modules/packages/niri/hosts/tiamat.nix
index a088940..3fdf6aa 100644
--- a/modules/packages/niri/hosts/tiamat.nix
+++ b/modules/packages/niri/hosts/tiamat.nix
@@ -16,10 +16,20 @@
 
     xdg.portal = {
       enable = true;
-      extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+      extraPortals = [pkgs.xdg-desktop-portal-gtk];
     };
 
-    services.displayManager.ly.enable = true;
+    environment.systemPackages = [pkgs.wlr-randr];
+
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --asterisks --cmd niri";
+          user = "jck";
+        };
+      };
+    };
   };
 
   perSystem = {
@@ -36,6 +46,7 @@
             output "eDP-1" {
               mode "2880x1920@120"
               scale 1.67
+              variable-refresh-rate
             }
           '';
         }
diff --git a/modules/packages/niri/package.nix b/modules/packages/niri/package.nix
index baae9a6..ad1144e 100644
--- a/modules/packages/niri/package.nix
+++ b/modules/packages/niri/package.nix
@@ -16,14 +16,13 @@
 
     xdg.portal = {
       enable = true;
-      extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+      extraPortals = [pkgs.xdg-desktop-portal-gtk];
     };
+
+    environment.systemPackages = [pkgs.wlr-randr];
   };
 
-  perSystem = {
-    pkgs,
-    ...
-  }: {
+  perSystem = {pkgs, ...}: {
     packages.niri = inputs.wrapper-modules.wrappers.niri.wrap {
       inherit pkgs;
       imports = [self.wrapperModules.niri];
diff --git a/modules/packages/niri/settings.nix b/modules/packages/niri/settings.nix
index 52ad72f..897bc50 100644
--- a/modules/packages/niri/settings.nix
+++ b/modules/packages/niri/settings.nix
@@ -1,5 +1,10 @@
-{inputs, self, ...}: {
-  flake.wrapperModules.niri = {lib, config, pkgs, ...}: {
+{self, ...}: {
+  flake.wrapperModules.niri = {
+    lib,
+    config,
+    pkgs,
+    ...
+  }: {
     settings = {
       input = {
         focus-follows-mouse = {};
@@ -35,6 +40,7 @@
 
       xwayland-satellite.path = lib.getExe config.pkgs.xwayland-satellite;
       prefer-no-csd = {};
+      hotkey-overlay.skip-at-startup = {};
 
       binds = {
         "Mod+Shift+M".quit = {};
@@ -42,10 +48,69 @@
 
         "Mod+F1".spawn-sh = "${lib.getExe self.packages.${config.pkgs.stdenv.hostPlatform.system}.noctalia-shell} ipc call launcher toggle";
         "Mod+F2".spawn = lib.getExe self.packages.${config.pkgs.stdenv.hostPlatform.system}.terminal;
-        "Mod+F3".spawn = "${lib.getExe self.packages.${config.pkgs.stdenv.hostPlatform.system}.terminal} -e yazi";
+        "Mod+F3".spawn = lib.getExe config.pkgs.thunar;
         "Mod+F4".close-window = {};
 
         "Mod+R".switch-preset-column-width = {};
+
+        "Mod+1".focus-workspace = "w0";
+        "Mod+2".focus-workspace = "w1";
+        "Mod+3".focus-workspace = "w2";
+        "Mod+4".focus-workspace = "w3";
+        "Mod+5".focus-workspace = "w4";
+        "Mod+6".focus-workspace = "w5";
+        "Mod+7".focus-workspace = "w6";
+        "Mod+8".focus-workspace = "w7";
+        "Mod+9".focus-workspace = "w8";
+        "Mod+0".focus-workspace = "w9";
+
+        "Mod+Shift+1".move-column-to-workspace = "w0";
+        "Mod+Shift+2".move-column-to-workspace = "w1";
+        "Mod+Shift+3".move-column-to-workspace = "w2";
+        "Mod+Shift+4".move-column-to-workspace = "w3";
+        "Mod+Shift+5".move-column-to-workspace = "w4";
+        "Mod+Shift+6".move-column-to-workspace = "w5";
+        "Mod+Shift+7".move-column-to-workspace = "w6";
+        "Mod+Shift+8".move-column-to-workspace = "w7";
+        "Mod+Shift+9".move-column-to-workspace = "w8";
+        "Mod+Shift+0".move-column-to-workspace = "w9";
+
+        "Mod+WheelScrollDown".focus-column-left = {};
+        "Mod+WheelScrollUp".focus-column-right = {};
+        "Mod+Shift+WheelScrollDown".focus-workspace-down = {};
+        "Mod+Shift+WheelScrollUp".focus-workspace-up = {};
+
+        "XF86AudioPrev".spawn-sh = "playerctl previous";
+        "XF86AudioPause".spawn-sh = "playerctl play-pause";
+        "XF86AudioPlay".spawn-sh = "playerctl play-pause";
+        "XF86AudioNext".spawn-sh = "playerctl next";
+        "XF86AudioStop".spawn-sh = "playerctl stop";
+
+        "Shift+XF86AudioPrev".spawn-sh = "playerctl --player=Feishin previous";
+        "Shift+XF86AudioPause".spawn-sh = "playerctl --player=Feishin play-pause";
+        "Shift+XF86AudioPlay".spawn-sh = "playerctl --player=Feishin play-pause";
+        "Shift+XF86AudioNext".spawn-sh = "playerctl --player=Feishin next";
+        "Shift+XF86AudioStop".spawn-sh = "playerctl --player=Feishin stop";
+
+        "XF86AudioRaiseVolume".spawn-sh = "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+";
+        "XF86AudioLowerVolume".spawn-sh = "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-";
+        "XF86AudioMute".spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+
+        "XF86MonBrightnessUp".spawn-sh = "${lib.getExe config.pkgs.brightnessctl} set 5%+";
+        "XF86MonBrightnessDown".spawn-sh = "${lib.getExe config.pkgs.brightnessctl} set 5%-";
+      };
+
+      workspaces = {
+        "w0" = {};
+        "w1" = {};
+        "w2" = {};
+        "w3" = {};
+        "w4" = {};
+        "w5" = {};
+        "w6" = {};
+        "w7" = {};
+        "w8" = {};
+        "w9" = {};
       };
 
       spawn-at-startup = [
diff --git a/modules/packages/noctalia/noctalia.json b/modules/packages/noctalia/noctalia.json
index f2eb387..8d19654 100644
--- a/modules/packages/noctalia/noctalia.json
+++ b/modules/packages/noctalia/noctalia.json
@@ -3,7 +3,7 @@
     "settingsVersion": 59,
     "bar": {
       "barType": "simple",
-      "position": "left",
+      "position": "top",
       "monitors": [],
       "density": "default",
       "showOutline": false,
@@ -206,11 +206,11 @@
       "telemetryEnabled": false,
       "enableLockScreenCountdown": true,
       "lockScreenCountdownDuration": 10000,
-      "autoStartAuth": false,
+      "autoStartAuth": true,
       "allowPasswordWithFprintd": true,
       "clockStyle": "custom",
       "clockFormat": "hh\\nmm",
-      "passwordChars": false,
+      "passwordChars": true,
       "lockScreenMonitors": [],
       "lockScreenBlur": 0,
       "lockScreenTint": 0,
@@ -306,14 +306,9 @@
       "automationEnabled": false,
       "wallpaperChangeMode": "random",
       "randomIntervalSec": 300,
-      "transitionDuration": 1500,
+      "transitionDuration": 500,
       "transitionType": [
-        "fade",
-        "disc",
-        "stripes",
-        "wipe",
-        "pixelate",
-        "honeycomb"
+        "pixelate"
       ],
       "skipStartupTransition": false,
       "transitionEdgeSmoothness": 0.05,
@@ -609,8 +604,10 @@
       "spectrumFrameRate": 30,
       "visualizerType": "linear",
       "spectrumMirrored": true,
-      "mprisBlacklist": [],
-      "preferredPlayer": "",
+      "mprisBlacklist": [
+        "zen-twilight"
+      ],
+      "preferredPlayer": "feishin",
       "volumeFeedback": false,
       "volumeFeedbackSoundFile": ""
     },
@@ -673,10 +670,10 @@
       "notifyUpdates": true
     },
     "idle": {
-      "enabled": false,
+      "enabled": true,
       "screenOffTimeout": 600,
-      "lockTimeout": 660,
-      "suspendTimeout": 1800,
+      "lockTimeout": 360,
+      "suspendTimeout": 0,
       "fadeDuration": 5,
       "screenOffCommand": "",
       "lockCommand": "",
@@ -717,12 +714,12 @@
         "physical_height": 190,
         "refresh_rate": 120000,
         "vrr_supported": true,
-        "vrr_enabled": false,
+        "vrr_enabled": true,
         "transform": "Normal"
       }
     },
     "notificationsState": {
-      "lastSeenTs": 1775259926000
+      "lastSeenTs": 1775262614000
     },
     "changelogState": {
       "lastSeenVersion": "v4.7.1"
diff --git a/modules/packages/nvf/_nvfConfig.nix b/modules/packages/nvf/_nvfConfig.nix
index 2746966..d0080cf 100644
--- a/modules/packages/nvf/_nvfConfig.nix
+++ b/modules/packages/nvf/_nvfConfig.nix
@@ -1,4 +1,8 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   config.vim = {
     viAlias = true;
     vimAlias = true;
@@ -108,14 +112,14 @@
         '';
       };
     };
-    
+
     autocmds = [
       {
-        event = [ "InsertEnter" ];
+        event = ["InsertEnter"];
         command = "set norelativenumber";
       }
       {
-        event = [ "InsertLeave" ];
+        event = ["InsertLeave"];
         command = "set relativenumber";
       }
     ];
diff --git a/modules/packages/nvf/package.nix b/modules/packages/nvf/package.nix
index 8189d29..cac61d2 100644
--- a/modules/packages/nvf/package.nix
+++ b/modules/packages/nvf/package.nix
@@ -1,11 +1,9 @@
-{
-  inputs,
-  ...
-}: {
+{inputs, ...}: {
   perSystem = {pkgs, ...}: {
-    packages.neovim = (inputs.nvf.lib.neovimConfiguration {
-      inherit pkgs;
-      modules = [ ./_nvfConfig.nix ];
-    }).neovim;
+    packages.neovim =
+      (inputs.nvf.lib.neovimConfiguration {
+        inherit pkgs;
+        modules = [./_nvfConfig.nix];
+      }).neovim;
   };
 }
diff --git a/modules/packages/zen-browser.nix b/modules/packages/zen-browser.nix
index c770602..b615cee 100644
--- a/modules/packages/zen-browser.nix
+++ b/modules/packages/zen-browser.nix
@@ -1,5 +1,9 @@
 {inputs, ...}: {
-  perSystem = {system, pkgs, ...}: {
+  perSystem = {
+    system,
+    pkgs,
+    ...
+  }: {
     packages.zen-browser = inputs.wrappers.lib.wrapPackage {
       inherit pkgs;
       package = inputs.zen-browser.packages.${system}.twilight.unwrapped.override {