remove nix

This commit is contained in:
max_richter 2021-10-11 16:49:55 +02:00
parent da0571536b
commit 4fd9616a4c
6 changed files with 58 additions and 13 deletions

View File

@ -1,10 +1,17 @@
set -g default-terminal "screen-256color" set-option -g default-terminal "screen-256color"
set-option -ga terminal-overrides ",xterm-256color:Tc"
set-option -g focus-events on
set-option -sg escape-time 10
set -g destroy-unattached
# remap prefix from 'C-b' to 'C-a' # remap prefix from 'C-b' to 'C-a'
unbind C-b unbind C-b
set-option -g prefix C-a set-option -g prefix C-a
bind-key C-a send-prefix bind-key C-a send-prefix
# split panes using | and - # split panes using | and -
bind | split-window -h -c "#{pane_current_path}" bind | split-window -h -c "#{pane_current_path}"
bind - split-window -v -c "#{pane_current_path}" bind - split-window -v -c "#{pane_current_path}"

View File

@ -14,6 +14,7 @@ plugins=(
git git
docker docker
tmux tmux
asdf
zsh-autosuggestions zsh-autosuggestions
) )
@ -50,6 +51,10 @@ if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH" PATH="$HOME/.local/bin:$PATH"
fi fi
if [ -d "$HOME/.asdf" ] ; then
. "$HOME/.asdf/asdf.sh"
fi
#If fdfind is installed force fzf to use it #If fdfind is installed force fzf to use it
if type fdfind &> /dev/null ; then if type fdfind &> /dev/null ; then
export FZF_DEFAULT_COMMAND='fdfind --type f' export FZF_DEFAULT_COMMAND='fdfind --type f'
@ -67,3 +72,4 @@ fi
export PNPM_HOME="$HOME/.local/share/pnpm" export PNPM_HOME="$HOME/.local/share/pnpm"
export PATH="$PNPM_HOME:$PATH" export PATH="$PNPM_HOME:$PATH"
if [ -e /home/jim/.nix-profile/etc/profile.d/nix.sh ]; then . /home/jim/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

View File

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
@ -8,7 +9,6 @@
programs.zsh.enable = true; programs.zsh.enable = true;
home.packages = [ home.packages = [
pkgs.neovim
pkgs.zsh pkgs.zsh
pkgs.direnv pkgs.direnv
@ -27,17 +27,36 @@
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz;
}))
];
programs.neovim = {
enable = true;
package = pkgs.neovim-nightly;
};
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
home.username = "jim"; home.username = "jim";
home.homeDirectory = "/home/jim"; home.homeDirectory = "/home/jim";
xdg.configFile."nvim/init.lua".source = ./init.lua; home.file = {
home.file.".zshrc".source = ./.zshrc; ".zshrc".source = ./.zshrc;
home.file.".bashrc".source = ./.bashrc; ".bashrc".source = ./.bashrc;
home.file.".p10k.zsh".source = ./.p10k.zsh; ".p10k.zsh".source = ./.p10k.zsh;
home.file.".tmux.conf".source = ./.tmux.conf; ".tmux.conf".source = ./.tmux.conf;
home.file.".dircolors".source = ./.dircolors; ".dircolors".source = ./.dircolors;
# ".local/share/nvim/site/pack/paqs/start/paq-nvim".source = pkgs.fetchzip {
# url = "https://github.com/savq/paq-nvim/archive/refs/heads/master.zip";
# };
};
xdg.configFile = {
"nvim/init.lua".source = ./init.lua;
};
# This value determines the Home Manager release that your # This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage # configuration is compatible with. This helps avoid breakage

View File

@ -7,7 +7,7 @@ local cmd = vim.cmd
require("install-paq") require("install-paq")
local paq = require("paq") local paq = require("paq")
paq:setup { paq:setup ({verbose = true}) {
"savq/paq-nvim", -- Let Paq manage itself "savq/paq-nvim", -- Let Paq manage itself
-- General Helper Function -- General Helper Function
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
@ -26,6 +26,7 @@ paq:setup {
"junegunn/fzf", "junegunn/fzf",
"nvim-lua/popup.nvim", "nvim-lua/popup.nvim",
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
"windwp/nvim-autopairs",
-- For better git support -- For better git support
"tpope/vim-fugitive", "tpope/vim-fugitive",
-- Postman like featuresi -- Postman like featuresi
@ -55,7 +56,7 @@ paq:setup {
if u.has_plugin("cmp") then if u.has_plugin("cmp") then
-- Global options -- Global options
o.number = true o.number = true
o.tabstop = 8 o.tabstop = 2
o.shiftwidth = 2 -- Indents will have a width of 4 o.shiftwidth = 2 -- Indents will have a width of 4
o.softtabstop = 2 -- Sets the number of columns for a TAB o.softtabstop = 2 -- Sets the number of columns for a TAB
o.expandtab = false -- Dont expand TABs to spaces o.expandtab = false -- Dont expand TABs to spaces
@ -140,6 +141,8 @@ if u.has_plugin("cmp") then
} }
} }
require'nvim-autopairs'.setup()
-- Treesitter config -- Treesitter config
local parser_configs = require("nvim-treesitter.parsers").get_parser_configs() local parser_configs = require("nvim-treesitter.parsers").get_parser_configs()
parser_configs.http = { parser_configs.http = {
@ -218,5 +221,7 @@ if u.has_plugin("cmp") then
else else
paq.install() paq.install()
u.ReloadConfig() paq.list()
print "Installed Packages"
-- u.ReloadConfig()
end end

1
configs/lua/lua Symbolic link
View File

@ -0,0 +1 @@
/home/jim/.dotfiles/configs/lua

View File

@ -105,6 +105,13 @@ if [ "$INST_ASDF" = true ]; then
[[ "$INST_RUST" = true ]] && asdfInstall rust [[ "$INST_RUST" = true ]] && asdfInstall rust
fi fi
echo "-- linking .dotfiles --"
linkFile .bashrc
linkFile .p10k.zsh
linkFile .dircolors
linkFile .tmux.conf
if [ "$INST_ZSH" = true ]; then if [ "$INST_ZSH" = true ]; then
echo "-- installing oh-my-zsh --" echo "-- installing oh-my-zsh --"
linkFile .zshrc linkFile .zshrc