From b2410fc751b476c134dd20fcf2b63c4c3381f016 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Fri, 8 Nov 2024 08:26:07 +0100
Subject: [PATCH] ~

---
 kat/users/default.nix            |  3 +--
 kat/users/neovim/default.nix     | 12 +++++++-----
 machines/kat-manah/default.nix   |  2 --
 machines/kat-probook/default.nix | 22 ++++++++++++++--------
 modules/desktop/sway.nix         | 10 +++-------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/kat/users/default.nix b/kat/users/default.nix
index d373f64..731cb4d 100644
--- a/kat/users/default.nix
+++ b/kat/users/default.nix
@@ -1,5 +1,4 @@
-{ config, lib, sources, ... }:
-with lib;
+{ config, sources, ... }:
 let
   zsh = import ./zsh.nix;
 in
diff --git a/kat/users/neovim/default.nix b/kat/users/neovim/default.nix
index ef2b958..51c051a 100644
--- a/kat/users/neovim/default.nix
+++ b/kat/users/neovim/default.nix
@@ -1,15 +1,17 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
 {
-  options.kat.neovim = mkEnableOption "neovim configuration" // {
-    default = true;
+  options.kat.neovim = {
+    enable = mkEnableOption "neovim configuration" // {
+      default = true;
+    };
+    lsp = mkEnableOption "neovim LSPs";
   };
-  config = mkIf config.kat.neovim {
+  config = mkIf config.kat.neovim.enable {
     programs.nixvim = {
       enable = true;
       defaultEditor = true;
@@ -96,7 +98,7 @@ with lib;
 
         web-devicons.enable = true;
 
-        lsp = {
+        lsp = mkIf config.kat.neovim.lsp {
           enable = true;
           servers = {
             nixd.enable = true;
diff --git a/machines/kat-manah/default.nix b/machines/kat-manah/default.nix
index 5c669db..165e788 100644
--- a/machines/kat-manah/default.nix
+++ b/machines/kat-manah/default.nix
@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   nodes,
   ...
diff --git a/machines/kat-probook/default.nix b/machines/kat-probook/default.nix
index aed3c82..2bcb9a9 100644
--- a/machines/kat-probook/default.nix
+++ b/machines/kat-probook/default.nix
@@ -1,9 +1,5 @@
 {
-  config,
-  lib,
   pkgs,
-  mods,
-  sources,
   nodes,
   users,
   ...
@@ -17,7 +13,6 @@
     # ./router.nix
   ];
 
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   fileSystems."/tmp" = {
     fsType = "tmpfs";
     device = "tmpfs";
@@ -28,9 +23,13 @@
       "size=12G"
     ];
   };
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
+  boot = {
+    kernel.sysctl."net.ipv4.ip_forward" = true;
+    binfmt.emulatedSystems = [ "aarch64-linux" ];
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
   };
 
   nix.settings.trusted-users = [
@@ -144,5 +143,12 @@
     };
   };
 
+  home-manager.users = {
+    "root".kat.neovim.lsp = true;
+    "catvayor".kat.neovim.lsp = true;
+  };
+
+  virtualisation.libvirtd.enable = true;
+
   system.stateVersion = "23.11";
 }
diff --git a/modules/desktop/sway.nix b/modules/desktop/sway.nix
index 9793cb2..efea45e 100644
--- a/modules/desktop/sway.nix
+++ b/modules/desktop/sway.nix
@@ -1,10 +1,7 @@
 {
   global =
     {
-      config,
       pkgs,
-      lib,
-      mods,
       ...
     }:
     {
@@ -21,10 +18,8 @@
     };
   home =
     {
-      config,
       pkgs,
       lib,
-      mods,
       ...
     }:
     {
@@ -132,11 +127,11 @@
             window.titlebar = false;
             colors =
               let
-                black = "#000000";
+                # black = "#000000";
                 dark = "#111111";
                 adark = "#111111BB";
                 aadark = "#11111177";
-                highl = "#222222";
+                # highl = "#222222";
                 gray = "#777777";
                 white = "#FFFFFF";
                 color = "#FFBB00";
@@ -208,6 +203,7 @@
               "${modifier}+q" = "kill";
               "${modifier}+d" = "exec ${menuCmd}";
               "${modifier}+Shift+f" = "exec firefox";
+              "${modifier}+Shift+v" = "exec virt-manager";
               "${modifier}+Shift+c" = "reload";
               "${modifier}+p" = ''exec ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp -d)" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png'';
               "Print" = "exec ${pkgs.grim}/bin/grim - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png";