diff --git a/nix/git-plan.nix b/nix/git-plan.nix deleted file mode 100644 index 9406194..0000000 --- a/nix/git-plan.nix +++ /dev/null @@ -1,11 +0,0 @@ - [ - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "b80588d523ec50c7fee20218426cf2ff70920f06"; - sha256 = "0gl861bn6bb45ands4742xzaxdvl69r4an1v7cyfis7mc450j7lg"; - }; - } - ] diff --git a/nix/home.nix b/nix/home.nix index fd087d5..cc38fd5 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -3,18 +3,18 @@ with lib; let - git-plan = pkgs.buildGoPackage rec { + git-plan = pkgs.rustPlatform.buildRustPackage rec { name = "git-plan"; - version = "0"; - goPackagePath = "gitlab.com/haaksmash/git-plan"; + version = "1"; src = pkgs.fetchFromGitLab { owner = "haaksmash"; repo = "git-plan"; - rev = "89909ff0f5b59fa2b8104abb03198675e5ccc068"; - sha256 = "1viahx5cls59g08ni767qf0zmsimdz1wi6k4723ckkcn0hcwn3mv"; + rev = "9c579feec642d63bca96da42741e05e3a8d134da"; + sha256 = "1pfgfybsafi8jlqbxxgr0d431vavssdk09s8kp8r7054gwld1708"; }; - goDeps = ./git-plan.nix; + cargoSha256 = "1aqjgfpqsasy9qvw08ill7ig6k9n9rdkwxlg1z5g61z7cmi1p3i4"; + buildInputs = [ pkgs.pkg-config pkgs.openssl ]; }; in { home.packages = with pkgs; [ @@ -258,6 +258,20 @@ in { map \w :w noremap Q + """ Esperanto digraphs (for use with ctrl-k) + :digraph Cx 264 + :digraph cx 265 + :digraph Gx 284 + :digraph gx 285 + :digraph Hx 292 + :digraph hx 293 + :digraph Jx 308 + :digraph jx 309 + :digraph Sx 348 + :digraph sx 349 + :digraph Ux 364 + :digraph ux 365 + """ Terminal mode remaps tnoremap nnoremap o :below 10sp term://$SHELLi