2023-07-09

3 files changed, 67 insertions, 14 deletions

diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix
index 5dda142..840bdab 100644
--- a/modules/common/common/nix/default.nix
+++ b/modules/common/common/nix/default.nix
@@ -4,7 +4,6 @@
   lib,
   localUsername ? lib.my.username,
   pkgs,
-  pkgsPr,
   this,
   ...
 }:
@@ -115,9 +114,68 @@ with lib; {
               luajit
             ]);
         });
-
-        inherit (pkgsPr "228852" "sha256-NKZySJ3IVMMeSmpc1zYwse52kxGg0dIrsHTMcO8a73Y=") soju;
       }
+      // (let
+        openconnect = super.openconnect.overrideAttrs (_: _: {
+          version = "unstable-2023-07-01";
+          src = super.fetchFromGitLab {
+            owner = "openconnect";
+            repo = "openconnect";
+            rev = "0e5a69e8f990ece134b50ec0be7b6bf42f14dfbd";
+            hash = "sha256-/8ybs7tlmdVIZORxdcB/xE9Mpyo2cX+VN7eQAS7Qb5k=";
+          };
+        });
+      in {
+        networkmanager-openconnect =
+          (super.networkmanager-openconnect.override {inherit openconnect;})
+          .overrideAttrs (_: final: {
+            version = "unstable-2023-05-29";
+            src = super.fetchFromGitLab {
+              domain = "gitlab.gnome.org";
+              owner = "GNOME";
+              repo = "NetworkManager-openconnect";
+              rev = "030a3a9f05560bdb515ec2a6dad3a0ffbab3b213";
+              hash = "sha256-GvhBKAQmbmzgM1Bh2j6carnGwtL/z5rbPl/jL/4kDoc=";
+            };
+            buildInputs =
+              final.buildInputs
+              ++ [
+                (super.webkitgtk_4_1.override {
+                  inherit (super.gnome) libsoup;
+                })
+              ];
+            nativeBuildInputs =
+              final.nativeBuildInputs
+              ++ [
+                super.autoreconfHook
+              ];
+            preAutoreconf = ''
+              autoupdate
+            '';
+            preConfigure = ''
+              NOCONFIGURE=x ./autogen.sh
+              touch gtk4/nm-openconnect-dialog.ui
+            '';
+          });
+
+        plasma5Packages =
+          super.plasma5Packages
+          // {
+            plasma-nm =
+              (super.plasma5Packages.plasma-nm.override {inherit openconnect;})
+              .overrideAttrs (_: final: {
+                buildInputs = final.buildInputs ++ [super.qt5.qtwebengine];
+                patches =
+                  final.patches
+                  ++ [
+                    (super.fetchpatch {
+                      url = "https://invent.kde.org/plasma/plasma-nm/-/commit/6ef64be8645ac32fc0b42df2cee5d9ff3b57e485.patch";
+                      sha256 = "sha256-b5yTMB7s+wG7X/EyuEa5tBrUU8oKc1Wa0zn0ND1rtI0=";
+                    })
+                  ];
+              });
+          };
+      })
       // (with super; let
         np = nodePackages;
       in {
diff --git a/modules/common/direnv.nix b/modules/common/direnv.nix
index b235cee..6ec39d1 100644
--- a/modules/common/direnv.nix
+++ b/modules/common/direnv.nix
@@ -10,13 +10,13 @@ in {
     mkEnableOption "direnv";
 
   config = mkIf cfg.enable {
-    hm = {
-      programs.direnv = {
-        enable = true;
-        nix-direnv.enable = true;
+    hm.programs.direnv = {
+      enable = true;
+      config.global = {
+        strict_env = true;
+        warn_timeout = 0;
       };
-
-      home.sessionVariables.DIRENV_LOG_FORMAT = "";
+      nix-direnv.enable = true;
     };
   };
 }
diff --git a/modules/common/qutebrowser.nix b/modules/common/qutebrowser.nix
index 7913001..9484ce1 100644
--- a/modules/common/qutebrowser.nix
+++ b/modules/common/qutebrowser.nix
@@ -29,14 +29,10 @@ in {
         ansible = "https://galaxy.ansible.com/search?keywords={}";
         arch = "https://wiki.archlinux.org/?search={}";
         crates = "https://crates.io/search?q={}";
-        crawl = "http://crawl.chaosforge.org/index.php?search={}";
         discogs = "https://www.discogs.com/search/?q={}";
-        dockerdocs = "https://docs.docker.com/search/?q={}";
         dockerhub = "https://hub.docker.com/search?q={}";
         doublegis = "https://2gis.ru/search/{}";
         duckduckgo = "https://duckduckgo.com/?q={}'";
-        dwarffortress = "https://dwarffortresswiki.org/index.php?search={}";
-        ebay = "https://www.ebay.com/sch/i.html?_nkw={}";
         ecosia = "https://www.ecosia.org/search?q={}";
         factorio = "https://wiki.factorio.com/index.php?search={}";
         genius = "https://genius.com/search?q={}";
@@ -95,7 +91,6 @@ in {
         d = duckduckgo;
         do = dockerhub;
         docker = dockerhub;
-        dod = dockerdocs;
         g = google;
         gh = github;
         h = hoogle;