daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update

Browse source
This commit is contained in:
Daniel Kempkens 2022-11-11 15:06:11 +01:00
parent 325d0eb6f4
commit e3d5d7cc43
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
15 changed files with 113 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
container/matrix/default.nix Normal file
View file

@ -0,0 +1,23 @@
let
secret = import ../../secret/container/matrix;
custom-config = import ./config.nix { inherit secret; };
in
{
virtualisation.arion.projects.matrix.settings = {
services = {
synapse = {
service = {
image = "matrixdotorg/synapse:latest";
container_name = "synapse";
restart = "unless-stopped";
volumes = [
"/etc/container-matrix/synapse:/data"
];
labels = {
"com.centurylinklabs.watchtower.enable" = "true";
};
};
};
};
};
} // custom-config

24
flake.lock
View file

@ -102,11 +102,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1667897328,
"narHash": "sha256-jwdTgwWUUraNQ0UC735EhRTQqN2kdlZfrfyE+QAQP98=",
"lastModified": 1668132986,
"narHash": "sha256-X/I/vGlFc+p0HSFNYtevhkbarOOtX6nY0r1Ovz9l2ak=",
"owner": "neovim",
"repo": "neovim",
"rev": "fae754073289566051433fae74ec65783f9e7a6a",
"rev": "ae67706535b23233d2d6f5a81b7c7284c3cc16f9",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
]
},
"locked": {
"lastModified": 1667981950,
"narHash": "sha256-rOO+7k7lKIo9J8eBVYgLuPbEGe8sNYQNGeVaaB/6aek=",
"lastModified": 1668154750,
"narHash": "sha256-5ccSEcgeijP9hJnAsGWx8Wz6n3EdH/8vpKR66kel+W0=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "2a2a702fcb4ce5ecd792f1ec799d69026ce5d594",
"rev": "9bc0f832263b4190f1b9e329a4c312f0af494376",
"type": "github"
},
"original": {
@ -145,11 +145,11 @@
]
},
"locked": {
"lastModified": 1667982678,
"narHash": "sha256-0r1WcvIQxPNV+P9Vzgp84o1hTofgyMW+x84uEmjfG4g=",
"lastModified": 1668155524,
"narHash": "sha256-uBZ1LEW3m51oXBri7XPRG3PO5bVJHm5PdrhCECjbhKk=",
"owner": "nifoc",
"repo": "nix-overlay",
"rev": "84fe46e63d4d70bf7b877db75f40dad0a00d41a0",
"rev": "269e2653975ff75f04a1d003b8ebf2a908969548",
"type": "github"
},
"original": {
@ -160,11 +160,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1667969101,
"narHash": "sha256-GL53T705HO7Q/KVfbb5STx8AxFs8YgaGY8pvAZC+O7U=",
"lastModified": 1668086072,
"narHash": "sha256-msFoXI5ThCmhTTqgl27hpCXWhaeqxphBaleJAgD8JYM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bbf77421ac51a7c93f5f0f760da99e4dbce614fa",
"rev": "72d8853228c9758820c39b8659415b6d89279493",
"type": "github"
},
"original": {

13
home/config/nvim/nifoc/diagnostic.fnl
View file

@ -6,11 +6,12 @@
aucmd vim.api.nvim_create_autocmd]
(fn maybe-refresh-codelens [client]
(when (client.supports_method :textDocument/codeLens)
(vim.lsp.codelens.refresh)))
(vim.schedule vim.lsp.codelens.refresh)))
(fn mod.setup []
(vim.diagnostic.config {:underline true
:virtual_text false
:virtual_lines true
:signs true
:float {:border :rounded :source true}
:update_in_insert false
@ -22,20 +23,14 @@
(fn mod.maybe-enable-diagnostics [bufnr]
(when (= vim.b.nifoc_diagnostics_enabled nil)
(api.nvim_buf_set_var bufnr :nifoc_diagnostics_enabled 1)
(aucmd [:CursorHold :CursorHoldI]
{:callback #(vim.diagnostic.open_float {:focusable false
:focus false})
:buffer bufnr
:group augroup
:desc "Open Diagnostic Window"})))
(api.nvim_buf_set_var bufnr :nifoc_diagnostics_enabled 1)))
(fn mod.maybe-enable-lsp [client bufnr]
(when (= vim.b.nifoc_lsp_enabled nil)
(api.nvim_buf_set_var bufnr :nifoc_lsp_enabled 1)
(keymap.lsp-attach client bufnr)
(mod.maybe-enable-diagnostics bufnr)
(aucmd [:CursorHold :CursorHoldI :InsertLeave]
(aucmd [:InsertLeave :BufEnter :BufWritePost]
{:callback #(maybe-refresh-codelens client)
:buffer bufnr
:group augroup

4
home/config/nvim/nifoc/keymap.fnl
View file

@ -10,6 +10,7 @@
noice (require :noice)
npairs (require :nvim-autopairs)
gitsigns (require :gitsigns)
lsp-lines (require :lsp_lines)
repl (require :nifoc.repl)
formatting (require :nifoc.formatting)]
(fn mod.setup []
@ -51,7 +52,8 @@
{:desc "Show Diagnostics"})
(keymap.set :n :<leader>dli :<cmd>LspInfo<CR> {:desc "LSP Info"})
(keymap.set :n :<leader>dlr :<cmd>LspRestart<CR> {:desc "Restart LSP"})
(keymap.set :n :<leader>dt :<cmd>TSPlaygroundToggle<CR>
(keymap.set :n :<leader>dt #(lsp-lines.toggle) {:desc "Toggle Diagnostics"})
(keymap.set :n :<leader>dtp :<cmd>TSPlaygroundToggle<CR>
{:desc "Toggle Treetsitter Playground"})
(keymap.set :n :<leader>dn #(noice.cmd :telescope)
{:desc "Display Notifications"})

2
home/config/nvim/nifoc/theme.fnl
View file

@ -12,6 +12,8 @@
(set g.dracula_italic_comment true)
(set o.background :dark)
(colorscheme :dracula)
;; LSP
(highlight-link :LspCodeLens :Comment)
;; Tabline
(highlight :TabLine {:fg mod.colors.comment :bg mod.colors.black})
(highlight :TabLineSel {:fg mod.colors.white :bg mod.colors.bg})

1
home/config/nvim/plugins/cmp.fnl
View file

@ -44,6 +44,7 @@
:<C-Space> (cmp.mapping.confirm {:behavior cmp.ConfirmBehavior.Insert
:select true})
:<CR> (cmp.mapping.confirm {:select true})})
:window {:documentation (cmp.config.window.bordered)}
:completion {:keyword_length 2
:completeopt "menu,menuone,noinsert"}
:snippet {:expand (fn [args]

2
home/config/nvim/plugins/matchup.fnl
View file

@ -1,6 +1,6 @@
(let [matchup (require :match-up)]
(matchup.setup {:matchparen {:deferred true
:offscreen {:method :popup}
:offscreen {:method :popup :fullwidth true}
:start_sign ""
:end_sign ""}}))

1
home/config/nvim/plugins/nvim-lint.fnl
View file

@ -29,7 +29,6 @@
:elixir [:credo]
;:fennel [:fennel]
:fish [:fish]
:markdown [:vale]
:nix [:deadnix :nix :statix]
:sh [:shellcheck]
:yaml [:yamllint]})

12
home/config/nvim/plugins/treesitter.fnl
View file

@ -32,14 +32,15 @@
:vim
:yaml]
rainbow-parsers [:fennel]
disable-parsers [:tsx]]
disable-parsers []]
(nifoc-treesitter.setup)
(treesitter-config.setup {:ensure_installed []
:sync_install true
:auto_install false
:highlight {:enable true :disable disable-parsers}
:indent {:enable true}
:indent {:enable true :disable disable-parsers}
:textobjects {:select {:enable true
:disable disable-parsers
:keymaps {:af "@function.outer"
:if "@function.inner"
:ac "@conditional.outer"
@ -50,8 +51,9 @@
parser)))
install-parsers)}
:matchup {:enable true :disable disable-parsers}
:autopairs {:enable true}
:autotag {:enable true}
:autopairs {:enable true :disable disable-parsers}
:autotag {:enable true :disable disable-parsers}
:playground {:enable true}
:nifoc_hooks {:enable true}}))
:nifoc_hooks {:enable true
:disable disable-parsers}}))

10
home/programs/nvim/default.nix
View file

@ -44,7 +44,6 @@ in
shellcheck
shfmt
statix
vale
yamllint
];
@ -176,6 +175,15 @@ in
type = "fennel";
}
{
plugin = lsp_lines-nvim;
config = ''
(let [lsp-lines (require :lsp_lines)]
(lsp-lines.setup))
'';
type = "fennel";
}
lspkind-nvim
{

89
home/programs/nvim/plugins.nix
View file

@ -47,23 +47,23 @@ rec {
};
nvim-osc52 = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-osc52";
version = "2022-10-25";
version = "2022-11-10";
src = pkgs.fetchFromGitHub {
owner = "ojroques";
repo = "nvim-osc52";
rev = "75b9b86807448db9ade7715a86171d31da6348ff";
sha256 = "0vsnsp2ab0ma0pb53lr6pyp8330f0axcnbkzr9cfckv45fqvd5b2";
rev = "27b922a88aba9b2533c4a0e0bc5bca65e3405739";
sha256 = "13xf92xjrh8kky1n474vwhg433ckz7czc80cnj7c45hq763s4ahi";
fetchSubmodules = false;
};
};
yanky-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "yanky.nvim";
version = "2022-11-08";
version = "2022-11-11";
src = pkgs.fetchFromGitHub {
owner = "gbprod";
repo = "yanky.nvim";
rev = "b43ed12a3d4f2814a6648137def522125d8e374d";
sha256 = "02kp7xdvyk2h0dvypcpqfjn5i1qnrm8379mf872sav09bsr9wzlf";
rev = "eca407c457ff2c4d04d809045e3f3e9620c1dc2c";
sha256 = "1x6i21wbb5p6732wqz5a0blnx9ln7w316m7fk3fcq7xfb12nb5ck";
fetchSubmodules = false;
};
};
@ -80,12 +80,12 @@ rec {
};
substitute-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "substitute.nvim";
version = "2022-11-02";
version = "2022-11-10";
src = pkgs.fetchFromGitHub {
owner = "gbprod";
repo = "substitute.nvim";
rev = "bc818091dfffa5bc72504a39f0996a3976bfc87b";
sha256 = "1indz5f705f0f96r4l438x2zpwfj4mzxzckz4jfgzkp6cdgs76dl";
rev = "996d13312d080a01c2bff903d30f4c5db55b3941";
sha256 = "0j8vfaiklywkj5q9n2g4i5xxxr0r1nsjkr9z523xrcslsg7la672";
fetchSubmodules = false;
};
};
@ -102,23 +102,23 @@ rec {
};
dracula-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2022-11-02";
version = "2022-11-10";
src = pkgs.fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "7ff76dd8248efeabb322fec87b22d33c129536fe";
sha256 = "1g94pxa1frc5ym506vdvfpsk7qby2wzhdv3fby5c09a1vnkz7npz";
rev = "fe57c180fd7fdea39bc0d85bac9252aa6a8645e8";
sha256 = "1jac9pmg9sn28x62xx6n5brzycmgfsb825dfsh6mkny425705zsm";
fetchSubmodules = false;
};
};
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-11-08";
version = "2022-11-11";
src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "d37fc85a4060352bcd4d8cbed0907cba442deb90";
sha256 = "0hf5raqbj4ygvvqhvshrdyvfrch4wjz8ca62vzq584pb6jqpdwzc";
rev = "47bda4171aad2ee990a35ddb6319ceedc4d78b5d";
sha256 = "080x8j4crwrnrh4dsnzwvjz3zanmd282ax9z703i7hfavvxrpg5n";
fetchSubmodules = false;
};
passthru.withPlugins =
@ -157,12 +157,12 @@ rec {
};
telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "telescope.nvim";
version = "2022-11-06";
version = "2022-11-11";
src = pkgs.fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "cc77713294892c5bbce26adee665114250624e6b";
sha256 = "15570726pdndzagpp2g4w83wrgj0sifbbmirpc9d3fwdnys5gxqz";
rev = "7a4ffef931769c3fe7544214ed7ffde5852653f6";
sha256 = "0n2cz7pgnn5wbklw0wax0k0gvhbf5gc1rs7i9d1bmwrljipgi4ak";
fetchSubmodules = false;
};
};
@ -193,12 +193,12 @@ rec {
};
todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "todo-comments.nvim";
version = "2022-11-08";
version = "2022-11-10";
src = pkgs.fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
rev = "bca0e00644c22a3eecedce703c0db080dd6bdc55";
sha256 = "1rb8w2xgnwkf2vv3fwrjmqzw06iwhfmzb33ya01kbs077hp5qyc9";
rev = "d73693012b5dd0dae7a49504b93dcc79d189c733";
sha256 = "0z6918hri3r4zws15l598rixcbvdj1g82lv5h68baxlg3n7bzmaz";
fetchSubmodules = false;
};
};
@ -226,12 +226,23 @@ rec {
};
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2022-11-07";
version = "2022-11-10";
src = pkgs.fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "f40eae01b8e353e9d6e61792567c7d3b9856fd20";
sha256 = "0qb42zdss3429nvsid7faysbhvzs6xp3cg4v1jmh228yr2hqgghs";
rev = "c96ec574eacfff8ad8dd4bdb6e96a1b3dbd268fd";
sha256 = "0mbpj7lg0z0h2ba0c6cb0icr0hgd67wrqyq9hfzzgx2knn9j0d8x";
fetchSubmodules = false;
};
};
lsp_lines-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "lsp_lines.nvim";
version = "2022-08-03";
src = pkgs.fetchFromSourcehut {
owner = "~whynothugo";
repo = "lsp_lines.nvim";
rev = "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea";
sha256 = "1cch7sc3728z07rhfnc9fjpnq39dj3laxkvsv4iqfr5vl9c2pqvk";
fetchSubmodules = false;
};
};
@ -314,12 +325,12 @@ rec {
};
nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-cmp";
version = "2022-10-29";
version = "2022-11-11";
src = pkgs.fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "9bb8ee6e2d6ab3c8cc53323b79f05886bc722faa";
sha256 = "1z7b53yxamph255rvrs5a4pq5hbqa0nbwpdh1xy8fvfc71gap80n";
rev = "69c85860d7c3b39e1be3881702e13a8440cd33fc";
sha256 = "1pj1q04lr7mqkrcl60pymj6i2ypxn4yqczwnjind0kn263wfihx8";
fetchSubmodules = false;
};
};
@ -479,12 +490,12 @@ rec {
};
nvim-surround = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-surround";
version = "2022-10-28";
version = "2022-11-10";
src = pkgs.fetchFromGitHub {
owner = "kylechui";
repo = "nvim-surround";
rev = "7e5096b736ae252d04d543af6a13280125dc6d0f";
sha256 = "1hqa8c0bfj7yl3zdpid4aj26jay65f40ixaydh7ic79rxm9a1k0i";
rev = "87839e18d3953eb8cebd23a007183fd6c48863b5";
sha256 = "14gcn2dpiyabl59knzzq7dfj03l77dh17mz3r92wca2lxb76smd5";
fetchSubmodules = false;
};
};
@ -545,12 +556,12 @@ rec {
};
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2022-11-08";
version = "2022-11-09";
src = pkgs.fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "9d73a30e9cc524ab3d1c7095c74de9fb87684461";
sha256 = "1nbr1cr8zc05gqjhxjf8pvscbmy41kcqlkkqcrhmw6m94nzckz8j";
rev = "9ff7dfb051e5104088ff80556203634fc8f8546d";
sha256 = "0cfssyyhcjndwr2xlk91rxzyir4ng5hk1f4fgij5hgrhhh3wgjdv";
fetchSubmodules = false;
};
};
@ -567,23 +578,23 @@ rec {
};
nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-notify";
version = "2022-11-09";
version = "2022-11-10";
src = pkgs.fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
rev = "30e6b5a710319e354c3e362deb7819cb2135c417";
sha256 = "0wg4zh8n25q9yhfhpgf9vimgcq5mim3nfj332fzh13vzn2w9z4jp";
rev = "43c54aec682854b39a7e0e89b4c3ba00426d74a8";
sha256 = "0ga67fj7wf54mvrbsq423ccw3rvsgrd66dg0pq7cz7x9i7v5dz4d";
fetchSubmodules = false;
};
};
noice-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "noice.nvim";
version = "2022-11-08";
version = "2022-11-11";
src = pkgs.fetchFromGitHub {
owner = "folke";
repo = "noice.nvim";
rev = "edc8df60a16bb0f2709110b29fef98c6cc616d42";
sha256 = "0gydjg5aa0wcjpayls4gvknrrjzc787id31p3v0ch5glqxvkc7hl";
rev = "3489e57e198e4b161169a538d2bd71e018de41d0";
sha256 = "0xyk6aiq992mj8lfhlgvzzx0q0zmc2hg0k2z1f5j8b74zzd0i9gk";
fetchSubmodules = false;
};
};

1
home/programs/nvim/plugins.yaml
View file

@ -33,6 +33,7 @@
# LSP
- src: neovim/nvim-lspconfig
- src: "https://git.sr.ht/~whynothugo/lsp_lines.nvim"
- src: onsails/lspkind.nvim
- src: SmiteshP/nvim-navic
- src: RRethy/vim-illuminate

BIN
secret/container/matrix/config.nix Normal file
View file

Binary file not shown.

BIN
secret/container/matrix/config/homeserver.yaml Normal file
View file

Binary file not shown.

BIN
secret/container/matrix/default.nix Normal file
View file

Binary file not shown.