add helix

2022-09-21 20:38:51 +01:00 · 2022-09-21 20:38:51 +01:00 · 32d1a7a5ec
commit 32d1a7a5ec
parent 2bb9b7511b
8 changed files with 417 additions and 25 deletions
--- a/config/home-manager/base.nix
+++ b/config/home-manager/base.nix
@ -2,6 +2,7 @@ desktop: {pkgs, ...}: {
  imports = [
    ../programs/zsh.nix
    ../programs/vim
+    ../programs/helix
    ../programs/tmux.nix
    ../programs/ssh.nix
    ../programs/taskwarrior.nix
--- a/config/programs/helix/default.nix
+++ b/config/programs/helix/default.nix
@ -0,0 +1,196 @@
+{
+  helix,
+  system,
+  pkgs,
+  ...
+}: {
+  programs.helix = {
+    enable = true;
+    package = helix.packages.${system}.helix;
+    languages = [
+      {
+        name = "rust";
+        debugger = {
+          command = "${pkgs.vscode-extensions.vadimcn.vscode-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/adapter/codelldb";
+          name = "codelldb";
+          port-arg = "--port {}";
+          transport = "tcp";
+          templates = [
+            {
+              name = "binary";
+              request = "launch";
+              completion = [
+                {
+                  completion = "filename";
+                  name = "binary";
+                }
+              ];
+              args = [
+                {
+                  program = "{0}";
+                  runInTerminal = true;
+                }
+              ];
+            }
+          ];
+        };
+        language-server.command = "${pkgs.rust-analyzer}/bin/rust-analyzer";
+      }
+      {
+        name = "toml";
+        language-server = {
+          command = "${pkgs.taplo}/bin/taplo";
+          args = ["lsp" "stdio"];
+        };
+      }
+      {
+        name = "elixir";
+        language-server.command = "${pkgs.elixir_ls}/bin/elixir-ls";
+      }
+      {
+        name = "json";
+        language-server = {
+          command = "${pkgs.nodePackages.vscode-json-languageserver}/bin/vscode-json-languageserver";
+          args = ["--stdin"];
+        };
+      }
+      {
+        name = "c";
+        language-server.command = "${pkgs.llvmPackages_latest.clang-unwrapped}/bin/clangd";
+      }
+      {
+        name = "cpp";
+        language-server.command = "${pkgs.llvmPackages_latest.clang-unwrapped}/bin/clangd";
+      }
+      {
+        name = "javascript";
+        language-server = {
+          command = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server";
+          args = ["--stdio"];
+          language-id = "javascript";
+        };
+      }
+      {
+        name = "jsx";
+        language-server = {
+          command = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server";
+          args = ["--stdio"];
+          language-id = "javascriptreact";
+        };
+      }
+      {
+        name = "typescript";
+        language-server = {
+          command = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server";
+          args = ["--stdio"];
+          language-id = "typescript";
+        };
+      }
+      {
+        name = "typescriptreact";
+        language-server = {
+          command = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server";
+          args = ["--stdio"];
+          language-id = "typescriptreact";
+        };
+      }
+      {
+        name = "css";
+        language-server = {
+          command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver";
+          args = ["--stdio"];
+        };
+      }
+      {
+        name = "scss";
+        language-server = {
+          command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver";
+          args = ["--stdio"];
+        };
+      }
+      {
+        name = "html";
+        language-server = {
+          command = "${pkgs.nodePackages.vscode-html-languageserver-bin}/bin/html-languageserver";
+          args = ["--stdio"];
+        };
+      }
+      {
+        name = "python";
+        language-server.command = "${pkgs.python3Packages.python-lsp-server}/bin/pylsp";
+      }
+      {
+        name = "nix";
+        language-server.command = "${pkgs.rnix-lsp}/bin/rnix-lsp";
+      }
+      {
+        name = "bash";
+        language-server = {
+          command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
+          args = ["start"];
+        };
+      }
+      {
+        name = "latex";
+        language-server.command = "${pkgs.texlab}/bin/texlab";
+      }
+      {
+        name = "java";
+        language-server.command = "${pkgs.jdt-language-server}/bin/jdt-language-server";
+      }
+      {
+        name = "vue";
+        language-server.command = "${pkgs.nodePackages.vls}/bin/vls";
+      }
+      {
+        name = "yaml";
+        language-server = {
+          command = "${pkgs.nodePackages.yaml-language-server}/bin/yaml-language-server";
+          args = ["--stdin"];
+        };
+      }
+    ];
+    settings = {
+      lsp.display-messages = true;
+      theme = "gruvbox";
+    };
+    themes = {
+      gruvbox = {
+        bg0 = "#1d2021";
+        bg1 = "#282828";
+        bg2 = "#282828";
+        bg3 = "#3c3836";
+        bg4 = "#3c3836";
+        bg5 = "#504945";
+        bg_statusline1 = "#282828";
+        bg_statusline2 = "#32302f";
+        bg_statusline3 = "#504945";
+        bg_diff_green = "#32361a";
+        bg_visual_green = "#333e34";
+        bg_diff_red = "#3c1f1e";
+        bg_visual_red = "#442e2d";
+        bg_diff_blue = "#0d3138";
+        bg_visual_blue = "#2e3b3b";
+        bg_visual_yellow = "#473c29";
+        bg_current_word = "#32302f";
+
+        fg0 = "#d4be98";
+        fg1 = "#ddc7a1";
+        red = "#ea6962";
+        orange = "#e78a4e";
+        yellow = "#d8a657";
+        green = "#a9b665";
+        aqua = "#89b482";
+        blue = "#7daea3";
+        purple = "#d3869b";
+        bg_red = "#ea6962";
+        bg_green = "#a9b665";
+        bg_yellow = "#d8a657";
+
+        grey0 = "#7c6f64";
+        grey1 = "#928374";
+        grey2 = "#a89984";
+      };
+    };
+  };
+}
--- a/config/programs/ims.nix
+++ b/config/programs/ims.nix
@ -7,4 +7,3 @@
    element-desktop
  ];
 }
-
--- a/config/programs/kicad.nix
+++ b/config/programs/kicad.nix
@ -1,3 +1,3 @@
 {pkgs, ...}: {
-#  home.packages = with pkgs; [kicad-unstable];
+  #  home.packages = with pkgs; [kicad-unstable];
 }
--- a/config/programs/vim/modules/languages/default.nix
+++ b/config/programs/vim/modules/languages/default.nix
@ -125,6 +125,6 @@ with lib; {
      # This wrapper script fixes that.

      ${pyright}/bin/pyright-langserver $@
-      '')
+    '')
  ];
 }
--- a/config/services/monitoring.nix
+++ b/config/services/monitoring.nix
@ -1,4 +1,8 @@
-{lib, pkgs, ...}: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
  imports = [../../modules/systemd-email-notify.nix];
  programs.msmtp = {
    enable = true;
--- a/flake.lock
+++ b/flake.lock
@ -50,8 +50,8 @@
    },
    "android-nixpkgs": {
      "inputs": {
-        "devshell": "devshell",
-        "flake-utils": "flake-utils_4",
+        "devshell": "devshell_2",
+        "flake-utils": "flake-utils_5",
        "nixpkgs": [
          "invtracker",
          "nixpkgs"
@ -74,9 +74,9 @@
    "cargo2nix": {
      "inputs": {
        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_6",
-        "nixpkgs": "nixpkgs_5",
-        "rust-overlay": "rust-overlay"
+        "flake-utils": "flake-utils_7",
+        "nixpkgs": "nixpkgs_6",
+        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
        "lastModified": 1655189312,
@ -108,7 +108,39 @@
        "url": "https://gist.github.com/DarkKirb/533e9e8b9b6dd1badf9b103b4285dc4e"
      }
    },
+    "crane": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1661875961,
+        "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
    "devshell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1660811669,
+        "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "c2feacb46ee69949124c835419861143c4016fb5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "devshell_2": {
      "inputs": {
        "flake-utils": [
          "invtracker",
@ -155,6 +187,64 @@
        "type": "github"
      }
    },
+    "dream2nix": {
+      "inputs": {
+        "alejandra": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ],
+        "crane": "crane",
+        "devshell": [
+          "helix",
+          "nci",
+          "devshell"
+        ],
+        "flake-utils-pre-commit": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ],
+        "gomod2nix": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ],
+        "mach-nix": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ],
+        "nixpkgs": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ],
+        "poetry2nix": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ],
+        "pre-commit-hooks": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1662176993,
+        "narHash": "sha256-Sy7DsGAveDUFBb6YDsUSYZd/AcXfP/MOMIwMt/NgY84=",
+        "owner": "nix-community",
+        "repo": "dream2nix",
+        "rev": "809bc5940214744eb29778a9a0b03f161979c1b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "dream2nix",
+        "type": "github"
+      }
+    },
    "drone-runner-docker": {
      "flake": false,
      "locked": {
@ -311,11 +401,11 @@
    },
    "flake-utils_4": {
      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
        "type": "github"
      },
      "original": {
@ -340,6 +430,21 @@
      }
    },
    "flake-utils_6": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_7": {
      "locked": {
        "lastModified": 1653893745,
        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@ -354,7 +459,7 @@
        "type": "github"
      }
    },
-    "flake-utils_7": {
+    "flake-utils_8": {
      "locked": {
        "lastModified": 1659877975,
        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -371,7 +476,7 @@
    },
    "gomod2nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
        "utils": "utils"
      },
      "locked": {
@ -403,6 +508,26 @@
        "type": "github"
      }
    },
+    "helix": {
+      "inputs": {
+        "nci": "nci",
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1663677300,
+        "narHash": "sha256-7Xy+kIf/ShSe9w2jRfZIMnfBedDZQckOhyoiQJfYEOs=",
+        "owner": "helix-editor",
+        "repo": "helix",
+        "rev": "5467c65f8224049405498d65f54c3e3f8e4ec6c3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "helix-editor",
+        "repo": "helix",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -469,8 +594,8 @@
    "invtracker": {
      "inputs": {
        "android-nixpkgs": "android-nixpkgs",
-        "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_3"
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
        "lastModified": 1661695658,
@ -662,6 +787,33 @@
        "type": "github"
      }
    },
+    "nci": {
+      "inputs": {
+        "devshell": "devshell",
+        "dream2nix": "dream2nix",
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "helix",
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1662177071,
+        "narHash": "sha256-x6XF//RdZlw81tFAYM1TkjY+iQIpyMCWZ46r9o4wVQY=",
+        "owner": "yusdacra",
+        "repo": "nix-cargo-integration",
+        "rev": "65270dea87bb82fc02102a15221677eea237680e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yusdacra",
+        "repo": "nix-cargo-integration",
+        "type": "github"
+      }
+    },
    "newNixpkgs": {
      "locked": {
        "lastModified": 1647380550,
@ -681,7 +833,7 @@
    "nix": {
      "inputs": {
        "lowdown-src": "lowdown-src_2",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
        "nixpkgs-regression": "nixpkgs-regression_2"
      },
      "locked": {
@ -702,7 +854,7 @@
    "nix-hotfix": {
      "inputs": {
        "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
@ -748,7 +900,7 @@
        "cargo2nix": "cargo2nix",
        "clean-s3-cache": "clean-s3-cache",
        "drone-runner-docker": "drone-runner-docker",
-        "flake-utils": "flake-utils_7",
+        "flake-utils": "flake-utils_8",
        "gomod2nix": "gomod2nix",
        "hydra": "hydra",
        "kreative-open-relay": "kreative-open-relay",
@ -925,6 +1077,22 @@
      }
    },
    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1662019588,
+        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
      "locked": {
        "lastModified": 1661323386,
        "narHash": "sha256-7BxU3dM5oCAwMs8ggblXV0yAIGCfVK6l0vfDvoEIBs8=",
@ -939,7 +1107,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1657693803,
        "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
@ -955,7 +1123,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
      "locked": {
        "lastModified": 1654275867,
        "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=",
@ -971,7 +1139,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1658285632,
        "narHash": "sha256-zRS5S/hoeDGUbO+L95wXG9vJNwsSYcl93XiD0HQBXLk=",
@ -987,7 +1155,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
      "locked": {
        "lastModified": 1645296114,
        "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
@ -1002,7 +1170,7 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
      "locked": {
        "lastModified": 1663548138,
        "narHash": "sha256-PgIjJETRekAoqc1C7efTFXi5Sv5yewfz4CiwjEjiRWw=",
@ -1108,6 +1276,7 @@
        "dns": "dns",
        "emanote": "emanote",
        "flake-utils": "flake-utils_3",
+        "helix": "helix",
        "home-manager": "home-manager",
        "hosts-list": "hosts-list",
        "invtracker": "invtracker",
@ -1115,7 +1284,7 @@
        "nix-neovim": "nix-neovim",
        "nix-packages": "nix-packages",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_9",
        "nixpkgs-fluffychat": "nixpkgs-fluffychat",
        "nixpkgs-noto-variable": "nixpkgs-noto-variable",
        "nur": "nur",
@ -1124,6 +1293,28 @@
      }
    },
    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1662087605,
+        "narHash": "sha256-Gpf2gp2JenKGf+TylX/YJpttY2bzsnvAMLdLaxoZRyU=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "60c2cfaa8b90ed8cebd18b214fac8682dcf222dd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
      "inputs": {
        "flake-utils": [
          "nix-packages",
--- a/flake.nix
+++ b/flake.nix
@ -21,6 +21,7 @@ rec {
    emanote.url = "github:EmaApps/emanote";
    invtracker.url = "git+https://git.chir.rs/darkkirb/Programmierbeleg";
    nixpkgs-fluffychat.url = "github:Luis-Hebendanz/nixpkgs/fix_mkFlutterApp";
+    helix.url = "github:helix-editor/helix";

    nix-neovim = {
      url = "github:syberant/nix-neovim";