kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
Code Releases Activity

add passmenu, vim shortcuts

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-04-02 23:24:31 +02:00
parent d31b3b6867
commit 9413ddffe0
6 changed files with 113 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
dot/i3.nix
View File

@@ -54,20 +54,20 @@ rec {
childBorder = colorScheme.green.light;
};
};
bars = [{
workspaceButtons = false;
fonts = [ "${terminalFont.name} ${toString terminalFont.size}" ];
mode = "hide";
colors = {
background = colorScheme.background;
separator = colorScheme.background;
statusline = colorScheme.foreground;
bindingMode = {
background = colorScheme.red.light;
border = colorScheme.background;
text = colorScheme.foreground;
bars = [{
workspaceButtons = false;
fonts = [ "${terminalFont.name} ${toString terminalFont.size}" ];
mode = "hide";
colors = {
background = colorScheme.background;
separator = colorScheme.background;
statusline = colorScheme.foreground;
bindingMode = {
background = colorScheme.red.light;
border = colorScheme.background;
text = colorScheme.foreground;
};
};
};
# position = "top";
statusCommand =
let
@@ -136,41 +136,42 @@ rec {
in ''
${pkgs.i3status}/bin/i3status -c ${i3status-config}
'';
}];
keybindings = {
"${modifier}+Down" = "focus down";
"${modifier}+Left" = "focus left";
"${modifier}+Return" = "exec ${config.defaultApplications.terminal}";
"${modifier}+Right" = "focus right";
"${modifier}+Shift+Down" = "move down";
"${modifier}+Shift+Left" = "move left";
"${modifier}+Shift+Right" = "move right";
"${modifier}+Shift+Up" = "move up";
"${modifier}+Shift+c" = "reload";
"${modifier}+Shift+n" = "move window to workspace next";
"${modifier}+Shift+b" = "move window to workspace prev";
"${modifier}+Shift+q" = "kill";
"${modifier}+Shift+r" = "restart";
"${modifier}+Shift+w" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
"${modifier}+Shift+x" = "exec --no-startup-id ${move-to-new-workspace}";
"${modifier}+Shift+z" = "floating toggle";
"${modifier}+Up" = "focus up";
"${modifier}+a" = "exec ${pkgs.rofi}/bin/rofi -display-window — -show window";
"${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi -display-run — -show run";
"${modifier}+e" = "layout toggle split";
"${modifier}+f" = "fullscreen toggle";
"${modifier}+h" = "split h";
"${modifier}+n" = "workspace next";
"${modifier}+b" = "workspace prev";
"${modifier}+r" = "mode resize";
"${modifier}+s" = "layout stacking";
"${modifier}+t" = "exec ${config.defaultApplications.fileManager}";
"${modifier}+v" = "split v";
"${modifier}+w" = "layout tabbed";
"${modifier}+x" = "exec --no-startup-id ${new-workspace}";
"${modifier}+y" = "exec ${config.defaultApplications.browser}";
"XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5 && pkill -RTMIN+3 i3blocks";
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t && pkill -RTMIN+3 i3blocks";
"XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5 && pkill -RTMIN+3 i3blocks";
};
}
}];
keybindings = {
"${modifier}+Down" = "focus down";
"${modifier}+Left" = "focus left";
"${modifier}+Return" = "exec ${config.defaultApplications.terminal}";
"${modifier}+Right" = "focus right";
"${modifier}+Shift+Down" = "move down";
"${modifier}+Shift+Left" = "move left";
"${modifier}+Shift+Right" = "move right";
"${modifier}+Shift+Up" = "move up";
"${modifier}+Shift+c" = "reload";
"${modifier}+Shift+n" = "move window to workspace next";
"${modifier}+Shift+b" = "move window to workspace prev";
"${modifier}+Shift+q" = "kill";
"${modifier}+Shift+r" = "restart";
"${modifier}+Shift+w" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
"${modifier}+Shift+x" = "exec --no-startup-id ${move-to-new-workspace}";
"${modifier}+Shift+z" = "floating toggle";
"${modifier}+Up" = "focus up";
"${modifier}+a" = "exec ${pkgs.rofi}/bin/rofi -display-window — -show window";
"${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi -display-run — -show run";
"${modifier}+e" = "layout toggle split";
"${modifier}+f" = "fullscreen toggle";
"${modifier}+h" = "split h";
"${modifier}+n" = "workspace next";
"${modifier}+b" = "workspace prev";
"${modifier}+p" = "exec ${pkgs.rofi-pass}/bin/rofi-pass";
"${modifier}+r" = "mode resize";
"${modifier}+s" = "layout stacking";
"${modifier}+t" = "exec ${config.defaultApplications.fileManager}";
"${modifier}+v" = "split v";
"${modifier}+w" = "layout tabbed";
"${modifier}+x" = "exec --no-startup-id ${new-workspace}";
"${modifier}+y" = "exec ${config.defaultApplications.browser}";
"XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5 && pkill -RTMIN+3 i3blocks";
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t && pkill -RTMIN+3 i3blocks";
"XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5 && pkill -RTMIN+3 i3blocks";
};
}

22
dot/vimrc
View File

@@ -11,6 +11,21 @@ colorscheme delek
let mapleader = ","
" let maplocalleader="\\"
noremap <Leader>h :<C-u>split<CR>
noremap <Leader>v :<C-u>vsplit<CR>
noremap <Leader>gs :Gstatus<CR>
noremap <Leader>gc :Gcommit<CR>
noremap <leader>n :bn<CR>
noremap <leader>p :bp<CR>
noremap <leader>c :bd<CR>
" reindent whole file
noremap <leader>i mzgg=G`z
nnoremap <Leader>a <Plug>(ale_hover)
nnoremap <Leader>d <Plug>(ale_go_to_definition_in_tab)
nnoremap <Leader>rf <Plug>(ale_find_references)
filetype plugin indent on
set title
set nocompatible
@@ -93,7 +108,7 @@ if has("autocmd")
autocmd bufnewfile,bufread *.h set keywordprg=man\ 3
autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix
autocmd bufnewfile,bufread *.rust packadd rust-vim | packadd deoplete-rust
autocmd bufnewfile,bufread *.csv packadd csv-vim
autocmd bufnewfile,bufread *.csv packadd csv-vim | set filetype=csv
autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
autocmd bufnewfile,bufread *.ts packadd vim-typescript
autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
@@ -102,7 +117,6 @@ if has("autocmd")
autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall
autocmd filetype haskell packadd haskell-vim
autocmd filetype javascript packadd vim-javascript
autocmd filetype python packadd deoplete-jedi
autocmd filetype make setlocal noexpandtab
autocmd filetype html packadd emmet-vim
autocmd bufreadpost *
@@ -137,11 +151,14 @@ let g:haskell_enable_pattern_synonyms = 1
" if exists("g:loaded_ale")
let g:ale_linters = {
\ 'rust': ['cargo'],
\ 'css': ['csslint'],
\ 'haskell': ['ghc', 'cabal-ghc', 'hlint'],
\ 'html': ['tidy', 'proselint'],
\ 'latex': ['lacheck', 'chktex', 'proselint'],
\ 'pandoc': ['proselint'],
\ 'ruby': ['rubocop'],
\ 'json': ['jsonlint'],
\ 'python': ['pyls'],
\}
let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'],
@@ -151,7 +168,6 @@ let g:ale_fixers = {
\ 'css': ['prettier'],
\ 'html': ['prettier'],
\ 'markdown': ['prettier'],
\ 'pandoc': ['prettier'],
\ 'json': ['jq'],
\ 'python': ['black'],
\ 'rust': ['rustfmt']