diff options
author | Azat Bahawi <azat@bahawi.net> | 2023-02-19 21:35:36 +0300 |
---|---|---|
committer | Azat Bahawi <azat@bahawi.net> | 2023-02-19 21:35:36 +0300 |
commit | 9e3f4268c87b0d1a64e9429ea173252a5f774ec5 (patch) | |
tree | 12896bfa12d7175a22c1e8091cfcc785112df12b /modules/common | |
parent | 2023-02-19 (diff) |
2023-02-19
Diffstat (limited to '')
-rw-r--r-- | modules/common/aria2.nix | 1 | ||||
-rw-r--r-- | modules/common/common/documentation.nix | 1 | ||||
-rw-r--r-- | modules/common/emacs/default.nix | 1 | ||||
-rw-r--r-- | modules/common/openconnect.nix | 4 | ||||
-rw-r--r-- | modules/common/profiles/dev/default.nix | 1 | ||||
-rw-r--r-- | modules/common/vim/default.nix | 1 | ||||
-rw-r--r-- | modules/common/vscode.nix | 34 |
7 files changed, 9 insertions, 34 deletions
diff --git a/modules/common/aria2.nix b/modules/common/aria2.nix index f33acb9..449d96c 100644 --- a/modules/common/aria2.nix +++ b/modules/common/aria2.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: with lib; let diff --git a/modules/common/common/documentation.nix b/modules/common/common/documentation.nix index 55f6138..e9d4a79 100644 --- a/modules/common/common/documentation.nix +++ b/modules/common/common/documentation.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, this, ... }: diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index 7395c51..bdbbf43 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -1,6 +1,5 @@ { config, - inputs, lib, pkgs, pkgsStable, diff --git a/modules/common/openconnect.nix b/modules/common/openconnect.nix index 780f93f..936c9d1 100644 --- a/modules/common/openconnect.nix +++ b/modules/common/openconnect.nix @@ -10,7 +10,7 @@ in { options.nixfiles.modules.openconnect.enable = mkEnableOption "OpenConnect VPN"; - config = mkIf.enable { + config = mkIf cfg.enable { assertions = [ { assertion = config.networking.networkmanager.enable; @@ -35,7 +35,7 @@ in { networking.networkmanager.plugins = with pkgs; [ ((networkmanager-openconnect.override { withGnome = false; - openconnect = openconnect.overrideAttrs (_: super: { + openconnect = openconnect.overrideAttrs (_: _: { version = "unstable-2022-10-23"; src = fetchFromGitLab { owner = "openconnect"; diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix index b05aeac..366590f 100644 --- a/modules/common/profiles/dev/default.nix +++ b/modules/common/profiles/dev/default.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - this, ... }: with lib; let diff --git a/modules/common/vim/default.nix b/modules/common/vim/default.nix index 0328e10..2ee8a0b 100644 --- a/modules/common/vim/default.nix +++ b/modules/common/vim/default.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - this, ... }: with lib; let diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix index 6671973..92ce5b5 100644 --- a/modules/common/vscode.nix +++ b/modules/common/vscode.nix @@ -132,35 +132,15 @@ in { git.allowForcePush = true; - vim = let - applyInputMethod = { - "ibus" = let - bin = "${pkgs.ibus}/bin/ibus"; - in { - enable = true; - defaultIM = "xkb:us::eng"; - obtainIMCmd = "${bin} engine"; - switchIMCmd = "${bin} engine {im}"; - }; - "fcitx" = let - bin = "${pkgs.fcitx}/bin/fcitx-remote"; - in { - enable = true; - defaultIM = "1"; - obtainIMCmd = bin; - switchIMCmd = "${bin} -t {im}"; - }; - }; - in - mkIf cfg.vim.enable rec { - easymotion = true; - easymotionMarkerFontFamily = fontFamily; - easymotionMarkerFontSize = fontSize; + vim = mkIf cfg.vim.enable rec { + easymotion = true; + easymotionMarkerFontFamily = fontFamily; + easymotionMarkerFontSize = fontSize; - leader = " "; + leader = " "; - useSystemClipboard = true; - }; + useSystemClipboard = true; + }; }; }; }; |