formatting

This commit is contained in:
Rouven Seifert 2022-12-19 18:01:40 +01:00
parent d0eb57ed91
commit b135818747
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
5 changed files with 254 additions and 249 deletions

View file

@ -6,11 +6,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1671335968, "lastModified": 1671459164,
"narHash": "sha256-V7mjlh7brp70elokmml6XzHinpTilkQJjiYIGjEmSGs=", "narHash": "sha256-RbkDnvLV7WjbiF4Dpiezrf8kXxwieQXAVtY8ciRQj6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "37713c6b04b963d41664e03576f73a18c9b0d224", "rev": "e7eba9cc46547ae86642ad3c6a9a4fb22c07bc26",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
@ -14,12 +15,14 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/8633a706-bf54-4d29-9fba-dbcffd723ab6"; {
device = "/dev/disk/by-uuid/8633a706-bf54-4d29-9fba-dbcffd723ab6";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/3A2E-1AB6"; {
device = "/dev/disk/by-uuid/3A2E-1AB6";
fsType = "vfat"; fsType = "vfat";
}; };

View file

@ -1,5 +1,5 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
home.packages = with pkgs; [ alacritty ]; home.packages = with pkgs; [ alacritty ];
home.file.".config/alacritty/alacritty.yml".source = ./alacritty.yml; home.file.".config/alacritty/alacritty.yml".source = ./alacritty.yml;
} }

View file

@ -1,281 +1,283 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports =
[ [
./vifm ./vifm
./alacritty ./alacritty
]; ];
home.username = "rouven"; home.username = "rouven";
home.homeDirectory = "/home/rouven"; home.homeDirectory = "/home/rouven";
home.packages = with pkgs; [ home.packages = with pkgs; [
# essentials # essentials
alacritty alacritty
networkmanagerapplet networkmanagerapplet
pcmanfm pcmanfm
# vifm # vifm
xsel xsel
lightlocker lightlocker
vlc vlc
# graphics # graphics
lxappearance lxappearance
feh feh
flameshot flameshot
picom picom
okular okular
gimp gimp
# editing # editing
fzf fzf
powerline-fonts powerline-fonts
# sound # sound
pavucontrol pavucontrol
# bluetooth # bluetooth
blueman blueman
# internet # internet
thunderbird thunderbird
discord discord
google-chrome google-chrome
nextcloud-client nextcloud-client
zoom-us zoom-us
# messaging # messaging
tdesktop tdesktop
element-desktop element-desktop
whatsapp-for-linux whatsapp-for-linux
# games # games
minecraft minecraft
superTuxKart superTuxKart
extremetuxracer extremetuxracer
wine wine
# yubikey and password stuff # yubikey and password stuff
yubikey-manager yubikey-manager
yubikey-manager-qt yubikey-manager-qt
yubioath-desktop yubioath-desktop
pass pass
# misc # misc
fzf fzf
neofetch neofetch
trash-cli trash-cli
spotify spotify
plover.dev plover.dev
nixpkgs-fmt nixpkgs-fmt
virt-manager virt-manager
# libs # libs
libyubikey libyubikey
libfido2 libfido2
];
# programs.light.enable = true; # display brightness manager
# programs.kdeconnect.enable = true;
programs.git = {
enable = true;
userName = "Rouven Seifert";
userEmail = "rouven@rfive.de";
extraConfig = {
user.signingkey = "B95E8FE6B11C4D09";
pull.rebase = false;
init.defaultBranch = "main";
commit.gpgsign = true;
};
};
programs.zsh = {
enable = true;
shellAliases = {
rm = "trash";
vifm = "vifm .";
};
history = {
size = 10000;
path = "${config.xdg.dataHome}/zsh/history";
};
oh-my-zsh = {
enable = true;
# plugins = [ "zsh-autosuggestions" "fzf-tab" ];
theme = "agnoster";
};
plugins = [
{
name = "zsh-autosuggestions";
src = pkgs.fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-autosuggestions";
rev = "v0.7.0";
sha256 = "KLUYpUu4DHRumQZ3w59m9aTW6TBKMCXl2UcKi4uMd7w=";
};
}
{
name = "fzf-tab";
src = pkgs.fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";
rev = "14f66e4d3d0b366552c0412eb08ca9e0f7c797bd";
sha256 = "YkfHPSuSKParz7JidR924CJSuXO6Rk0RZTlxPOBwLJk=";
};
}
]; ];
# programs.light.enable = true; # display brightness manager localVariables = {
# programs.kdeconnect.enable = true; COMPLETION_WAITING_DOTS = "true";
programs.git = { ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#00bbbb,bold";
enable = true; # ZSH_AUTOSUGGEST_STRATEGY="(history completion)";
userName = "Rouven Seifert";
userEmail = "rouven@rfive.de";
extraConfig = {
user.signingkey = "B95E8FE6B11C4D09";
pull.rebase = false;
init.defaultBranch = "main";
commit.gpgsign = true;
};
}; };
programs.zsh = { initExtra =
enable = true; ''
shellAliases = { function c() {
rm = "trash"; cd
vifm = "vifm ."; if [ $# -eq 0 ]; then
}; cd $(find -maxdepth 4 -not -path '*[cC]ache*' -not -path '*[tT]rash*' -type d | fzf --preview 'tree -C {}')
history = { else
size = 10000; $1 $(find -maxdepth 5 -not -path '*[cC]ache*' -not -path '*[tT]rash*' | fzf --preview 'tree -C {}')
path = "${config.xdg.dataHome}/zsh/history"; fi
}; }
oh-my-zsh = { function sn() {
enable = true; nmcli connection up $(nmcli connection show | tail -n +2 | cut -d " " -f1 | fzf --preview 'nmcli connection show {}')
# plugins = [ "zsh-autosuggestions" "fzf-tab" ]; }
theme="agnoster";
};
plugins = [ prompt_dir() {
{ prompt_segment blue $CURRENT_FG '%c'
name = "zsh-autosuggestions"; }
src = pkgs.fetchFromGitHub { '';
owner = "zsh-users"; };
repo = "zsh-autosuggestions";
rev = "v0.7.0";
sha256 = "KLUYpUu4DHRumQZ3w59m9aTW6TBKMCXl2UcKi4uMd7w=";
};
}
{
name = "fzf-tab";
src = pkgs.fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";
rev = "14f66e4d3d0b366552c0412eb08ca9e0f7c797bd";
sha256 = "YkfHPSuSKParz7JidR924CJSuXO6Rk0RZTlxPOBwLJk=";
};
}
];
localVariables = { programs.tmux = {
COMPLETION_WAITING_DOTS="true"; enable = true;
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#00bbbb,bold"; keyMode = "vi";
# ZSH_AUTOSUGGEST_STRATEGY="(history completion)"; terminal = "tmux-256color";
}; clock24 = true;
extraConfig =
initExtra = ''
'' set -g default-shell /etc/profiles/per-user/rouven/bin/zsh
function c() { bind P display-popup
cd '';
if [ $# -eq 0 ]; then plugins = with pkgs.tmuxPlugins; [
cd $(find -maxdepth 4 -not -path '*[cC]ache*' -not -path '*[tT]rash*' -type d | fzf --preview 'tree -C {}') {
else plugin = dracula;
$1 $(find -maxdepth 5 -not -path '*[cC]ache*' -not -path '*[tT]rash*' | fzf --preview 'tree -C {}') extraConfig = ''
fi set -g @dracula-show-fahrenheit false
} set -g @dracula-plugins "weather time"
set -g @dracula-show-left-icon session
function sn() { set -g @dracula-show-powerline true
nmcli connection up $(nmcli connection show | tail -n +2 | cut -d " " -f1 | fzf --preview 'nmcli connection show {}')
}
prompt_dir() {
prompt_segment blue $CURRENT_FG '%c'
}
''; '';
}; }
];
};
programs.tmux = { programs.neovim = {
enable = true; enable = true;
keyMode = "vi"; # defaultEditor = true; why the hell doesn't this work :(
terminal = "tmux-256color"; # vimAlias = true;
clock24 = true; plugins = with pkgs.vimPlugins; [
extraConfig = nerdtree
'' nerdcommenter
set -g default-shell /etc/profiles/per-user/rouven/bin/zsh fugitive-gitlab-vim
bind P display-popup vim-repeat
''; vim-airline
plugins = with pkgs.tmuxPlugins; [ fzf-vim
{ dracula-vim
plugin = dracula; vim-nix # this destroys my tab settings, ffs
extraConfig = '' ];
set -g @dracula-show-fahrenheit false extraConfig =
set -g @dracula-plugins "weather time" ''
set -g @dracula-show-left-icon session " basic commands bound to uppercase key
set -g @dracula-show-powerline true command Q q
''; command W w
} command Wq wq
]; command WQ wq
};
programs.neovim = { set shiftwidth=4
enable = true; set noexpandtab
# defaultEditor = true; why the hell doesn't this work :( set preserveindent
# vimAlias = true; set number relativenumber
plugins = with pkgs.vimPlugins; [ set tabstop=4
nerdtree set smartcase
nerdcommenter set colorcolumn=120
fugitive-gitlab-vim set nowrap
vim-repeat vim-airline highlight ColorColumn ctermbg=darkgray
fzf-vim dracula-vim
vim-nix # this destroys my tab settings, ffs
];
extraConfig =
''
" basic commands bound to uppercase key
command Q q
command W w
command Wq wq
command WQ wq
set shiftwidth=4
set noexpandtab
set preserveindent
set number relativenumber
set tabstop=4
set smartcase
set colorcolumn=120
set nowrap
highlight ColorColumn ctermbg=darkgray
" beautify indents " beautify indents
:set list lcs=tab:\|\ :set list lcs=tab:\|\
nnoremap ; : nnoremap ; :
nnoremap : ; nnoremap : ;
vnoremap ; : vnoremap ; :
vnoremap : ; vnoremap : ;
" set space as leader " set space as leader
nnoremap <SPACE> <Nop> nnoremap <SPACE> <Nop>
let mapleader = " " let mapleader = " "
" air-line " air-line
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
" NERDTree " NERDTree
nnoremap <leader>n :NERDTreeFocus<CR> :NERDTreeRefreshRoot<CR> nnoremap <leader>n :NERDTreeFocus<CR> :NERDTreeRefreshRoot<CR>
" NERDTree autostart" " NERDTree autostart"
autocmd VimEnter * NERDTree | wincmd p autocmd VimEnter * NERDTree | wincmd p
" Close the tab if NERDTree is the only window remaining in it. " Close the tab if NERDTree is the only window remaining in it.
autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
"remove ex-mode shortcut "remove ex-mode shortcut
nmap Q <Nop> nmap Q <Nop>
" trigger the fuzzy finder (fzf) " trigger the fuzzy finder (fzf)
nnoremap <leader>f :Files<CR> nnoremap <leader>f :Files<CR>
nnoremap <leader>g :GFiles<CR> nnoremap <leader>g :GFiles<CR>
nnoremap <leader>b :Buffers<CR> nnoremap <leader>b :Buffers<CR>
nnoremap <leader>r :Rg<CR> nnoremap <leader>r :Rg<CR>
" keybinds for coc " keybinds for coc
nnoremap <leader>d :CocDiagnostics<CR> nnoremap <leader>d :CocDiagnostics<CR>
" quickfixlist binds " quickfixlist binds
nnoremap <C-j> :cnext<CR> nnoremap <C-j> :cnext<CR>
nnoremap <C-k> :cprev<CR> nnoremap <C-k> :cprev<CR>
" locallist binds " locallist binds
nnoremap <C-l> :lnext<CR> nnoremap <C-l> :lnext<CR>
nnoremap <C-h> :lprev<CR> nnoremap <C-h> :lprev<CR>
" split keybinds " split keybinds
nnoremap <leader>s :sp<CR> nnoremap <leader>s :sp<CR>
nnoremap <leader>v :vs<CR> nnoremap <leader>v :vs<CR>
nnoremap <leader>h <C-w>h nnoremap <leader>h <C-w>h
nnoremap <leader>j <C-w>j nnoremap <leader>j <C-w>j
nnoremap <leader>k <C-w>k nnoremap <leader>k <C-w>k
nnoremap <leader>l <C-w>l nnoremap <leader>l <C-w>l
" coloring stuff " coloring stuff
let g:dracula_colorterm = 0 let g:dracula_colorterm = 0
colorscheme dracula colorscheme dracula
" better autocompletion menu colors " better autocompletion menu colors
highlight Pmenu ctermbg=darkgray ctermfg=black highlight Pmenu ctermbg=darkgray ctermfg=black
highlight PmenuSel ctermbg=gray ctermfg=black highlight PmenuSel ctermbg=gray ctermfg=black
''; '';
}; };
services.picom = { services.picom = {
enable = true; enable = true;
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }

View file

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
home.packages = with pkgs; [ vifm ]; home.packages = with pkgs; [ vifm ];
home.file.".config/vifm/vifmrc".source = ./vifmrc; home.file.".config/vifm/vifmrc".source = ./vifmrc;
home.file.".config/vifm/colors/dracula.vifm".source = ./dracula.vifm; home.file.".config/vifm/colors/dracula.vifm".source = ./dracula.vifm;
} }