mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2025-06-21 04:08:20 +02:00
Made screenshots better & Switching To Neovim
This commit is contained in:
Tyler Kelley
parent
9eaf3e6faa
commit
ae4c00a20a
@ -12,7 +12,6 @@
|
|||||||
./hyprland.nix
|
./hyprland.nix
|
||||||
./kitty.nix
|
./kitty.nix
|
||||||
./rofi.nix
|
./rofi.nix
|
||||||
./vim.nix
|
|
||||||
./bash.nix
|
./bash.nix
|
||||||
./gtk-qt.nix
|
./gtk-qt.nix
|
||||||
|
|
||||||
|
|||||||
@ -126,7 +126,7 @@ in with lib; {
|
|||||||
bind = ${modifier}SHIFT,S,exec,swaync-client -rs
|
bind = ${modifier}SHIFT,S,exec,swaync-client -rs
|
||||||
bind = ${modifier},W,exec,${browser}
|
bind = ${modifier},W,exec,${browser}
|
||||||
bind = ${modifier},E,exec,emopicker9000
|
bind = ${modifier},E,exec,emopicker9000
|
||||||
bind = ${modifier},S,exec,grim -g "$(slurp)"
|
bind = ${modifier},S,exec,grim -g "$(slurp)" - | swappy -f -
|
||||||
bind = ${modifier},D,exec,discord
|
bind = ${modifier},D,exec,discord
|
||||||
bind = ${modifier},O,exec,obs
|
bind = ${modifier},O,exec,obs
|
||||||
bind = ${modifier},G,exec,gimp
|
bind = ${modifier},G,exec,gimp
|
||||||
|
|||||||
@ -1,183 +0,0 @@
|
|||||||
{ pkgs, config, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
palette = config.colorScheme.palette;
|
|
||||||
in {
|
|
||||||
home.file.".vimrc".text = ''
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" => Automatically install vim-plug node & language servers
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
|
|
||||||
if empty(glob(data_dir . '/autoload/plug.vim'))
|
|
||||||
silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
|
|
||||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
|
||||||
autocmd VimEnter * CocInstall coc-sh coc-clangd coc-html coc-tsserver coc-json coc-pyright coc-go coc-css coc-rust-analyzer
|
|
||||||
endif
|
|
||||||
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" => Plugins
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
call plug#begin('~/.vim/plugged')
|
|
||||||
Plug 'scrooloose/nerdtree' " Nerdtree
|
|
||||||
Plug 'ryanoasis/vim-devicons' " Icons for Nerdtree
|
|
||||||
Plug 'tpope/vim-surround' " Change surrounding marks
|
|
||||||
Plug 'PotatoesMaster/i3-vim-syntax' " i3 config highlighting
|
|
||||||
Plug 'kovetskiy/sxhkd-vim' " sxhkd highlighting
|
|
||||||
Plug 'vim-python/python-syntax' " Python highlighting
|
|
||||||
Plug 'ap/vim-css-color' " Color previews for CSS
|
|
||||||
Plug 'junegunn/vim-emoji' " Vim needs emojis!
|
|
||||||
Plug 'https://github.com/tpope/vim-commentary' " Comment Out With gcc & Uncomment With gcgc
|
|
||||||
Plug 'neoclide/coc.nvim', {'branch': 'release'} " Code Completion (requires node)
|
|
||||||
Plug 'LnL7/vim-nix' " Nix highlighting and detection
|
|
||||||
Plug 'suan/vim-instant-markdown', {'rtp': 'after'} " Markdown Preview
|
|
||||||
call plug#end()
|
|
||||||
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" => General Settings
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
set path+=** " Searches current directory recursively.
|
|
||||||
set wildmenu " Display all matches when tab complete.
|
|
||||||
set incsearch " Incremental search
|
|
||||||
set hidden " Needed to keep multiple buffers open
|
|
||||||
set nobackup " No auto backups
|
|
||||||
set noswapfile " No swap
|
|
||||||
set t_Co=256 " Set if term supports 256 colors.
|
|
||||||
set number " Display line numbers
|
|
||||||
set clipboard=unnamedplus " Copy/paste between vim and other programs.
|
|
||||||
syntax enable " Enable syntax highlighting
|
|
||||||
set nocompatible " Be iMproved, required
|
|
||||||
filetype plugin indent on " Required
|
|
||||||
set mouse=a " Required
|
|
||||||
set encoding=UTF-8 " Set encoding
|
|
||||||
let NERDTreeShowHidden=1 " NERDtree shows hidden files
|
|
||||||
set term=kitty " fix for kitty terminal
|
|
||||||
set termguicolors
|
|
||||||
|
|
||||||
" Theme System & Ensure Transparency works
|
|
||||||
hi Normal guibg=NONE ctermbg=NONE
|
|
||||||
:source $HOME/.vimcolors.vim
|
|
||||||
|
|
||||||
" Markdown Stuffs
|
|
||||||
au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown
|
|
||||||
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" => Text, tab and indent related
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
set expandtab " Use spaces instead of tabs.
|
|
||||||
set smarttab " Be smart using tabs ;)
|
|
||||||
set shiftwidth=4 " One tab == four spaces.
|
|
||||||
set tabstop=4 " One tab == four spaces.
|
|
||||||
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" => Remap Keys
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" Remap ESC to ii
|
|
||||||
:imap ii <Esc>
|
|
||||||
" Ctrl + f opens and closes NERDtree
|
|
||||||
nnoremap <C-f> :NERDTreeToggle<CR>
|
|
||||||
" Enter selects completion
|
|
||||||
inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm() : "\<CR>"
|
|
||||||
" Use Tab to trigger completion and navigate to the next complete item
|
|
||||||
function! CheckBackspace() abort
|
|
||||||
let col = col('.') - 1
|
|
||||||
return !col || getline('.')[col - 1] =~# '\s'
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
inoremap <silent><expr> <Tab>
|
|
||||||
\ coc#pum#visible() ? coc#pum#next(1) :
|
|
||||||
\ CheckBackspace() ? "\<Tab>" :
|
|
||||||
\ coc#refresh()
|
|
||||||
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" => Status Line
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" Always show statusline
|
|
||||||
set laststatus=2
|
|
||||||
" Uncomment to prevent non-normal modes showing in powerline and below powerline.
|
|
||||||
set noshowmode
|
|
||||||
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
" => Lines to save text folding
|
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
|
||||||
autocmd BufWinLeave *.* mkview
|
|
||||||
autocmd BufWinEnter *.* silent loadview
|
|
||||||
'';
|
|
||||||
|
|
||||||
home.file.".vimcolors.vim".text = ''
|
|
||||||
hi clear
|
|
||||||
syntax reset
|
|
||||||
let g:colors_name = "sunset"
|
|
||||||
set background=dark
|
|
||||||
set t_Co=256
|
|
||||||
hi Normal guifg=#${palette.base05} ctermbg=NONE guibg=NONE gui=NONE
|
|
||||||
|
|
||||||
hi DiffText guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi ErrorMsg guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi WarningMsg guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi PreProc guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi Exception guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi Error guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi DiffDelete guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi GitGutterDelete guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi GitGutterChangeDelete guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi cssIdentifier guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi cssImportant guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi Type guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi Identifier guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi PMenuSel guifg=#${palette.base0B} guibg=NONE
|
|
||||||
hi Constant guifg=#${palette.base0B} guibg=NONE
|
|
||||||
hi Repeat guifg=#${palette.base0B} guibg=NONE
|
|
||||||
hi DiffAdd guifg=#${palette.base0B} guibg=NONE
|
|
||||||
hi GitGutterAdd guifg=#${palette.base0B} guibg=NONE
|
|
||||||
hi cssIncludeKeyword guifg=#${palette.base0B} guibg=NONE
|
|
||||||
hi Keyword guifg=#${palette.base0B} guibg=NONE
|
|
||||||
hi IncSearch guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Title guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi PreCondit guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Debug guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi SpecialChar guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Conditional guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Todo guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Special guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Label guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Delimiter guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Number guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi CursorLineNR guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Define guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi MoreMsg guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Tag guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi String guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi MatchParen guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Macro guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi DiffChange guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi GitGutterChange guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi cssColor guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Function guifg=#${palette.base08} guibg=NONE
|
|
||||||
hi Directory guifg=#${palette.base09} guibg=NONE
|
|
||||||
hi markdownLinkText guifg=#${palette.base09} guibg=NONE
|
|
||||||
hi javaScriptBoolean guifg=#${palette.base09} guibg=NONE
|
|
||||||
hi Include guifg=#${palette.base09} guibg=NONE
|
|
||||||
hi Storage guifg=#${palette.base09} guibg=NONE
|
|
||||||
hi cssClassName guifg=#${palette.base09} guibg=NONE
|
|
||||||
hi cssClassNameDot guifg=#${palette.base09} guibg=NONE
|
|
||||||
hi Statement guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi Operator guifg=#${palette.base0C} guibg=NONE
|
|
||||||
hi cssAttr guifg=#${palette.base0C} guibg=NONE
|
|
||||||
|
|
||||||
|
|
||||||
hi Pmenu guifg=#${palette.base05} guibg=#${palette.base0D}
|
|
||||||
hi Title guifg=#${palette.base05}
|
|
||||||
hi LineNr guifg=#${palette.base0A} guibg=NONE
|
|
||||||
hi NonText guifg=#${palette.base03} guibg=NONE
|
|
||||||
hi Comment guifg=#${palette.base03} gui=italic
|
|
||||||
hi SpecialComment guifg=#${palette.base03} gui=italic guibg=NONE
|
|
||||||
hi CursorLine guibg=#${palette.base0D}
|
|
||||||
hi TabLineFill gui=NONE guibg=#${palette.base00}
|
|
||||||
hi TabLine guifg=#${palette.base05} guibg=#${palette.base00} gui=NONE
|
|
||||||
hi StatusLine gui=bold guibg=#${palette.base0D} guifg=#${palette.base01}
|
|
||||||
hi StatusLineNC gui=NONE guibg=NONE guifg=#${palette.base05}
|
|
||||||
hi Search guibg=#${palette.base03} guifg=#${palette.base05}
|
|
||||||
hi VertSplit gui=NONE guifg=#${palette.base0D} guibg=NONE
|
|
||||||
hi Visual gui=NONE guibg=#${palette.base0D}
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@ -17,9 +17,16 @@ in {
|
|||||||
pkg-config meson hugo gnumake ninja go nodejs symbola
|
pkg-config meson hugo gnumake ninja go nodejs symbola
|
||||||
noto-fonts-color-emoji material-icons brightnessctl
|
noto-fonts-color-emoji material-icons brightnessctl
|
||||||
toybox virt-viewer jetbrains.pycharm-community-bin
|
toybox virt-viewer jetbrains.pycharm-community-bin
|
||||||
|
swappy
|
||||||
(pkgs.python3.withPackages my-python-packages)
|
(pkgs.python3.withPackages my-python-packages)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
programs.nixvim = {
|
||||||
|
enable = true;
|
||||||
|
colorschemes.gruvbox.enable = true;
|
||||||
|
plugins.lightline.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
programs.steam.gamescopeSession.enable = true;
|
programs.steam.gamescopeSession.enable = true;
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
|
|||||||
@ -6,6 +6,7 @@
|
|||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
|
inputs.nixvim.nixosModules.nixvim
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./config/system
|
./config/system
|
||||||
];
|
];
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user