2024-05-26

8 files changed, 36 insertions, 61 deletions

diff --git a/configurations/default.nix b/configurations/default.nix
index 088060b..c1712db 100644
--- a/configurations/default.nix
+++ b/configurations/default.nix
@@ -1,5 +1,5 @@
-{ inputs, ... }:
-with inputs.self.lib;
+{ inputs, lib, ... }:
+with lib;
 let
   mkConfiguration =
     name:
@@ -16,8 +16,7 @@ let
         ++ attrValues inputs.nix-topology.nixosModules
         ++ optional (configuration != null) (import configuration);
       specialArgs = {
-        inherit inputs this;
-        inherit (inputs.self) lib;
+        inherit inputs lib this;
       };
     });
 in
diff --git a/flake.nix b/flake.nix
index 9e78601..1019a60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -189,6 +189,8 @@
 
       legacyPackages.${system} = pkgs;
 
+      overlays = import ./overlays.nix;
+
       devShells.${system}.default =
         with pkgs;
         mkShell {
@@ -198,49 +200,15 @@
 
       formatter.${system} = pkgs.nixfmt;
 
-      checks.${system} = import ./checks.nix {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
-
-      nixosModules = import ./modules {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      checks.${system} = import ./checks.nix { inherit inputs pkgs system; };
 
-      nixosConfigurations = import ./configurations {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      nixosModules.nixfiles =
+        _: with lib; {
+          imports = attrValues (modulesIn ./modules);
+        };
 
-      overlays = import ./overlays.nix {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      nixosConfigurations = import ./configurations { inherit inputs lib pkgs; };
 
-      topology = import ./topology.nix {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      topology = import ./topology.nix { inherit inputs lib pkgs; };
     };
 }
diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 63b3aa7..0000000
--- a/modules/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ lib, ... }: with lib; { nixfiles = _: { imports = attrValues (modulesIn ./.); }; }
diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el
index 79c0156..9ab1e23 100644
--- a/modules/emacs/doom/config.el
+++ b/modules/emacs/doom/config.el
@@ -12,6 +12,13 @@
 (setq browse-url-generic-program (executable-find "firefox")
       browse-url-browser-function 'browse-url-generic)
 
+(use-package! xclip
+  :config
+  (setq xclip-program "wl-copy"
+        xclip-select-enable-clipboard t
+        xclip-mode t
+        xclip-method 'wl-copy))
+
 ;;
 ;;; Doom-specific
 ;;
diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el
index 571993b..ac4a687 100644
--- a/modules/emacs/doom/init.el
+++ b/modules/emacs/doom/init.el
@@ -63,6 +63,7 @@
 
        :os
        (:if (featurep :system 'macos) macos)
+       tty
 
        :lang
        (cc +lsp +tree-sitter)
diff --git a/modules/emacs/doom/packages.el b/modules/emacs/doom/packages.el
index 2ed0e4c..549a5e5 100644
--- a/modules/emacs/doom/packages.el
+++ b/modules/emacs/doom/packages.el
@@ -1,5 +1,7 @@
 (disable-packages! writegood-mode)
 
+(package! xclip)
+
 (package! org-roam-ui)
 
 (package! nickel-mode)
diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix
index 1845701..99cd8a3 100644
--- a/modules/firefox/addons.nix
+++ b/modules/firefox/addons.nix
@@ -2,10 +2,10 @@
 {
   "bitwarden" = buildFirefoxXpiAddon {
     pname = "bitwarden";
-    version = "2024.4.1";
+    version = "2024.4.2";
     addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4263752/bitwarden_password_manager-2024.4.1.xpi";
-    sha256 = "1ba1e66cb9a4ee3bf80a81fc31348b04162385455d2b02f9902473e3931d9693";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4282854/bitwarden_password_manager-2024.4.2.xpi";
+    sha256 = "19caac7131a37e558204c1f61cf1459502cc624b0284dc5837112c4742917da0";
     meta = with lib; {
       homepage = "https://bitwarden.com";
       description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information.";
@@ -22,8 +22,8 @@
         "idle"
         "webRequest"
         "webRequestBlocking"
+        "webNavigation"
         "file:///*"
-        "https://*/*"
         "https://lastpass.com/export.php"
       ];
       platforms = platforms.all;
@@ -50,10 +50,10 @@
   };
   "darkreader" = buildFirefoxXpiAddon {
     pname = "darkreader";
-    version = "4.9.84";
+    version = "4.9.85";
     addonId = "addon@darkreader.org";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4278339/darkreader-4.9.84.xpi";
-    sha256 = "d418b40fc2cb69cfffabf6cc291f2cc5ca4c9d6a99e46562b44f4e2c0148374c";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4286925/darkreader-4.9.85.xpi";
+    sha256 = "28180bd8b970c4b9f961bda310df271d1e26a7cdf4ff01c94239f2fca3079d05";
     meta = with lib; {
       homepage = "https://darkreader.org/";
       description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing.";
@@ -228,10 +228,10 @@
   };
   "ublock-origin" = buildFirefoxXpiAddon {
     pname = "ublock-origin";
-    version = "1.57.2";
+    version = "1.58.0";
     addonId = "uBlock0@raymondhill.net";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4261710/ublock_origin-1.57.2.xpi";
-    sha256 = "9928e79a52cecf7cfa231fdb0699c7d7a427660d94eb10d711ed5a2f10d2eb89";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi";
+    sha256 = "470c56994a7174db21578adce598b158a5dc0970c87c5cfe889ac632bd3085ea";
     meta = with lib; {
       homepage = "https://github.com/gorhill/uBlock#ublock-origin";
       description = "Finally, an efficient wide-spectrum content blocker. Easy on CPU and memory.";
@@ -257,7 +257,6 @@
         "https://forums.lanik.us/*"
         "https://github.com/*"
         "https://*.github.io/*"
-        "https://*.letsblock.it/*"
         "https://github.com/uBlockOrigin/*"
         "https://ublockorigin.github.io/*"
         "https://*.reddit.com/r/uBlockOrigin/*"
@@ -289,10 +288,10 @@
   };
   "violentmonkey" = buildFirefoxXpiAddon {
     pname = "violentmonkey";
-    version = "2.18.0";
+    version = "2.19.0";
     addonId = "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4220396/violentmonkey-2.18.0.xpi";
-    sha256 = "4abbeea842b82965379c6011dec6a435dfff0f69c20749118a8ba2f7d14cb0f1";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4289102/violentmonkey-2.19.0.xpi";
+    sha256 = "105433e09e87b33431f9b47351c13e189a6d9e6df9eb5d425b3d97676ea3dc3c";
     meta = with lib; {
       homepage = "https://violentmonkey.github.io/";
       description = "Userscript support for browsers, open source.";
diff --git a/overlays.nix b/overlays.nix
index 4555d38..3e01cfc 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -1,4 +1,4 @@
-_: {
+{
   default = final: prev: {
     bruh = prev.callPackage ./packages/bruh.nix { };