nix fmt

flake.nix

@@ -96,8 +96,7 @@
             pkgs = import nixpkgs {
               config.allowUnfree = true;
               system = "x86_64-linux";
-              overlays = [ inputs.niri.overlays.niri ]
+              overlays = [ inputs.niri.overlays.niri ] ++ import ./overlay;
-                      ++ import ./overlay;
             };
           in
           {

home/niri.nix

@@ -1,19 +1,30 @@
-{ config, ...}:
+{ config, ... }:
 {
   programs.niri.settings = {
     prefer-no-csd = true;
+    input.keyboard.xkb.options = "ctrl:nocaps";
+    spawn-at-startup = [
+      { command = [ "waybar" ]; }
+    ];
   };
 
-  programs.niri.settings.binds = with config.lib.niri.actions; {
+  programs.niri.settings.binds =
-    "Mod+Return".action = spawn "foot";
+    with config.lib.niri.actions;
-    "Mod+D".action = spawn "fuzzel";
+    let
+      terminal = "foot";
+      menu = "fuzzel";
+      browser = "librewolf";
+      file-manager = "thunar";
+    in
+    {
+      "Mod+Return".action = spawn terminal;
+      "Mod+D".action = spawn menu;
 
       "Mod+Shift+E".action = quit;
       "Mod+Equal".action = set-column-width "+10%";
       "Mod+Minus".action = set-column-width "-10%";
       "Mod+Shift+Equal".action = set-window-height "+10%";
       "Mod+Shift+Minus".action = set-window-height "-10%";
-    "Mod+1".action = focus-workspace 1;
       "Super+Alt+L".action = spawn "swaylock";
       "Mod+Ctrl+Q".action = close-window;
       "Mod+H".action = focus-column-left;
@@ -39,5 +50,23 @@
       "Mod+Shift+R".action = switch-preset-window-height;
       "Mod+Ctrl+R".action = reset-window-height;
       "Mod+F".action = fullscreen-window;
+
+      "XF86AudioRaiseVolume".action = sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+";
+      "XF86AudioLowerVolume".action = sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-";
+      "XF86AudioMute".action = sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+      "XF86MonBrightnessUp".action = sh "brightnessctl set 10%+";
+      "XF86MonBrightnessDown".action = sh "brightnessctl set 10%-";
+
+      "Mod+1".action = focus-workspace 1;
+      "Mod+2".action = focus-workspace 2;
+      "Mod+3".action = focus-workspace 3;
+      "Mod+4".action = focus-workspace 4;
+      "Mod+5".action = focus-workspace 5;
+
+      "Mod+Alt+B".action = spawn browser;
+      "Mod+Alt+A".action = spawn "anki";
+      "Mod+Alt+F".action = spawn file-manager;
+      "Mod+Alt+E".action = spawn "evolution";
+      "Mod+P".action = spawn "bitwarden";
     };
 }

home/nixvim/default.nix

@@ -150,7 +150,10 @@
         nil_ls = {
           enable = true;
           settings = {
-            formatting.command = [ "nix" "fmt" ];
+            formatting.command = [
+              "nix"
+              "fmt"
+            ];
             nix.flake.autoArchive = true;
           };
         };

modules/niri.nix

@@ -1,4 +1,9 @@
-{ pkgs, config, lib, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 let
   cfg = config.my.niri;
 in