daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Compare commits

base: daniel:002092a44a7037eb75764a163eab11dcdb2e7bf3
Branches Tags
daniel:master
..
compare: daniel:f24f05c78d6c2c510a3b8f94458484026d5c98e3
Branches Tags
daniel:master

No commits in common. "002092a44a7037eb75764a163eab11dcdb2e7bf3" and "f24f05c78d6c2c510a3b8f94458484026d5c98e3" have entirely different histories.
002092a44a ... f24f05c78d

8 changed files with 64 additions and 71 deletions
Show stats Expand all files Collapse all files

50
flake.lock
View file

@ -109,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697721991, "lastModified": 1697419184,
"narHash": "sha256-Sjm7WaD+zLi9R7x8QKa9HGkizFQXvWGo18WlQtNPPtw=", "narHash": "sha256-eRPjCyjdcqaME/baecZHyTQTn3k0AYFzN/S+u351FcE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "c24c3a902935321e1dfa1ca587e66f47edf79faf", "rev": "325e1f7f2e0eea44c27e5e8a3946c2461ec095f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697688028, "lastModified": 1697622055,
"narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", "narHash": "sha256-t9rwzjlfgCnXDFGH3wsooYfAOA+XqQmgTojhzuNafZ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", "rev": "84fa81c7acb018c3c5a504dcefbc28a182c933c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -325,11 +325,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1697665640, "lastModified": 1697612973,
"narHash": "sha256-dodNEzwAW7MxaHy7BXA8olSZFGna6uB6RBMrf6UD7Sw=", "narHash": "sha256-b5nTKAKpZaI8BkIpZnezidJjFZR6yViCzS9R2xOw/HY=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "a8fc94a2fdd07edf0679d34f2deaacb25b3fa69f", "rev": "eadedfd9084c338a9162ef3706756bda443d6559",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697702552, "lastModified": 1697645480,
"narHash": "sha256-Zf38W4riXaKQL8651y4T3rz7x+TxshcAW44p0/vGcDQ=", "narHash": "sha256-R67duGL19v8YtjAg2kAT3BLweDERnqzJTz3at/PB5Q0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "4e65cdfa5b08e4943b2e109b4348d595c8584076", "rev": "b52c4374c831e82a2d6e552afbbb2bd2b51ca4fb",
"revCount": 537, "revCount": 533,
"type": "git", "type": "git",
"url": "https://git.kempkens.io/daniel/nix-overlay" "url": "https://git.kempkens.io/daniel/nix-overlay"
}, },
@ -370,11 +370,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697723594, "lastModified": 1696360011,
"narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +385,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1697745251, "lastModified": 1697100850,
"narHash": "sha256-3yLFt2ySYb2ZiFiCXYaBf/SHOKH3TyIfXaxB7qgdLfo=", "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6e1fd3d5c267b10f44b59e437422f11cc8a3790c", "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1697713104, "lastModified": 1697538484,
"narHash": "sha256-DN7YOyKMCpAVeZ44N42LrujtTkoerkS9+kTufQiuntY=", "narHash": "sha256-Snkk4LL4L3nqRiAJ6/BO9vTnuxbWZhR8jGlfAB5ohPY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6be2c349a30fcb489a3153dd331e9df387ab6449", "rev": "2cb9af4323c64c93e8df3cae5988a53b8687ef3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697688401, "lastModified": 1697379843,
"narHash": "sha256-61QlajY7R9PbK25uFl55zh968CVNspwXX1zzimic4Uo=", "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "458ef9126aa380996d77d44f53f886c2d8485f53", "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/config/nvim/init.fnl
View file

@ -67,7 +67,6 @@
(set g.mapleader " ") ; Some plugins need this, so set it before the keymap is loaded (set g.mapleader " ") ; Some plugins need this, so set it before the keymap is loaded
(set o.timeoutlen 400) (set o.timeoutlen 400)
(set g.loaded_python_provider 0) ; Disable built-in providers (set g.loaded_python_provider 0) ; Disable built-in providers
(set g.loaded_python3_provider 0)
(set g.loaded_ruby_provider 0) (set g.loaded_ruby_provider 0)
(set g.loaded_node_provider 0) (set g.loaded_node_provider 0)
(set g.loaded_perl_provider 0) (set g.loaded_perl_provider 0)

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

@ -9,14 +9,6 @@
gitsigns (require :gitsigns) gitsigns (require :gitsigns)
repl (require :nifoc.repl) repl (require :nifoc.repl)
formatting (require :nifoc.formatting)] formatting (require :nifoc.formatting)]
(set _G.mini_cr_action
(fn []
(if (not= (vim.fn.pumvisible) 0)
(if (not= (. (vim.fn.complete_info) :selected) -1)
(vim.api.nvim_replace_termcodes :<C-y> true true true)
(vim.api.nvim_replace_termcodes :<C-y><CR> true true true))
((. (require :mini.pairs) :cr)))))
(fn mod.setup [] (fn mod.setup []
(keymap.set :n :<space> :<nop> {:noremap true}) (keymap.set :n :<space> :<nop> {:noremap true})
;; Leader Mappings ;; Leader Mappings
@ -56,8 +48,7 @@
(keymap.set :n :<leader>dtp :<cmd>TSPlaygroundToggle<CR> (keymap.set :n :<leader>dtp :<cmd>TSPlaygroundToggle<CR>
{:desc "Toggle Treetsitter Playground"}) {:desc "Toggle Treetsitter Playground"})
;; Other Mappings ;; Other Mappings
(keymap.set :n :F #(formatting.maybe-format-buffer 0) (keymap.set :n :F #(formatting.maybe-format-buffer 0) {:desc "Format Buffer"})
{:desc "Format Buffer"})
(keymap.set :n :<A-Left> :b) (keymap.set :n :<A-Left> :b)
(keymap.set :n :<A-Right> :w) (keymap.set :n :<A-Right> :w)
(keymap.set :n :<S-Left> "^") (keymap.set :n :<S-Left> "^")
@ -75,13 +66,7 @@
(keymap.set :x :gp "<Plug>(YankyGPutAfter)") (keymap.set :x :gp "<Plug>(YankyGPutAfter)")
(keymap.set :x :gP "<Plug>(YankyGPutBefore)") (keymap.set :x :gP "<Plug>(YankyGPutBefore)")
(keymap.set :n :y "<Plug>(YankyYank)") (keymap.set :n :y "<Plug>(YankyYank)")
(keymap.set :x :y "<Plug>(YankyYank)") (keymap.set :x :y "<Plug>(YankyYank)"))
;; Completion
(keymap.set :i :<Tab> "pumvisible() ? \"\\<C-n>\" : \"\\<Tab>\""
{:expr true})
(keymap.set :i :<S-Tab> "pumvisible() ? \"\\<C-p>\" : \"\\<S-Tab>\""
{:expr true})
(keymap.set :i :<CR> "v:lua._G.mini_cr_action()" {:expr true}))
(fn mod.lsp-attach [client bufnr] (fn mod.lsp-attach [client bufnr]
(keymap.set :n :<leader>t (keymap.set :n :<leader>t

6
home/config/nvim/plugins/lsp.fnl
View file

@ -1,5 +1,6 @@
(let [lsp (require :lspconfig) (let [lsp (require :lspconfig)
lsp-configs (require :lspconfig.configs) lsp-configs (require :lspconfig.configs)
coq (require :coq)
navic (require :nvim-navic) navic (require :nvim-navic)
diagnostic (require :nifoc.diagnostic) diagnostic (require :nifoc.diagnostic)
augroup (vim.api.nvim_create_augroup :NifocLsp {:clear true}) augroup (vim.api.nvim_create_augroup :NifocLsp {:clear true})
@ -21,16 +22,13 @@
(when (client.supports_method :textDocument/inlayHint) (when (client.supports_method :textDocument/inlayHint)
(vim.lsp.inlay_hint bufnr true) (vim.lsp.inlay_hint bufnr true)
(setup-inlay-hint-toggle bufnr)) (setup-inlay-hint-toggle bufnr))
(when (client.supports_method :textDocument/completion)
(set vim.opt_local.omnifunc
"v:lua.MiniCompletion.completefunc_lsp"))
(diagnostic.maybe-enable-lsp client bufnr))) (diagnostic.maybe-enable-lsp client bufnr)))
:group augroup :group augroup
:desc "Automatic LSP setup"}) :desc "Automatic LSP setup"})
;; Servers ;; Servers
(vim.lsp.set_log_level :OFF) (vim.lsp.set_log_level :OFF)
(let [flags {:allow_incremental_sync true :debounce_text_changes 700} (let [flags {:allow_incremental_sync true :debounce_text_changes 700}
default-config {: flags} default-config (coq.lsp_ensure_capabilities {: flags})
default-servers [:bashls default-servers [:bashls
:cssls :cssls
:dockerls :dockerls

9
home/config/nvim/plugins/mini.fnl
View file

@ -11,15 +11,6 @@
:clues [(miniclue.gen_clues.builtin_completion)]}) :clues [(miniclue.gen_clues.builtin_completion)]})
;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-comment.md ;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-comment.md
((. (require :mini.comment) :setup) {}) ((. (require :mini.comment) :setup) {})
;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-completion.md
((. (require :mini.completion) :setup) {:window {:info {:height 25
:width 80
:border :rounded}
:signature {:height 25
:width 80
:border :rounded}}
:lsp_completion {:source_func :omnifunc
:auto_setup false}})
;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-hipatterns.md ;; https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-hipatterns.md
(hipatterns.setup {:highlighters {:fixme {:pattern "%f[%w]()FIXME()%f[%W]" (hipatterns.setup {:highlighters {:fixme {:pattern "%f[%w]()FIXME()%f[%W]"
:group :MiniHipatternsFixme} :group :MiniHipatternsFixme}

11
home/programs/fish.nix
View file

@ -37,6 +37,17 @@ in
}; };
} }
# https://github.com/PatrickF1/fzf.fish/releases
{
name = "fzf-fish";
src = fetchFromGitHub {
owner = "PatrickF1";
repo = "fzf.fish";
rev = "v10.0";
hash = "sha256-CqRSkwNqI/vdxPKrShBykh+eHQq9QIiItD6jWdZ/DSM=";
};
}
# https://github.com/jorgebucaran/autopair.fish/releases # https://github.com/jorgebucaran/autopair.fish/releases
{ {
name = "autopair-fish"; name = "autopair-fish";

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

@ -184,6 +184,15 @@ in
telescope-ui-select-nvim telescope-ui-select-nvim
telescope-undo-nvim telescope-undo-nvim
# Completion
{
plugin = pkgs.vimPlugins.coq_nvim;
config = builtins.readFile ../../config/nvim/plugins/coq.fnl;
type = "fennel";
}
pkgs.vimPlugins.coq-artifacts
# LSP # LSP
{ {
plugin = nvim-lspconfig; plugin = nvim-lspconfig;

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

@ -29,12 +29,12 @@ in
}; };
mini-nvim = buildVimPlugin { mini-nvim = buildVimPlugin {
pname = "mini.nvim"; pname = "mini.nvim";
version = "2023-10-19"; version = "2023-10-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "echasnovski"; owner = "echasnovski";
repo = "mini.nvim"; repo = "mini.nvim";
rev = "e9a0716013abb8d2d6f8d77331600fb99eb15d51"; rev = "cff8f2bddbbc1093a9ffbf1122df918be5ff41d9";
sha256 = "0xws1jj4z6w12fl2dl2glfd8i4ig782gk17316h3iwx68ixv0mhs"; sha256 = "1acn9jqq90s1bp0xb5dflbf1vw8spgznaanzny5cmpian0bm2as9";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -117,12 +117,12 @@ in
}; };
nvim-treesitter = buildVimPlugin { nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-10-19"; version = "2023-10-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "eb3faef3a44641e5875581e901b0a8df8da2bde4"; rev = "afa103385a2b5ef060596ed822ef63276ae88016";
sha256 = "0y49lf9b12y24dq3j8g7zllgmgkzzxkwkvm6vv0qdlahnn9bvcn1"; sha256 = "005m975kwz7n11vpgrpr9w9x1ahb42r5x2zkxa78rhjcsb2g2gsg";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -263,23 +263,23 @@ in
}; };
nvim-lint = buildVimPlugin { nvim-lint = buildVimPlugin {
pname = "nvim-lint"; pname = "nvim-lint";
version = "2023-10-19"; version = "2023-10-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-lint"; repo = "nvim-lint";
rev = "e366dc5ed4002d3489d03200c0b132ce2b1ba532"; rev = "7c8b50a2bb62b544eb91434fd008a34c4b51fd6d";
sha256 = "0azmih7djcnfg58wdcmpsr90nvhlqvr3km7h4dv69hh3xjp06qma"; sha256 = "01h3gii9wrzvg5csp028rc5aaz3l575xqgykwipcapdkvdkv9lg0";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
conform-nvim = buildVimPlugin { conform-nvim = buildVimPlugin {
pname = "conform.nvim"; pname = "conform.nvim";
version = "2023-10-19"; version = "2023-10-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stevearc"; owner = "stevearc";
repo = "conform.nvim"; repo = "conform.nvim";
rev = "55abaaa9ed4684cd9ba8f0c062379be6cf41b8f3"; rev = "2e8b826cb4af5cf36b5febc5e7a71d3284f161f2";
sha256 = "1nl7qqm61rin8v8xl11qlfajwqjmwzz4x79mwwcrml2d387nksbn"; sha256 = "179cnlmnz0rxrcfi6na1qipnwa7fc19cplzv9499ki125lqmhw8p";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -307,12 +307,12 @@ in
}; };
indent-blankline-nvim = buildVimPlugin { indent-blankline-nvim = buildVimPlugin {
pname = "indent-blankline.nvim"; pname = "indent-blankline.nvim";
version = "2023-10-19"; version = "2023-10-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lukas-reineke"; owner = "lukas-reineke";
repo = "indent-blankline.nvim"; repo = "indent-blankline.nvim";
rev = "8a7b48f5823cc924f815129192288ec2e2b9288f"; rev = "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff";
sha256 = "000mvx49b92ndhgpa8p3a2a089vpn1rqgkn8l09mgmbnpcgn3ib6"; sha256 = "1m27krw7zdlbnnip046acnndkniif2a6kg7aj61mf6l1ikbzy9x2";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };