diff options
| -rw-r--r-- | config/guix/channels.scm | 10 | ||||
| -rw-r--r-- | config/nvim/init.vim | 1 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 12 | ||||
| -rwxr-xr-x | install | 4 | ||||
| -rwxr-xr-x | local/bin/elektroline-windows | 2 | ||||
| m--------- | private | 0 | ||||
| -rw-r--r-- | profile | 6 |
7 files changed, 28 insertions, 7 deletions
diff --git a/config/guix/channels.scm b/config/guix/channels.scm new file mode 100644 index 0000000..a56d8b6 --- /dev/null +++ b/config/guix/channels.scm @@ -0,0 +1,10 @@ +(cons* (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + ;; Enable signature verification: + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + %default-channels) diff --git a/config/nvim/init.vim b/config/nvim/init.vim index df59ee3..3165498 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -139,6 +139,7 @@ nnoremap <c-c><c-c> :Telescope buffers<cr> nnoremap <c-p> :lua require('mytelescopefiles')()<cr> nnoremap <c-s-p> :Telescope lsp_document_symbols<cr> nnoremap <c-s-g> :Telescope live_grep<cr> +nnoremap <c-s-8> :Telescope grep_string<cr> nmap <leader>] :Telescope lsp_definitions<cr> nmap <leader><leader>] :Telescope lsp_type_definitions<cr> nmap <leader>[ :Telescope lsp_implementations<cr> diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 8d54be4..a1c17bf 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -143,10 +143,10 @@ require("packer").startup(function(use) use("aliou/bats.vim") -- LSP --------------------------------------------------------------------- - local lspconfig = require("lspconfig") - lspconfig.bashls.setup({}) - lspconfig.clangd.setup({}) - lspconfig.nil_ls.setup({}) - lspconfig.pylsp.setup({}) - lspconfig.tinymist.setup({}) + vim.lsp.enable("bashls") + vim.lsp.enable("clangd") + vim.lsp.enable("nil_ls") + vim.lsp.enable("pylsp") + vim.lsp.enable("tinymist") + vim.lsp.enable("guile_ls") end) @@ -37,6 +37,10 @@ if ask "nix" "Install Nix configuration"; then inst private/config/nix/builders ~/.config/nix/builders fi +if ask "guix" "Install Guix configuration"; then + inst config/guix/channels.scm ~/.config/guix/channels.scm +fi + if ask "clituls" "Install configurations for various CLI utility tools"; then inst screenrc ~/.screenrc inst local/share/mc/skins/nord16M.ini ~/.local/share/mc/skins/nord16M.ini diff --git a/local/bin/elektroline-windows b/local/bin/elektroline-windows index a9fde00..26e6228 100755 --- a/local/bin/elektroline-windows +++ b/local/bin/elektroline-windows @@ -13,4 +13,4 @@ exec xfreerdp \ /d:ELEKTROLINE /u:kkoci \ /bpp:24 /audio-mode:0 /sound:sys:alsa /network:lan /rfx \ +clipboard /port:3389 \ - /v:elvirt00.elektroline.cz /p:"$(pass elektroline.cz/kkoci)" + /v:czellts.elektroline.cz /p:"$(pass elektroline.cz/kkoci)" diff --git a/private b/private -Subproject a6507517a0dd8401e06cf60c13daa30599d24f1 +Subproject bc015df28ab93da02721355920dcf1d7a289595 @@ -19,6 +19,12 @@ for profile in "$HOME"/.nix-profile/etc/profile.d/*; do source "$profile" done +# Guix +export GUIX_PROFILE="/home/cynerd/.guix-profile" +if [[ -d "$GUIX_PROFILE" ]]; then + source "$GUIX_PROFILE/etc/profile" +fi + # Rest of the profile run only if login is from linux console [[ "$(tty)" != /dev/tty* ]] && return |