Compare commits
5 Commits
5e9fb94bcb
...
testing
| Author | SHA1 | Date | |
|---|---|---|---|
| 58d6fba6cb | |||
| 450f48bc0a | |||
| b708a82046 | |||
| a3b6475c0c | |||
| 35fbb13b3d |
14
flake.lock
generated
14
flake.lock
generated
@@ -218,11 +218,11 @@
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1783347374,
|
||||
"narHash": "sha256-kdizmVOka0IACJaTeEgftxCeGxdwuT0ba1/9QPGDWgw=",
|
||||
"lastModified": 1790439891,
|
||||
"narHash": "sha256-muUR0v2/4NqyvRjIcya890SwlX3qVukepZV7CnmtgFs=",
|
||||
"owner": "voidarclabs",
|
||||
"repo": "gotify-desktop",
|
||||
"rev": "b4f62aab117238ce72c19809d19fcfee2b67f5d2",
|
||||
"rev": "f8fd3ca612611ae648bf7355399a3c8374488c25",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1041,11 +1041,11 @@
|
||||
"quickshell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1788373363,
|
||||
"narHash": "sha256-W/owdXl3Xj/wad7ZmW0M6MhWMRVE9LYeVkc86Gu+Dmk=",
|
||||
"lastModified": 1790440634,
|
||||
"narHash": "sha256-5kU5Ryam1gIyt7mfDqtHYk+bUYmuDh00HpeUGzZqz0k=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "b314fe10d21b96168c7bbcdf4b4e31e9a0f7a72b",
|
||||
"revCount": 92,
|
||||
"rev": "297f3fe688c8039262796e8b56c975d9398c2a12",
|
||||
"revCount": 93,
|
||||
"type": "git",
|
||||
"url": "https://git.voidarc.co.uk/voidarc/quickshell"
|
||||
},
|
||||
|
||||
151
modules/features/vim/cyberdream.vim
Normal file
151
modules/features/vim/cyberdream.vim
Normal file
@@ -0,0 +1,151 @@
|
||||
" cyberdream.vim - Cyberdream theme for Vim
|
||||
" Maintainer: 0l3d
|
||||
" Description: Cyberdream theme for Vim
|
||||
|
||||
highlight clear
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
let g:colors_name = "cyberdream"
|
||||
set termguicolors
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" Core UI
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight Normal guifg=#ffffff guibg=#16181a
|
||||
highlight NormalNC guifg=#ffffff guibg=#16181a
|
||||
highlight Cursor guifg=#16181a guibg=#ffffff
|
||||
highlight CursorLine guibg=#3c4048
|
||||
highlight CursorColumn guibg=#3c4048
|
||||
highlight CursorLineNr guifg=#7b8496
|
||||
highlight LineNr guifg=#7b8496
|
||||
highlight ColorColumn guibg=#3c4048
|
||||
highlight Visual guibg=#3c4048
|
||||
highlight VisualNOS guibg=#3c4048
|
||||
highlight MatchParen guifg=#ff5ea0 guibg=#3c4048
|
||||
highlight Search guifg=#1e2124 guibg=#ffffff
|
||||
highlight IncSearch guifg=#1e2124 guibg=#5ef1ff
|
||||
highlight CurSearch guifg=#1e2124 guibg=#5ef1ff
|
||||
highlight Directory guifg=#5ea1ff
|
||||
highlight VertSplit guifg=#3c4048 guibg=#16181a
|
||||
highlight WinSeparator guifg=#3c4048 guibg=#16181a
|
||||
highlight EndOfBuffer guifg=#7b8496
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" Popup / Float
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight NormalFloat guifg=#ffffff guibg=#16181a
|
||||
highlight FloatBorder guifg=#3c4048 guibg=#16181a
|
||||
highlight FloatTitle guifg=#5ef1ff guibg=#16181a
|
||||
|
||||
highlight Pmenu guifg=#ffffff guibg=#16181a
|
||||
highlight PmenuSel guifg=#ffffff guibg=#3c4048
|
||||
highlight PmenuSbar guifg=#16181a guibg=#3c4048
|
||||
highlight PmenuThumb guifg=#16181a guibg=#3c4048
|
||||
highlight PmenuMatch guifg=#5ef1ff guibg=#3c4048
|
||||
highlight PmenuMatchSel guifg=#5ef1ff guibg=#3c4048
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" Diff
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight DiffAdd guifg=#5eff6c guibg=#3c4048
|
||||
highlight DiffChange guifg=#5ea1ff guibg=#3c4048
|
||||
highlight DiffDelete guifg=#ff6e5e guibg=#3c4048
|
||||
highlight DiffText guifg=#ffbd5e guibg=#3c4048
|
||||
|
||||
highlight Added guifg=#5eff6c
|
||||
highlight Removed guifg=#ff6e5e
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" Diagnostics / LSP
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight DiagnosticError guifg=#ff6e5e
|
||||
highlight DiagnosticWarn guifg=#ffe95e
|
||||
highlight DiagnosticInfo guifg=#5ea1ff
|
||||
highlight DiagnosticHint guifg=#5ef1ff
|
||||
highlight DiagnosticUnnecessary guifg=#7b8496
|
||||
|
||||
highlight DiagnosticVirtualTextError guifg=#ff6e5e
|
||||
highlight DiagnosticVirtualTextWarn guifg=#ffe95e
|
||||
highlight DiagnosticVirtualTextInfo guifg=#5ea1ff
|
||||
highlight DiagnosticVirtualTextHint guifg=#5ef1ff
|
||||
|
||||
highlight DiagnosticUnderlineError gui=undercurl guisp=#ff6e5e
|
||||
highlight DiagnosticUnderlineWarn gui=undercurl guisp=#ffe95e
|
||||
highlight DiagnosticUnderlineInfo gui=undercurl guisp=#5ea1ff
|
||||
highlight DiagnosticUnderlineHint gui=undercurl guisp=#5ef1ff
|
||||
|
||||
highlight LspReferenceText guibg=#3c4048
|
||||
highlight LspReferenceRead guibg=#3c4048
|
||||
highlight LspReferenceWrite guibg=#3c4048
|
||||
highlight LspSignatureActiveParameter guifg=#ffbd5e
|
||||
highlight LspCodeLens guifg=#7b8496
|
||||
highlight LspInlayHint guifg=#7b8496
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" Syntax
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight Comment guifg=#7b8496 gui=italic
|
||||
highlight Constant guifg=#ffbd5e
|
||||
highlight String guifg=#5eff6c
|
||||
highlight Character guifg=#5eff6c
|
||||
highlight Boolean guifg=#ffbd5e
|
||||
highlight Number guifg=#ffbd5e
|
||||
|
||||
highlight Identifier guifg=#5ea1ff
|
||||
highlight Function guifg=#5ea1ff
|
||||
|
||||
highlight Statement guifg=#bd5eff
|
||||
highlight Operator guifg=#bd5eff
|
||||
highlight Keyword guifg=#ffbd5e
|
||||
highlight PreProc guifg=#bd5eff
|
||||
highlight Label guifg=#5ef1ff
|
||||
|
||||
highlight Type guifg=#ffe95e
|
||||
highlight Special guifg=#ff5ea0
|
||||
highlight Delimiter guifg=#ffffff
|
||||
|
||||
highlight Debug guifg=#ffbd5e
|
||||
|
||||
highlight Error guifg=#ff6e5e
|
||||
highlight Todo guifg=#bd5eff gui=bold
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" Markdown
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight markdownHeadingDelimiter guifg=#7b8496
|
||||
highlight markdownCode guifg=#5ef1ff
|
||||
highlight markdownCodeBlock guifg=#5ef1ff
|
||||
highlight markdownH1 guifg=#ffbd5e gui=bold
|
||||
highlight markdownH2 guifg=#5ef1ff gui=bold
|
||||
highlight markdownH3 guifg=#5ea1ff gui=bold
|
||||
highlight markdownH4 guifg=#bd5eff gui=bold
|
||||
highlight markdownH5 guifg=#ff5ef1 gui=bold
|
||||
highlight markdownH6 guifg=#5eff6c gui=bold
|
||||
highlight markdownLinkText guifg=#5ea1ff gui=underline
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" UI Bars
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight StatusLine guifg=#ffffff guibg=#16181a
|
||||
highlight StatusLineNC guifg=#7b8496 guibg=#16181a
|
||||
highlight TabLine guifg=#7b8496 guibg=#16181a
|
||||
highlight TabLineFill guifg=#7b8496 guibg=#16181a
|
||||
highlight TabLineSel guifg=#ffffff guibg=#3c4048
|
||||
highlight WinBar guifg=#ffffff guibg=#16181a
|
||||
highlight WinBarNC guifg=#7b8496 guibg=#16181a
|
||||
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
" Misc
|
||||
" ─────────────────────────────────────────────────────────────
|
||||
highlight SpecialKey guifg=#7b8496
|
||||
highlight Whitespace guifg=#3c4048
|
||||
highlight Question guifg=#ffe95e
|
||||
highlight MoreMsg guifg=#5ea1ff
|
||||
highlight WarningMsg guifg=#ffbd5e
|
||||
highlight ErrorMsg guifg=#ff6e5e
|
||||
highlight QuickFixLine guibg=#3c4048
|
||||
highlight qfLineNr guifg=#7b8496
|
||||
highlight qfFileName guifg=#5ea1ff
|
||||
|
||||
22
modules/features/vim/default.nix
Normal file
22
modules/features/vim/default.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
inputs,
|
||||
moduleWithSystem,
|
||||
...
|
||||
}: {
|
||||
flake.nixosModules.vim = moduleWithSystem ({pkgs, ...}: let
|
||||
modules = [];
|
||||
in {});
|
||||
perSystem = {pkgs, ...}: {
|
||||
packages.vim = inputs.wrappers.wrappers.vim.wrap {
|
||||
inherit pkgs;
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
# vim-lsp
|
||||
# vim-lsp-settings
|
||||
# asyncomplete-vim
|
||||
# asyncomplete-lsp-vim
|
||||
ale
|
||||
];
|
||||
vimrc = builtins.readFile ./vimrc;
|
||||
};
|
||||
};
|
||||
}
|
||||
62
modules/features/vim/vimrc
Normal file
62
modules/features/vim/vimrc
Normal file
@@ -0,0 +1,62 @@
|
||||
" Set colorscheme and enable highlighting
|
||||
colorscheme catppuccin
|
||||
set termguicolors
|
||||
syntax on
|
||||
|
||||
" Set tab stuff
|
||||
set tabstop=2
|
||||
set shiftwidth=2
|
||||
set expandtab
|
||||
set softtabstop=2
|
||||
|
||||
" Enable line numbers
|
||||
set number
|
||||
set relativenumber
|
||||
set cursorline
|
||||
" Make cursorlinenum a different color
|
||||
augroup colorAutoCmds
|
||||
autocmd!
|
||||
autocmd ColorScheme * highlight CursorLineNr cterm=bold guifg=#cba6f7
|
||||
augroup END
|
||||
|
||||
set ignorecase
|
||||
set smartcase
|
||||
set hlsearch
|
||||
set incsearch
|
||||
|
||||
" Set different cursor shapes depending on mode
|
||||
let &t_SI = "\e[6 q"
|
||||
let &t_EI = "\e[2 q"
|
||||
augroup cursorCmds
|
||||
au!
|
||||
autocmd VimEnter * silent !echo -ne "\e[2 q"
|
||||
augroup END
|
||||
|
||||
" Completion menu
|
||||
"inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
|
||||
"inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
|
||||
"inoremap <expr> <cr> pumvisible() ? asyncomplete#close_popup() : "\<cr>"
|
||||
|
||||
set omnifunc=ale#completion#OmniFunc
|
||||
nnoremap K <cmd>ALEHover<CR>
|
||||
nnoremap <leader>gd <cmd>ALEGoToDefinition<CR>
|
||||
nnoremap <leader>gr <cmd>ALEFindReferences<CR>
|
||||
nnoremap <leader>ca <cmd>ALECodeAc
|
||||
let g:ale_completion_enabled = 1
|
||||
|
||||
autocmd User lsp_setup call lsp#register_server({
|
||||
\ 'name': 'nixd',
|
||||
\ 'cmd': ['nixd'],
|
||||
\ 'allowlist': ['nix'],
|
||||
\ })
|
||||
|
||||
let g:ale_linters = {
|
||||
\ 'nix': ['nixd'],
|
||||
\}
|
||||
|
||||
let g:ale_fixers = {
|
||||
\ 'nix': ['alejandra'],
|
||||
\}
|
||||
|
||||
let g:ale_fix_on_save = 1
|
||||
|
||||
@@ -15,7 +15,12 @@
|
||||
++ modules;
|
||||
|
||||
services = {
|
||||
openssh.enable = true;
|
||||
openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
PermitRootLogin = "yes";
|
||||
};
|
||||
};
|
||||
avahi.enable = true;
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
||||
Reference in New Issue
Block a user