2023-06-02

7 files changed, 111 insertions, 44 deletions

diff --git a/flake.lock b/flake.lock
index 74a75ec..4277c90 100644
--- a/flake.lock
+++ b/flake.lock
@@ -278,11 +278,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685553090,
-        "narHash": "sha256-DsAYE1AaR4NcZeeotEIE1XlNVXAv8NxUVDxOb7t4wxU=",
+        "lastModified": 1685573051,
+        "narHash": "sha256-zrpbdQVJFpNVFK3SlA6mE0le8qnKjUjcuY4OzL+wSHw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f1490b8caf2ef6f59205c78cf1a8b68e776214a3",
+        "rev": "3876cc613ac3983078964ffb5a0c01d00028139e",
         "type": "github"
       },
       "original": {
@@ -335,11 +335,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685558819,
-        "narHash": "sha256-nsYS9q60awOMAoMzpP88PlPdQfcfvn2XzT6+fA9M1s8=",
+        "lastModified": 1685585448,
+        "narHash": "sha256-7onuCglc3yR5FDmH+PIMn+VhdP7lmjKD9eoIcI7/Wvw=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "7adce0d27556e869ab6d5c7ab08b382175a70011",
+        "rev": "873f6b9ddd2018190830d3608a1522d7a511cf76",
         "type": "github"
       },
       "original": {
@@ -362,11 +362,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685496289,
-        "narHash": "sha256-WKMrM2YcyyMMT62lCWOVKD/B+xsL3aCnKBrGfJ04jW4=",
+        "lastModified": 1685584329,
+        "narHash": "sha256-Eg/kDcAp/UIjCNgIRRyQscP6O0PHTmQ6aHkaC590ALY=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "bef8f6e461c92e2141b14a83bc1c479dd8e6ca6a",
+        "rev": "71a52cdeb59fc176ead60ca111a2eba7a330f5f9",
         "type": "github"
       },
       "original": {
@@ -394,11 +394,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685498995,
-        "narHash": "sha256-rdyjnkq87tJp+T2Bm1OD/9NXKSsh/vLlPeqCc/mm7qs=",
+        "lastModified": 1685561376,
+        "narHash": "sha256-uIcJdaovXr55FJdmvR6yIN6IWoOL4amBj56e/T2KhgM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9cfaa8a1a00830d17487cb60a19bb86f96f09b27",
+        "rev": "bc3ec5eaa759d58e9fb1bdc9cfe94f74d0331b31",
         "type": "github"
       },
       "original": {
@@ -410,11 +410,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1685569895,
-        "narHash": "sha256-23DqNgDHL0+V4hVtu+/wbM1c9RaZ7JSZGdhGS1Avz24=",
+        "lastModified": 1685645426,
+        "narHash": "sha256-5AS6PQG1//2WQ6H5ISlh81ahw1s4bAnLxrALF7fsFrQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c042866938cfef3dfb2b58e21319874cdeb8f4d",
+        "rev": "06eb8ff061b52d2c23f64e6fe7213f2c54d28557",
         "type": "github"
       },
       "original": {
@@ -426,11 +426,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1685561320,
-        "narHash": "sha256-3JZT3wNmO2ki7Fqw2YV7RE9j3WsVZRVPIPRyvenpQ+U=",
+        "lastModified": 1685587708,
+        "narHash": "sha256-kd+vA/n7cmCL1QWbKcrcwfq2fl6u6By2t6mS7tQgw7Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a649c8fcce9950e11891c4d0b06f3e1d7704be9a",
+        "rev": "041fc5df0031224c56bbd47165d45b16cb628ca9",
         "type": "github"
       },
       "original": {
@@ -476,11 +476,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1685562312,
-        "narHash": "sha256-eDq0kGiq01RfywqOYrquwUbvqRhICfNIhgtLkJXf8do=",
+        "lastModified": 1685643901,
+        "narHash": "sha256-3zkK8nno/fnL3PSMYKtY0uhPdCyM1xVd5ES3ciZqDWU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0816fd8a19c336be3104500fd3ca59e9464d5a39",
+        "rev": "313425ecb994550f7b5c585f1c75a6f9c27fcf7e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 170377e..1e796af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -303,13 +303,6 @@
               entry = "${pkgs.prometheus.cli}/bin/promtool check rules";
               files = "(?x)^(modules/nixos/monitoring/rules/.*\.yaml)$";
             };
-            nixpkgs-lint = {
-              enable = true;
-              name = "nixpkgs-lint";
-              description = "Semantic linter for Nixpkgs using tree-sitter";
-              entry = "${pkgs.nixpkgs-lint}/bin/nixpkgs-lint";
-              files = "(?x)^(packages/.*\.nix)$";
-            };
           };
           settings.deadnix.edit = true;
         };
diff --git a/modules/common/common/home-manager.nix b/modules/common/common/home-manager.nix
index 240cd93..7fa21f8 100644
--- a/modules/common/common/home-manager.nix
+++ b/modules/common/common/home-manager.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   localUsername ? lib.my.username,
   ...
@@ -10,8 +11,7 @@ with lib; {
 
   hm = {
     news.display = "silent";
-    # FIXME This is temporary until home-manager expands the option enum.
-    home.stateVersion = "23.05";
+    home = {inherit (config.system) stateVersion;};
   };
 
   home-manager = {
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 5499d48..d9a5922 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -113,7 +113,8 @@ in {
                     shfmt # :lang sh :editor format
                     sqlite # :lang (org +roam2) :tools lookup
                     texlab # lang (tex +lsp)
-                    texlive.combined.scheme-full # :lang org tex
+                    # FIXME https://github.com/NixOS/nixpkgs/issues/235434
+                    # texlive.combined.scheme-full # :lang org tex
                     unzip # :tools debugger
                     wordnet # :tools (lookup +dictionary +offline)
                     yaml-language-server # :lang (yaml +lsp)
diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix
index ee3e18c..0498fea 100644
--- a/modules/common/vscode.nix
+++ b/modules/common/vscode.nix
@@ -34,7 +34,6 @@ in {
 
       extensions = with pkgs.open-vsx;
         [
-          arrterian.nix-env-selector
           editorconfig.editorconfig
           efoerster.texlab
           github.vscode-pull-request-github
@@ -50,10 +49,7 @@ in {
           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
@@ -61,7 +57,7 @@ in {
           streetsidesoftware.code-spell-checker-british-english
           streetsidesoftware.code-spell-checker-russian
           streetsidesoftware.code-spell-checker-scientific-terms
-          sumneko.lua
+          tamasfe.even-better-toml
           vscode-org-mode.org-mode
           ziglang.vscode-zig
         ]
@@ -129,11 +125,7 @@ in {
         };
 
         terminal = {
-          external.linuxExec =
-            if alacritty.enable
-            then "${pkgs.alacritty}/bin/alacritty"
-            else "${pkgs.xterm}/bin/xterm";
-
+          external.linuxExec = "${pkgs.alacritty}/bin/alacritty";
           integrated = {
             inherit fontFamily fontSize;
             enableBell = true;
@@ -152,7 +144,76 @@ in {
 
         security.workspace.trust.enabled = false;
 
-        git.allowForcePush = true;
+        # Extensions.
+
+        ansible = {
+          ansible = {
+            useFullyQualifiedCollectionNames = true;
+            reuseTerminal = true;
+          };
+          validation.lint.path = "${pkgs.ansible-lint}/bin/ansible-lint";
+        };
+
+        bashIde.shellcheckPath = "${pkgs.shellcheck}/bin/shellcheck";
+
+        cSpell.language = "en-GB,ru";
+
+        magit = {
+          forge-enabled = true;
+          git-path = "${config.hm.programs.git.package}/bin/git";
+        };
+
+        github = {
+          branchProtection = true;
+          gitProtocol = "ssh";
+        };
+
+        terraform = {
+          languageServer.path = "${pkgs.terraform-ls}/bin/terraform-ls";
+          languageServer.terraform.path = "${pkgs.terraform}/bin/terraform";
+        };
+
+        haskell = {
+          formattingProvider = "ormolu";
+          serverExecutablePath = "${pkgs.haskell-language-server}/bin/haskell-language-server";
+        };
+
+        nix = {
+          enableLanguageServer = true;
+          serverPath = "${pkgs.rnix-lsp}/bin/rnix-lsp";
+        };
+
+        python = with pkgs.python311Packages; {
+          experiments.optOutFrom = ["All"];
+          pipenvPath = "${pkgs.pipenv}/bin/pipenv";
+          poetryPath = "${pkgs.poetry}/bin/poetry";
+          formatting = {
+            provider = "black";
+            autopep8Path = "${autopep8}/bin/autopep8";
+            blackPath = "${black}/bin/black";
+            yapfPath = "${yapf}/bin/yapf";
+          };
+          linting = {
+            enabled = true;
+            banditPath = "${bandit}/bin/bandit";
+            flake8Path = "${flake8}/bin/flake8";
+            mypyPath = "${mypy}/bin/mypy";
+            pycodestylePath = "${pycodestyle}/bin/pycodestyle";
+            pydocstylePath = "${pydocstyle}/bin/pydocstyle";
+            pylamaPath = "${pylama}/bin/pylama";
+            pylintPath = "${pylint}/bin/pylint";
+          };
+          testing = {
+            pytestPath = "${pytest}/bin/pytest";
+          };
+        };
+
+        rust-client = {
+          disableRustup = true;
+          rustupPath = "${pkgs.rustup}/bin/rustup";
+          rlsPath = "${pkgs.rustup}/bin/rls";
+          rustfmt_path = "${pkgs.rustfmt}/bin/rustfmt";
+        };
 
         vim = mkIf cfg.vim.enable rec {
           easymotion = true;
@@ -164,6 +225,11 @@ in {
           useSystemClipboard = true;
         };
 
+        zig.zls = {
+          checkForUpdate = false;
+          path = "${pkgs.zls}/bin/zls";
+        };
+
         redhat.telemetry.enabled = false;
       };
     };
diff --git a/modules/nixos/firefox/userContent.css b/modules/nixos/firefox/userContent.css
index a55d78f..3903799 100644
--- a/modules/nixos/firefox/userContent.css
+++ b/modules/nixos/firefox/userContent.css
@@ -338,3 +338,12 @@
         display: none !important;
     }
 }
+
+@-moz-document regexp("https?://open-vsx\.org/.*")
+{
+    MuiCollapse-container,
+    cc-window.cc-banner,
+    footer {
+        display: none !important;
+    }
+}
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index b66aec2..5e12cc6 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -27,8 +27,6 @@ with lib; {
     mpd.enable = true;
     ipfs.enable = true;
 
-    vscode.enable = true;
-
     common.nix.allowedUnfreePackages = ["burpsuite"];
   };