iofq/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

split neovim config

Browse source
This commit is contained in:
iofq 2023-05-14 13:06:56 -05:00
parent 8fb6118bcd
commit 5df8317a4a
19 changed files with 239 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/programs/2fa/default.nix
View file

@ -28,7 +28,4 @@
enable = true;
pinentryFlavor = "curses";
};
home.packages = with pkgs; [
oath-toolkit
];
}

3
modules/programs/default.nix
View file

@ -1,6 +1,7 @@
[
./dev.nix
./alacritty
./nvim
#./nvim
./shell
./git
./2fa

10
modules/programs/dev.nix Normal file
View file

@ -0,0 +1,10 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
ripgrep
fluxcd
k9s
kubectl
python3
];
}

82
modules/programs/nvim/default.nix
View file

@ -1,44 +1,44 @@
{ pkgs, ...}:
{
xdg.configFile.nvim = {
source = ../../../config/nvim;
recursive = true;
};
programs.neovim = {
enable = true;
defaultEditor = true;
vimAlias = true;
vimdiffAlias = true;
extraConfig = ":luafile ~/.config/nvim/lua/init.lua";
xdg.configFile.nvim = {
source = ../../../config/nvim;
recursive = true;
};
programs.neovim = {
enable = true;
defaultEditor = true;
vimAlias = true;
vimdiffAlias = true;
extraConfig = ":luafile ~/.config/nvim/lua/init.lua";
plugins = with pkgs.vimPlugins; [
vim-commentary
vim-surround
toggleterm-nvim
targets-vim
indent-blankline-nvim
vim-go
vim-nix
(nvim-treesitter.withPlugins
(
plugins: with plugins; [
tree-sitter-bash
tree-sitter-c
tree-sitter-dockerfile
tree-sitter-go
tree-sitter-javascript
tree-sitter-json
tree-sitter-lua
tree-sitter-nix
tree-sitter-php
tree-sitter-python
tree-sitter-yaml
]
)
)
nvim-treesitter-textobjects
leap-nvim
telescope-nvim
];
};
}
plugins = with pkgs.vimPlugins; [
vim-commentary
vim-surround
toggleterm-nvim
targets-vim
indent-blankline-nvim
vim-go
vim-nix
(nvim-treesitter.withPlugins
(
plugins: with plugins; [
tree-sitter-bash
tree-sitter-c
tree-sitter-dockerfile
tree-sitter-go
tree-sitter-javascript
tree-sitter-json
tree-sitter-lua
tree-sitter-nix
tree-sitter-php
tree-sitter-python
tree-sitter-yaml
]
)
)
nvim-treesitter-textobjects
leap-nvim
telescope-nvim
];
};
}

8
modules/programs/shell/default.nix
View file

@ -1,4 +1,4 @@
{ homeDirectory, pkgs, ...}:
{ pkgs, host, ...}:
{
imports = [
(import ./tmux.nix)
@ -19,9 +19,8 @@
":q" = "exit";
mpv = "mpv --no-keepaspect-window";
sus = "systemctl suspend";
gitu = "git add . && git commit && git push";
rcp = "rsync -avh --progress";
hms = "home-manager switch --flake $NIX_FLAKE#${host.username}";
rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}";
};
shellOptions = [
"cmdhist"
@ -39,6 +38,7 @@
export MANPAGER="nvim +Man!"
export EDITOR="nvim"
export _JAVA_AWT_WM_NONREPARENTING=1
export NIX_FLAKE="/home/e/dev/nix"
[[ $- != *i* ]] && return
function exists {
type $1 >/dev/null 2>&1

8
modules/wayland/default.nix
View file

@ -130,10 +130,6 @@
};
};
};
extraConfig=''
bindswitch lid:on output eDP-1 disable
bindswitch lid:off output eDP-1 enable
'';
};
programs.i3status = {
enable = true;
@ -202,11 +198,11 @@
events = [
{ event = "lock"; command = "${pkgs.swaylock}/bin/swaylock";}
{ event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock";}
{ event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg \"output * power on\"";}
{ event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg \"output * toggle\"";}
];
timeouts = [
{ timeout = 600; command = "${pkgs.swaylock}/bin/swaylock";}
{ timeout = 1200; command = "${pkgs.sway}/bin/swaymsg \"output * power off\"";}
{ timeout = 1200; command = "${pkgs.sway}/bin/swaymsg \"output * toggle\"";}
];
};
services.kanshi = {