fixup and removing some nix stuff

This commit is contained in:
Tyrel Souza 2023-10-25 22:38:00 -04:00
parent 0a3652b01a
commit 87dc5db039
No known key found for this signature in database
GPG Key ID: F3614B02ACBE438E
6 changed files with 11 additions and 99 deletions

View File

@ -1,7 +1,6 @@
vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]]) vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]])
return function(use) return function(use)
use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' })
use({'SirVer/ultisnips'}) use({'SirVer/ultisnips'})
use({'honza/vim-snippets'}) use({'honza/vim-snippets'})
@ -69,8 +68,6 @@ return function(use)
-- require'telescope'.load_extension('project') -- require'telescope'.load_extension('project')
use({'puremourning/vimspector'}) use({'puremourning/vimspector'})
use({'nvim-treesitter/nvim-treesitter-refactor'})
use({'RRethy/nvim-treesitter-textsubjects'})
use({'airblade/vim-rooter'}) use({'airblade/vim-rooter'})
-- Debugging -- Debugging
@ -100,4 +97,13 @@ return function(use)
commits = 32, -- max number of commits to read commits = 32, -- max number of commits to read
}) })
use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' })
use({'nvim-treesitter/nvim-treesitter-refactor'})
use({'RRethy/nvim-treesitter-textsubjects'})
require("nvim-treesitter.configs").setup({
highlight = { enable = true, disable = { "lua" } },
indent = { enable = true },
refactor = { highlight_definitions = { enable = true } },
matchup = { enable = true },
})
end end

View File

@ -1,44 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.stateVersion = "22.05"; home.stateVersion = "22.05";
home.sessionVariables = {
PAGER = "less -R";
EDITOR = "nvim";
};
home.packages = with pkgs; [
# Terminals
bat
ctags
dosbox
exa
fzf
fd
go
p7zip
ripgrep
tree-sitter
silver-searcher
wget
];
home.file = {
".tmux.conf" = {
source = ../../home/tmux.conf;
};
".gitconfig" = {
source = ../../home/gitconfig;
};
".gitignore" = {
source = ../../home/gitignore;
};
"bin" = {
source = ../../home/bin;
recursive = true;
};
};
nixpkgs.config = {
allowUnfree = true;
};
} }

View File

@ -1,45 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.tmux = {
enable = true;
};
programs.zsh.prezto = {
enable = true;
};
programs.git = {
enable = true;
includes = [
{ path = "~/code/tyrel.dev/dotfiles/home/gitconfig"; }
];
aliases = {
ap = "add -p";
};
extraConfig = {
pull.ff = "only";
};
};
programs.neovim = {
enable = true;
#plugins = with pkgs.vimPlugins; [
# # Inject tree-sitters, since they're annoying to maintain with sideloading
# (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))
#];
plugins = [
pkgs.vimPlugins.nvim-treesitter.withAllGrammars
];
# We used to manage our own init.lua but now we want the home-manager
# managed init.vim to load our init.lua which makes this a little dirty.
extraConfig = ''
lua << EOF
${builtins.readFile ../../home/config/nvim/init.lua}
EOF
'';
};
programs.htop = {
enable = true;
};
} }

View File

@ -1,19 +1,6 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
xdg.configFile = { xdg.configFile = {
"nvim" = {
source = ../../home/config/nvim;
recursive = true;
};
"nvim/lua" = {
source = config.lib.file.mkOutOfStoreSymlink ../config/nvim/lua;
recursive = true;
};
"nvim/legacy.vim".source = config.lib.file.mkOutOfStoreSymlink ../../home/config/nvim/legacy.vim;
"htop" = {
source = ../../home/config/htop;
recursive = true;
};
}; };
} }

View File

@ -1,4 +1,4 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
{ {
programs.zsh.enable = true; #programs.zsh.enable = true;
} }

View File

@ -1,4 +1,4 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
{ {
programs.zsh.enable = true; #programs.zsh.enable = true;
} }