diff options
author | Azat Bahawi <azat@bahawi.net> | 2023-06-01 02:39:11 +0300 |
---|---|---|
committer | Azat Bahawi <azat@bahawi.net> | 2023-06-01 02:39:11 +0300 |
commit | ec144aaa8fb8c5a4b65e60bbc31a52d71d6e646a (patch) | |
tree | 27a5a684b2def43d0ba00fbb890ed26f572fb060 /modules/common | |
parent | 2023-05-21 (diff) |
2023-06-01
Diffstat (limited to '')
-rw-r--r-- | modules/common/common/home-manager.nix | 5 | ||||
-rw-r--r-- | modules/common/common/nix/default.nix | 1 | ||||
-rw-r--r-- | modules/common/emacs/doom/packages.el | 11 | ||||
-rw-r--r-- | modules/common/profiles/headful.nix | 1 | ||||
-rw-r--r-- | modules/common/vscode.nix | 30 |
5 files changed, 37 insertions, 11 deletions
diff --git a/modules/common/common/home-manager.nix b/modules/common/common/home-manager.nix index b28260a..240cd93 100644 --- a/modules/common/common/home-manager.nix +++ b/modules/common/common/home-manager.nix @@ -1,5 +1,4 @@ { - inputs, lib, localUsername ? lib.my.username, ... @@ -11,8 +10,8 @@ with lib; { hm = { news.display = "silent"; - home.stateVersion = with builtins; - head (split "\n" (readFile "${inputs.nixpkgs}/.version")); + # FIXME This is temporary until home-manager expands the option enum. + home.stateVersion = "23.05"; }; home-manager = { diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index 0c49034..fa1c85e 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -141,6 +141,7 @@ with lib; { tor-browser = tor-browser-bundle-bin; })) agenix.overlays.default + nix-vscode-extensions.overlays.default nur.overlay ]; diff --git a/modules/common/emacs/doom/packages.el b/modules/common/emacs/doom/packages.el index a8e52eb..99ead41 100644 --- a/modules/common/emacs/doom/packages.el +++ b/modules/common/emacs/doom/packages.el @@ -1,5 +1,11 @@ (disable-packages! writegood-mode) +(unpin! evil-collection) +(package! evil-collection + :recipe (:repo "kepi/evil-collection" + :branch "mu4e-development")) + +(unpin! org-roam) (package! org-roam :recipe (:host github :repo "org-roam/org-roam" @@ -9,11 +15,6 @@ :repo "org-roam/org-roam-ui" :branch "main")) -(package! tree-sitter - :recipe (:host github - :repo "azahi/elisp-tree-sitter" - :branch "master")) - (package! hledger-mode) (package! kubernetes) diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index f51ecc8..6ec092d 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -32,6 +32,7 @@ in { ''; packages = with pkgs; [ + comma fd ripgrep ripgrep-all diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix index 2d34788..ee3e18c 100644 --- a/modules/common/vscode.nix +++ b/modules/common/vscode.nix @@ -32,16 +32,38 @@ in { inherit (cfg) package; - extensions = with pkgs; - with vscode-extensions; + extensions = with pkgs.open-vsx; [ + arrterian.nix-env-selector editorconfig.editorconfig - file-icons.file-icons + efoerster.texlab + github.vscode-pull-request-github gitlab.gitlab-workflow + golang.go + graphql.vscode-graphql + hashicorp.hcl + hashicorp.terraform + haskell.haskell + jnoortheen.nix-ide + kahole.magit + mads-hartmann.bash-ide-vscode + mkhl.direnv ms-kubernetes-tools.vscode-kubernetes-tools + ms-python.python + ms-vscode.cmake-tools + pinage404.nix-extension-pack + redhat.ansible + redhat.java redhat.vscode-xml redhat.vscode-yaml + rust-lang.rust streetsidesoftware.code-spell-checker + streetsidesoftware.code-spell-checker-british-english + streetsidesoftware.code-spell-checker-russian + streetsidesoftware.code-spell-checker-scientific-terms + sumneko.lua + vscode-org-mode.org-mode + ziglang.vscode-zig ] ++ optional cfg.vim.enable vscodevim.vim; @@ -141,6 +163,8 @@ in { useSystemClipboard = true; }; + + redhat.telemetry.enabled = false; }; }; }; |