2024-02-09

10 files changed, 73 insertions, 59 deletions

diff --git a/flake.lock b/flake.lock
index 48939a7..2ff519c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706248872,
-        "narHash": "sha256-4V1e06DmT1ScuXstgSEmCRXn1sdWqf/oQ0Q/3ktqLng=",
+        "lastModified": 1707119614,
+        "narHash": "sha256-bwytZcm2PLKhTGWGqbJS2WTzQvHku0rHoHLQnDnLn/g=",
         "owner": "pinpox",
         "repo": "alertmanager-ntfy",
-        "rev": "23fa2327bef937de7ae2184b51d387736ab5c130",
+        "rev": "1c5d171b97bdb7334cc39e981cf4bd9942c26fae",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706581965,
-        "narHash": "sha256-1H7dRdK9LJ7+2X1XQtbwXr+QMqtVVo/ZF0/LIvkjdK8=",
+        "lastModified": 1706833576,
+        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "91b9daf672c957ef95a05491a75f62e6a01d5aaf",
+        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
         "type": "github"
       },
       "original": {
@@ -240,11 +240,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706473109,
-        "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=",
+        "lastModified": 1707175763,
+        "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d634c3abafa454551f2083b054cd95c3f287be61",
+        "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80",
         "type": "github"
       },
       "original": {
@@ -288,11 +288,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706219574,
-        "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
+        "lastModified": 1706742486,
+        "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
+        "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29",
         "type": "gitlab"
       },
       "original": {
@@ -314,11 +314,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706577305,
-        "narHash": "sha256-if+l5DvLWECQJ41hgVTwRs/1j6hl/dbIAO+CnUI/0vY=",
+        "lastModified": 1707182094,
+        "narHash": "sha256-ocWDJvib5zVfyYPemfpmKZH2v3bHiaHVGhT817VtxDc=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "f6ba9302d15e038c1f46141e3d95081f7abf5603",
+        "rev": "5f2c64bb2be399240c76a16897eb6988b81a4ad0",
         "type": "github"
       },
       "original": {
@@ -327,13 +327,33 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707016097,
+        "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "3e3dad2808379c522138e2e8b0eb73500721a237",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1706182238,
-        "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
+        "lastModified": 1707211557,
+        "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
+        "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
         "type": "github"
       },
       "original": {
@@ -344,11 +364,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706487304,
-        "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
+        "lastModified": 1707205916,
+        "narHash": "sha256-fmRJilYGlB7VCt3XsdYxrA0u8e/K84O5xYucerUY0iM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
+        "rev": "8cc79aa39bbc6eaedaf286ae655b224c71e02907",
         "type": "github"
       },
       "original": {
@@ -360,11 +380,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1706651650,
-        "narHash": "sha256-cKIZc/8tzCIw1P42ehR+Uq8tlBnyuavdR/qGTE1/vs8=",
+        "lastModified": 1707301127,
+        "narHash": "sha256-T2ITL9oV1l/R2j9CkJg/my2dHWkKpNrA2J1vxuKWaOI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5b5e6f990070ec0c5c343ff9160554866ecd23c2",
+        "rev": "ff2a77caa34022fd91c94f4e045eb18e08a6139d",
         "type": "github"
       },
       "original": {
@@ -376,11 +396,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1706650719,
-        "narHash": "sha256-etJntLA3PC/q7i/7Ki6aFpgE/mR4FqvowX/OvFx5Fm4=",
+        "lastModified": 1707272513,
+        "narHash": "sha256-AzYRCVpWcCAReIUJs5zAFPQw+Y/P5o5SHLdXZgJ2P1M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fa38ab91f9565c14f8e8928f97a8f73166d54947",
+        "rev": "88d128f5f35be5d405fe874495604f3f29350a5f",
         "type": "github"
       },
       "original": {
@@ -441,11 +461,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706424699,
-        "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=",
+        "lastModified": 1707297608,
+        "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf",
+        "rev": "0db2e67ee49910adfa13010e7f012149660af7f0",
         "type": "github"
       },
       "original": {
@@ -470,6 +490,7 @@
         "impermanence": "impermanence",
         "mailserver": "mailserver",
         "minecraft": "minecraft",
+        "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
@@ -510,11 +531,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706577474,
-        "narHash": "sha256-wP5vL/lZjQtMTcQ9F0rWd2zxUARtwnXmLFnS4vBiRac=",
+        "lastModified": 1707268437,
+        "narHash": "sha256-V2R7OyXn5E5A9YuAmpLTDGjHmxuFBRHFTyf9RoloYXw=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "73948c64e9cf186f779208d56cff401dd6e1928e",
+        "rev": "bdb6e70f3dd307fdd9a20698a861d8f298883ea1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 884d9a3..6500a87 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,6 +90,11 @@
       };
     };
 
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     xmonad-ng = {
       url = "git+https://git.azahi.cc/xmonad-ng?ref=master";
       inputs = {
diff --git a/modules/common/common/shell/default.nix b/modules/common/common/shell/default.nix
index 5731f26..8c3fa8a 100644
--- a/modules/common/common/shell/default.nix
+++ b/modules/common/common/shell/default.nix
@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   this,
@@ -16,6 +17,8 @@ in {
 
   config = {
     hm = {
+      imports = [inputs.nix-index-database.hmModules.nix-index];
+
       programs = {
         bash = {
           enable = true;
@@ -125,9 +128,10 @@ in {
             // cfg.aliases;
         };
 
-        command-not-found.enable = false;
-
         dircolors.enable = true;
+
+        command-not-found.enable = false;
+        nix-index-database.comma.enable = true;
       };
 
       home.packages = with pkgs; [grc];
diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix
index 1bc0b0e..52dc49f 100644
--- a/modules/common/profiles/dev/default.nix
+++ b/modules/common/profiles/dev/default.nix
@@ -67,7 +67,6 @@ in {
           hydra-check
           jq
           logcli
-          nix-index
           nix-update
           nixpkgs-review
           sops
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index dc8e1d6..1578ccc 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -34,7 +34,6 @@ in {
         '';
 
         packages = with pkgs; [
-          comma
           fd
           ripgrep
           sd
diff --git a/modules/common/qutebrowser.nix b/modules/common/qutebrowser.nix
index 96da894..9a919b7 100644
--- a/modules/common/qutebrowser.nix
+++ b/modules/common/qutebrowser.nix
@@ -400,23 +400,7 @@ in {
             };
             webpage = {
               bg = "white";
-              darkmode = {
-                enabled = false;
-                algorithm = "lightness-cielab";
-                contrast = 0.0;
-                grayscale = {
-                  all = false;
-                  images = 0.0;
-                };
-                policy = {
-                  images = "smart";
-                  page = "smart";
-                };
-                threshold = {
-                  background = 0;
-                  text = 256;
-                };
-              };
+              darkmode.enabled = false;
               preferred_color_scheme = "auto";
             };
           };
diff --git a/modules/nixos/alertmanager.nix b/modules/nixos/alertmanager.nix
index 9c8d60a..4d7f2ec 100644
--- a/modules/nixos/alertmanager.nix
+++ b/modules/nixos/alertmanager.nix
@@ -67,7 +67,7 @@ in {
               name = my.username;
               webhook_configs = [
                 {
-                  url = with config.pinpox.services.alertmanager-ntfy; "http://${httpAddress}:${httpPort}";
+                  url = with config.services.alertmanager-ntfy; "http://${httpAddress}:${httpPort}";
                 }
               ];
             }
@@ -76,7 +76,7 @@ in {
       };
     };
 
-    pinpox.services.alertmanager-ntfy = {
+    services.alertmanager-ntfy = {
       enable = true;
       httpAddress = "127.0.0.1";
       httpPort = toString (config.nixfiles.modules.ntfy.port + 1);
diff --git a/modules/nixos/common/locale.nix b/modules/nixos/common/locale.nix
index 09e0686..76186bc 100644
--- a/modules/nixos/common/locale.nix
+++ b/modules/nixos/common/locale.nix
@@ -23,9 +23,9 @@ with lib; {
     };
   };
 
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbOptions = concatStringsSep "," [
+    options = concatStringsSep "," [
       "caps:escape"
       "compose:menu"
       "terminate:ctrl_alt_bksp"
diff --git a/modules/nixos/lxc.nix b/modules/nixos/lxc.nix
index bfdab8f..1306497 100644
--- a/modules/nixos/lxc.nix
+++ b/modules/nixos/lxc.nix
@@ -9,7 +9,10 @@ in {
   options.nixfiles.modules.lxc.enable = mkEnableOption "LXC/Incus";
 
   config = mkIf cfg.enable {
+    ark.directories = ["/var/lib/incus"];
+
     virtualisation.incus.enable = true;
+
     my.extraGroups = ["incus-admin"];
   };
 }
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index 219991a..9afaf2c 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -24,7 +24,6 @@ with lib; {
       steam-run.quirks.blackIsleStudios = true;
     };
     libvirtd.enable = true;
-    lxc.enable = true;
     mpd.enable = true;
     qutebrowser.enable = true;
   };