diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | dunst/dunstrc | 16 | ||||
-rw-r--r-- | mpd/mpd.conf | 28 | ||||
-rw-r--r-- | mpd/pid | 1 | ||||
-rw-r--r-- | mpd/sticker.sql | bin | 0 -> 12288 bytes | |||
-rw-r--r-- | nvim/init.lua | 4 | ||||
-rw-r--r-- | nvim/nvim/init.lua | 7 | ||||
-rw-r--r-- | nvim/nvim/lazy-lock.json | 16 | ||||
-rw-r--r-- | nvim/nvim/lua/config/lazy.lua | 34 | ||||
-rw-r--r-- | nvim/nvim/lua/config/remaps.lua | 4 | ||||
-rw-r--r-- | nvim/nvim/lua/plugins/init.lua | 7 | ||||
-rw-r--r-- | nvim/nvim/lua/plugins/lsp.lua | 91 | ||||
-rw-r--r-- | nvim/nvim/lua/plugins/obsidian.lua | 43 | ||||
-rw-r--r-- | nvim/nvim/lua/plugins/theme.lua | 3 | ||||
-rw-r--r-- | nvim/nvim/lua/plugins/tmux.lua | 18 | ||||
-rw-r--r-- | zathura/flexoki-dark | 24 | ||||
-rw-r--r-- | zathura/zathurarc | 1 |
17 files changed, 297 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cb2d368 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +mpd/database +mpd/playlists/ diff --git a/dunst/dunstrc b/dunst/dunstrc new file mode 100644 index 0000000..dd007a4 --- /dev/null +++ b/dunst/dunstrc @@ -0,0 +1,16 @@ +[global] +frame_color = "#282726" +separator_color = frame + +[urgency_normal] +background = "#100F0F" +foreground = "#CECDC3" + +[urgency_low] +background = "#1C1B1A" +foreground = "#878580" + +[urgency_critical] +background = "#100F0F" +foreground = "#CECDC3" +frame_color = "#D14D41" diff --git a/mpd/mpd.conf b/mpd/mpd.conf new file mode 100644 index 0000000..bac86f3 --- /dev/null +++ b/mpd/mpd.conf @@ -0,0 +1,28 @@ +music_directory "~/music" +playlist_directory "~/.config/mpd/playlists" +db_file "~/.config/mpd/database" +log_file "syslog" +pid_file "~/.config/mpd/pid" +state_file "~/.local/state/mpd/state" +sticker_file "~/.config/mpd/sticker.sql" +# +# This setting enables automatic update of MPD's database when files in +# music_directory are changed. +# +auto_update "yes" + +# Input ####################################################################### +# +input { + plugin "curl" +# proxy "proxy.isp.com:8080" +# proxy_user "user" +# proxy_password "password" +} + +# Audio Output ################################################################ + +audio_output { + type "pipewire" + name "PipeWire Sound Server" +} @@ -0,0 +1 @@ +2058 diff --git a/mpd/sticker.sql b/mpd/sticker.sql Binary files differnew file mode 100644 index 0000000..c86cdf4 --- /dev/null +++ b/mpd/sticker.sql diff --git a/nvim/init.lua b/nvim/init.lua index 9bb2e0b..fcd3779 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,7 +1,7 @@ require("config.lazy") require("config.remaps") -vim.cmd('set background=light') -vim.cmd('colorscheme flexoki-light') +vim.cmd('set background=dark') +vim.cmd('colorscheme flexoki-dark') vim.cmd('set number! relativenumber!') vim.opt.conceallevel = 1 diff --git a/nvim/nvim/init.lua b/nvim/nvim/init.lua new file mode 100644 index 0000000..fcd3779 --- /dev/null +++ b/nvim/nvim/init.lua @@ -0,0 +1,7 @@ +require("config.lazy") +require("config.remaps") +vim.cmd('set background=dark') +vim.cmd('colorscheme flexoki-dark') + +vim.cmd('set number! relativenumber!') +vim.opt.conceallevel = 1 diff --git a/nvim/nvim/lazy-lock.json b/nvim/nvim/lazy-lock.json new file mode 100644 index 0000000..0d94812 --- /dev/null +++ b/nvim/nvim/lazy-lock.json @@ -0,0 +1,16 @@ +{ + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "flexoki": { "branch": "main", "commit": "8899dab435d8c82329397ca224e63b129a21e1e6" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "be159e939543777bbfe9e1fe5389984c4570afce" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "neoconf.nvim": { "branch": "main", "commit": "7624a7af00082200c3c0c697fcb8fcfd239c1b14" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "314b35335cc84bc2a085c84c69da955ba22da163" }, + "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" }, + "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +} diff --git a/nvim/nvim/lua/config/lazy.lua b/nvim/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..a65ee40 --- /dev/null +++ b/nvim/nvim/lua/config/lazy.lua @@ -0,0 +1,34 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Make sure to setup `mapleader` and `maplocalleader` before +-- loading lazy.nvim so that mappings are correct. +-- This is also a good place to setup other settings (vim.opt) +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + { import = "plugins" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true, notify = false}, +}) diff --git a/nvim/nvim/lua/config/remaps.lua b/nvim/nvim/lua/config/remaps.lua new file mode 100644 index 0000000..b49d648 --- /dev/null +++ b/nvim/nvim/lua/config/remaps.lua @@ -0,0 +1,4 @@ +vim.g.mapleader = " " +vim.keymap.set('n', '<leader><F5>', vim.cmd.UndotreeToggle) +vim.keymap.set('n', '<leader>pv', vim.cmd.Ex) +vim.keymap.set('n', '<leader>r', vim.diagnostic.goto_next, opts) diff --git a/nvim/nvim/lua/plugins/init.lua b/nvim/nvim/lua/plugins/init.lua new file mode 100644 index 0000000..71214e8 --- /dev/null +++ b/nvim/nvim/lua/plugins/init.lua @@ -0,0 +1,7 @@ +return { + "folke/neodev.nvim", + "folke/which-key.nvim", + { "folke/neoconf.nvim", cmd = "Neoconf" }, + "mbbill/undotree", +} + diff --git a/nvim/nvim/lua/plugins/lsp.lua b/nvim/nvim/lua/plugins/lsp.lua new file mode 100644 index 0000000..40a205c --- /dev/null +++ b/nvim/nvim/lua/plugins/lsp.lua @@ -0,0 +1,91 @@ +return { + { + 'williamboman/mason.nvim', + lazy = false, + opts = {}, + }, + + -- Autocompletion + { + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', + config = function() + local cmp = require('cmp') + + cmp.setup({ + sources = { + {name = 'nvim_lsp'}, + }, + mapping = cmp.mapping.preset.insert({ + ['<C-Space>'] = cmp.mapping.complete(), + ['<C-u>'] = cmp.mapping.scroll_docs(-4), + ['<C-d>'] = cmp.mapping.scroll_docs(4), + }), + snippet = { + expand = function(args) + vim.snippet.expand(args.body) + end, + }, + }) + end + }, + + -- LSP + { + 'neovim/nvim-lspconfig', + cmd = {'LspInfo', 'LspInstall', 'LspStart'}, + event = {'BufReadPre', 'BufNewFile'}, + dependencies = { + {'hrsh7th/cmp-nvim-lsp'}, + {'williamboman/mason.nvim'}, + {'williamboman/mason-lspconfig.nvim'}, + }, + init = function() + -- Reserve a space in the gutter + -- This will avoid an annoying layout shift in the screen + vim.opt.signcolumn = 'yes' + end, + config = function() + local lsp_defaults = require('lspconfig').util.default_config + + -- Add cmp_nvim_lsp capabilities settings to lspconfig + -- This should be executed before you configure any language server + lsp_defaults.capabilities = vim.tbl_deep_extend( + 'force', + lsp_defaults.capabilities, + require('cmp_nvim_lsp').default_capabilities() + ) + + -- LspAttach is where you enable features that only work + -- if there is a language server active in the file + vim.api.nvim_create_autocmd('LspAttach', { + desc = 'LSP actions', + callback = function(event) + local opts = {buffer = event.buf} + + vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts) + vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>', opts) + vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts) + vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', opts) + vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts) + vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', opts) + vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts) + vim.keymap.set('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>', opts) + vim.keymap.set({'n', 'x'}, '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>', opts) + vim.keymap.set('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts) + end, + }) + + require('mason-lspconfig').setup({ + ensure_installed = {}, + handlers = { + -- this first function is the "default handler" + -- it applies to every language server without a "custom handler" + function(server_name) + require('lspconfig')[server_name].setup({}) + end, + } + }) + end + } +} diff --git a/nvim/nvim/lua/plugins/obsidian.lua b/nvim/nvim/lua/plugins/obsidian.lua new file mode 100644 index 0000000..7b95d1e --- /dev/null +++ b/nvim/nvim/lua/plugins/obsidian.lua @@ -0,0 +1,43 @@ +return { + "epwalsh/obsidian.nvim", + version = "*", -- recommended, use latest release instead of latest commit + lazy = true, + ft = "markdown", + -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: + -- event = { + -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. + -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md" + -- -- refer to `:h file-pattern` for more examples + -- "BufReadPre path/to/my-vault/*.md", + -- "BufNewFile path/to/my-vault/*.md", + -- }, + dependencies = { + -- Required. + "nvim-lua/plenary.nvim", + + -- see below for full list of optional dependencies 👇 + }, + opts = { + workspaces = { + { + name = "zettelkasten", + path = "~/zettelkasten", + }, + }, + + note_frontmatter_func = function(note) + + local out = { aliases = note.aliases, tags = note.tags } + + -- `note.metadata` contains any manually added fields in the frontmatter. + -- So here we just make sure those fields are kept in the frontmatter. + if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then + for k, v in pairs(note.metadata) do + out[k] = v + end + end + + return out + end, + }, +} diff --git a/nvim/nvim/lua/plugins/theme.lua b/nvim/nvim/lua/plugins/theme.lua new file mode 100644 index 0000000..0f491cb --- /dev/null +++ b/nvim/nvim/lua/plugins/theme.lua @@ -0,0 +1,3 @@ +return { + 'kepano/flexoki-neovim', name = 'flexoki' +} diff --git a/nvim/nvim/lua/plugins/tmux.lua b/nvim/nvim/lua/plugins/tmux.lua new file mode 100644 index 0000000..31321a6 --- /dev/null +++ b/nvim/nvim/lua/plugins/tmux.lua @@ -0,0 +1,18 @@ +return { + "christoomey/vim-tmux-navigator", + cmd = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + "TmuxNavigatorProcessList", + }, + keys = { + { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" }, + { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" }, + { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" }, + { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" }, + { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" }, + }, +} diff --git a/zathura/flexoki-dark b/zathura/flexoki-dark new file mode 100644 index 0000000..f30f2ce --- /dev/null +++ b/zathura/flexoki-dark @@ -0,0 +1,24 @@ +# +# https://stephango.com/flexoki +# + +set default-bg \#100F0F # bg +set default-fg \#CECDC3 # tx + +set inputbar-bg \#1C1B1A # bg-2 +set inputbar-fg \#CECDC3 # tx +set statusbar-bg \#1C1B1A # bg-2 +set statusbar-fg \#CECDC3 # tx + +set notification-bg \#1C1B1A # bg-2 +set notification-fg \#CECDC3 # tx +set notification-error-bg \#D14D41 # re +set notification-error-fg \#CECDC3 # tx +set notification-warning-bg \#DA702C # or +set notification-warning-fg \#CECDC3 # tx + + +set completion-bg \#1C1B1A # bg-2 +set completion-fg \#878580 # tx-2 +set completion-highlight-fg \#1C1B1A # bg-2 +set completion-highlight-bg \#CECDC3 # tx
\ No newline at end of file diff --git a/zathura/zathurarc b/zathura/zathurarc new file mode 100644 index 0000000..ccaabb1 --- /dev/null +++ b/zathura/zathurarc @@ -0,0 +1 @@ +include flexoki-dark |