Compare commits

..

No commits in common. "75f1accf4360c48be823be63f29003c02e05f47e" and "ed21a8221480967456f14acc4c0edbf5a4a5ad71" have entirely different histories.

2 changed files with 3 additions and 34 deletions

View File

@ -31,7 +31,6 @@
feh feh
file file
#freecad #freecad
fzf
#gnumake #gnumake
hack-font hack-font
jq jq
@ -43,12 +42,10 @@
#openscad #openscad
#pandoc #pandoc
pavucontrol pavucontrol
ripgrep
scli scli
scrot scrot
signal-desktop signal-desktop
sops sops
speedcrunch
spotify-tui spotify-tui
sxiv sxiv
#texlive.combined.scheme-full #texlive.combined.scheme-full
@ -164,19 +161,11 @@
set bs=2 " allow backspacing over everything in insert mode set bs=2 " allow backspacing over everything in insert mode
set ai " always set autoindenting on set ai " always set autoindenting on
set number relativenumber
set colorcolumn=100
''; '';
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
#context-vim ctrlp
#ctrlp gundo
#fzf
#gundo
python-mode python-mode
#telescope-nvim
#telescope-fzf-native-nvim
#nvim-treesitter
vim-nix vim-nix
]; ];
vimAlias = true; vimAlias = true;
@ -220,7 +209,6 @@
}; };
sessionVariables = { sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
FZF_DEFAULT_OPTS = "--layout=reverse --inline-info --height=40% --border";
}; };
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
@ -229,27 +217,12 @@
"git" "git"
"sudo" "sudo"
"vi-mode" "vi-mode"
"fzf"
]; ];
theme = "michelebologna"; # nice clean theme that shows jobs theme = "michelebologna"; # nice clean theme that shows jobs
}; };
# michelebologna theme doesn't have an RPROMPT, but I like the one from the clean theme
initExtra = '' initExtra = ''
# michelebologna theme doesn't have an RPROMPT, but I like the one from
# the clean theme
RPROMPT='[%*]' RPROMPT='[%*]'
# wrap the fzf command with some killable helpers
function vif() {
local fname
fname=$(fzf) || return
vim "$fname"
}
function fcd() {
local dirname
dirname=$(find -type d | fzf) || return
cd "$dirname"
}
''; '';
}; };
}; };

View File

@ -37,10 +37,6 @@ myConfig = def
-- launch programs -- launch programs
("M-'", spawn "qutebrowser") ("M-'", spawn "qutebrowser")
, ("M-s", spawn "scrot -s") , ("M-s", spawn "scrot -s")
-- xrandr commands for when (dis)connecting from external monitor
-- I have temporarily given up on using autorandr fo rthis
, ("M-x", spawn "xrandr --output DP-1 --auto --output eDP-1 --off") -- external
, ("M-c", spawn "xrandr --output eDP-1 --auto --output DP-1 --off") -- laptop only
-- cycle windows within a workspace -- cycle windows within a workspace
, ("M-a", rotAllUp) , ("M-a", rotAllUp)
, ("M-f", rotAllDown) , ("M-f", rotAllDown)