From 0fc92db4b69687a090f08fe0f0b065f3308cf6cc Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 13 Jan 2023 09:37:32 -0700 Subject: [PATCH] neovim: only install manix on supported arches --- bins/default.nix | 5 ++--- bins/tstart.nix | 3 +-- configs/neovim.nix | 3 +-- hosts/europa/default.nix | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/bins/default.nix b/bins/default.nix index d9c8918..14727ae 100644 --- a/bins/default.nix +++ b/bins/default.nix @@ -7,9 +7,8 @@ let (import ./check-restart.nix { inherit (pkgs) perl; }); xinStatus = pkgs.writeScriptBin "xin-status" (import ./xin-status.nix { inherit (pkgs) perl perlPackages; }); - tstart = pkgs.writeScriptBin "tstart" (import ./tstart.nix { - inherit (pkgs) tmux; - }); + tstart = + pkgs.writeScriptBin "tstart" (import ./tstart.nix { inherit (pkgs) tmux; }); sfetch = pkgs.writeScriptBin "sfetch" (import ./sfetch.nix { inherit gosignify; inherit (pkgs) curl; diff --git a/bins/tstart.nix b/bins/tstart.nix index 02e6adf..dcf21ca 100644 --- a/bins/tstart.nix +++ b/bins/tstart.nix @@ -1,6 +1,5 @@ { tmux }: -let - tmuxBin = "${tmux}/bin/tmux"; +let tmuxBin = "${tmux}/bin/tmux"; in '' #!/usr/bin/env sh diff --git a/configs/neovim.nix b/configs/neovim.nix index 7c2dbb5..c0e66a0 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -29,7 +29,6 @@ let nvim-tree-lua rust-vim telescope-fzf-native-nvim - telescope-manix telescope-nvim vimagit vim-gitgutter @@ -43,7 +42,7 @@ let myVimPackages = if pkgs.system == "aarch64-linux" then baseVimPackages else - baseVimPackages ++ [ vimPlugins.vim-go ]; + baseVimPackages ++ [ vimPlugins.vim-go vimPlugins.telescope-manix ]; in { environment.systemPackages = with pkgs; [ go diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index 2b2be88..b6943c1 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -28,7 +28,7 @@ let name = "taskobs"; script = "taskobs"; startAt = "*:0/30"; - path = [ pkgs.perl pkgs.taskobs ]; + path = [ pkgs.taskobs ] ++ pkgs.taskobs.buildInputs; } ]; jobToService = job: {