update to NixOS 23.11
This commit is contained in:
parent
20455180f9
commit
92c82ca8c6
@ -76,7 +76,7 @@
|
||||
|
||||
users.users ={
|
||||
# Only needed for local (read emergency) shell access
|
||||
root.passwordFile = config.secrets.passwords.root;
|
||||
root.hashedPasswordFile = config.secrets.passwords.root;
|
||||
|
||||
# Admin
|
||||
rnhmjoj = {
|
||||
|
2
jobs.nix
2
jobs.nix
@ -55,6 +55,8 @@ with lib;
|
||||
'';
|
||||
};
|
||||
|
||||
system.fsPackages = [ pkgs.nfs-utils ];
|
||||
|
||||
systemd.mounts = lib.singleton
|
||||
{
|
||||
description = "backup NFS volume";
|
||||
|
30
neovim.nix
30
neovim.nix
@ -16,9 +16,10 @@ let
|
||||
|
||||
# Syntax
|
||||
vim-pandoc-syntax
|
||||
nix-queries
|
||||
nix-queries fortran-queries
|
||||
(nvim-treesitter.withPlugins (p: with p;
|
||||
[ bash fish
|
||||
fortran haskell
|
||||
html css markdown
|
||||
nix python
|
||||
]))
|
||||
@ -44,6 +45,8 @@ let
|
||||
|
||||
nix-queries = pkgs.writeTextDir "/queries/nix/injections.scm"
|
||||
''
|
||||
;; extends
|
||||
|
||||
; /*language*/ highlight (too slow)
|
||||
; ((comment) @language
|
||||
; [
|
||||
@ -66,6 +69,14 @@ let
|
||||
@combined
|
||||
'';
|
||||
|
||||
fortran-queries = pkgs.writeTextDir "/queries/fortran/highlights.scm"
|
||||
''
|
||||
;; extends
|
||||
|
||||
(end_block_construct_statement) @keyword
|
||||
(implicit_statement) @keyword
|
||||
'';
|
||||
|
||||
conf = pkgs.writeText "init.lua" ''
|
||||
local opt = vim.opt
|
||||
local cmd = vim.api.nvim_command
|
||||
@ -91,6 +102,7 @@ let
|
||||
opt.mouse = 'a' -- Enable mouse support
|
||||
opt.ignorecase = true -- Case insensitive search...
|
||||
opt.smartcase = true -- ...for lowercase terms
|
||||
opt.splitkeep = 'screen' -- keep text still when splitting
|
||||
|
||||
opt.fsync = true -- Sync writes
|
||||
opt.swapfile = false -- Disable swap files
|
||||
@ -163,6 +175,7 @@ let
|
||||
autocmd('TermOpen', {pattern='*', command='setlocal nonumber'})
|
||||
autocmd('TermEnter', {pattern='*', command='set noshowcmd'})
|
||||
autocmd('TermLeave', {pattern='*', command='set showcmd'})
|
||||
autocmd('VimResized', {pattern='*', command='wincmd ='})
|
||||
|
||||
-- Exit without confirmation
|
||||
autocmd('TermClose', {pattern='*', command='call feedkeys("\\<CR>")'})
|
||||
@ -315,25 +328,24 @@ let
|
||||
vim.g.neomake_error_sign = {text='E→', texthl='ErrorMsg'}
|
||||
vim.g.neomake_highlight_lines = 1
|
||||
vim.g.neomake_virtualtext_current_error = 0
|
||||
vim.g.neomake_fortran_gfortran_args =
|
||||
{'-fsyntax-only', '-Wall', '-Wextra', '-Jbuild/obj'}
|
||||
|
||||
-- Pandoc Markdown
|
||||
autocmd({'BufNewFile', 'BufFilePre', 'BufRead'},
|
||||
{pattern='*.md', command='set filetype=markdown.pandoc'})
|
||||
|
||||
-- Git signs
|
||||
require'gitsigns'.setup{
|
||||
signs={
|
||||
gitsigns = require'gitsigns'
|
||||
gitsigns.setup{signs={
|
||||
add = {hl='GitAdd' , text='+'},
|
||||
change = {hl='GitChange', text='δ'},
|
||||
delete = {hl='GitDelete', text='-'},
|
||||
topdelete = {hl='GitDelete', text='‾'},
|
||||
changedelete = {hl='GitChange', text='~'},
|
||||
},
|
||||
keymaps={
|
||||
['n <leader>gb'] = ':lua require"gitsigns".blame_line(true)<CR>',
|
||||
['n <leader>gp'] = ':lua require"gitsigns".preview_hunk()<CR>',
|
||||
}
|
||||
changedelete = {hl='GitChange', text='~'}}
|
||||
}
|
||||
keymap('n', '<leader>gb', function() gitsigns.blame_line{full=true} end, {silent=true})
|
||||
keymap('n', '<leader>gp', function() gitsigns.preview_hunk() end, {silent=true})
|
||||
|
||||
-- Tree-sitter
|
||||
require'nvim-treesitter.configs'.setup{
|
||||
|
@ -26,7 +26,7 @@
|
||||
smartmontools
|
||||
|
||||
# namecoin
|
||||
namecoin haskellPackages.rosa
|
||||
namecoind haskellPackages.rosa
|
||||
];
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user