2023-09-16

4 files changed, 10 insertions, 75 deletions

diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix
index e516500..f0add5e 100644
--- a/modules/common/common/nix/default.nix
+++ b/modules/common/common/nix/default.nix
@@ -97,87 +97,22 @@ with lib; {
           patches = final.patches ++ [./patches/tdesktop-no-ads.patch];
         });
 
-        inherit (pkgsPr 245433 "sha256-7duAw2pGwXrX4cgUioNSypmuiNR/hCUVywhKL6jW3qE=") openmw;
+        inherit (pkgsPr 245433 "sha256-FF1WW0+/pJ15+mPVjv0bkrh0dpHfQU08HNat2gu1PQk=") openmw;
       }
-      // (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 {
+      // (with super; {
         # Normalises package names. This is done purely for aesthetics.
-        css-language-server = np.vscode-css-languageserver-bin;
+        css-language-server = nodePackages.vscode-css-languageserver-bin;
         dhall-language-server = dhall-lsp-server;
-        dockerfile-language-server = np.dockerfile-language-server-nodejs;
+        dockerfile-language-server = nodePackages.dockerfile-language-server-nodejs;
         editorconfig = editorconfig-core-c;
         go-language-server = gopls;
-        html-language-server = np.vscode-html-languageserver-bin;
-        inherit (np) bash-language-server;
-        inherit (np) vim-language-server;
-        inherit (np) yaml-language-server;
-        json-language-server = np.vscode-json-languageserver-bin;
+        html-language-server = nodePackages.vscode-html-languageserver-bin;
+        inherit (nodePackages) bash-language-server;
+        inherit (nodePackages) vim-language-server;
+        json-language-server = nodePackages.vscode-json-languageserver-bin;
         k3d = kube3d;
         kubelogin = kubelogin-oidc;
         nix-language-server = rnix-lsp;
-        omnisharp = omnisharp-roslyn;
         telepresence = telepresence2;
         tor-browser = tor-browser-bundle-bin;
       }))
diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index 76c14fe..fbd7c4d 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -77,7 +77,7 @@
        :lang
        (cc +lsp +tree-sitter)
        (common-lisp +lsp +tree-sitter)
-       (csharp +lsp +tree-sitter)
+       ;; (csharp +lsp +tree-sitter)
        data
        ;; (dhall +lsp +tree-sitter)
        (emacs-lisp +lsp +tree-sitter)
diff --git a/modules/common/git.nix b/modules/common/git.nix
index 7f06676..cfd1bf4 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -86,6 +86,7 @@ in {
               "notabug" = "notabug.org";
               "opencode" = "opencode.net";
               "sourcehut" = "git.sr.ht";
+              "torproject" = "gitlab.torproject.org";
               "videolan" = "code.videolan.org";
             };
 
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index 09bfad0..f85e793 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -38,7 +38,6 @@ in {
           comma
           fd
           ripgrep
-          # ripgrep-all # FIXME https://github.com/NixOS/nixpkgs/issues/250306
           sd
           tldr
         ];