diff --git a/Xresources b/Xresources index 85269c9..0c25d9e 100644 --- a/Xresources +++ b/Xresources @@ -11,8 +11,8 @@ Xft.lcdfilter: lcddefault rofi.color-enabled: true urxvt*letterSpace: 0 urxvt*lineSpace: 0 -urxvt*geometry: 120x30 -urxvt.internalBorder: 24 +!! urxvt*geometry: 120x30 +urxvt.internalBorder: 12 urxvt.saveline: 2048 urxvt.scrollBar: false urxvt.scrollBar_right: false @@ -20,4 +20,4 @@ urxvt.urgentOnBell: true urxvt.depth: 32 urxvt.cursorUnderline: true urxvt.cursorBlink: true -urxvt*scrollTtyOutput: false \ No newline at end of file +urxvt*scrollTtyOutput: false diff --git a/emacs b/emacs new file mode 100644 index 0000000..03cc25f --- /dev/null +++ b/emacs @@ -0,0 +1,228 @@ +(require 'package) +(add-to-list 'package-archives + '("melpa" . "http://melpa.org/packages/") t) +(package-initialize) + +(setq-default cursor-type 'bar) +(global-hl-line-mode 1) +(toggle-scroll-bar -1) +(scroll-bar-mode -1) +(menu-bar-mode -1) +(tool-bar-mode -1) +(column-number-mode t) +(set-fringe-mode 5) +(setq doc-view-scale-internally nil) +(setq visible-bell t) +(setq vc-handled-backends nil) +(fset 'yes-or-no-p 'y-or-n-p) +(show-paren-mode t) +(setq show-paren-style 'expression) +(save-place-mode t) +(setq-default indent-tabs-mode nil + tab-width 4) + +(setq custom-file (concat user-emacs-directory "custom.el")) +(load custom-file 'noerror) + +(setq interprogram-cut-function nil) +(setq backup-directory-alist '(("" . "~/.emacs.d/backup"))) + +; lets you move windows with shift +(when (fboundp 'windmove-default-keybindings) + (windmove-default-keybindings)) + +(setq package-check-signature nil) +(defun ensure-package-installed (&rest packages) + "Assure every package is installed, ask for installation if it’s not. + +Return a list of installed packages or nil for every skipped package." + (mapcar + (lambda (package) + ;; (package-installed-p 'evil) + (if (package-installed-p package) + nil + (if (y-or-n-p (format "Package %s is missing. Install it? " package)) + (package-install package) + package))) + packages)) + +(ensure-package-installed 'use-package 'ivy 'centaur-tabs 'company 'all-the-icons 'smex 'counsel 'swiper 'dashboard 'org-super-agenda 'origami 'verb 'org-roam'kaolin-themes) + +(eval-when-compile + (require 'use-package)) + +(use-package all-the-icons) + +(use-package company + :custom + (company-minimum-prefix-length 1) + (company-idle-delay 0.0) + (company-tooltip-align-annotations t) + :config + (global-company-mode) + ) + +(use-package ivy :ensure t + :diminish ivy-mode + :config + (ivy-mode 1) + (setq ivy-height 13) + (setq ivy-wrap t) + (setq ivy-use-virtual-buffers t) + (setq ivy-count-format "(%d/%d) ")) + +(use-package counsel + :ensure t + :bind* + (("M-x" . counsel-M-x) + ("C-c d d" . counsel-descbinds) + ("C-x C-f" . counsel-find-file) + ("C-x r f" . counsel-recentf) + ("C-c g g" . counsel-git) + ("C-c g G" . counsel-git-grep) + ("C-x l" . counsel-locate) + ("C-c g s" . counsel-grep-or-swiper) + ("C-M-y" . counsel-yank-pop) + ("C-c C-r" . ivy-resume) + ("C-c i m" . counsel-imenu) + ("C-c i M" . ivy-imenu-anywhere) + ("C-c d s" . describe-symbol))) + +(use-package swiper + :bind* + (("C-s" . swiper))) +(setq search-default-mode #'char-fold-to-regexp) + +(use-package centaur-tabs + :init + (setq centaur-tabs-enable-key-bindings t + centaur-tabs-set-icons t + centaur-tabs-set-modified-marker t + centaur-tabs-style "chamfer" + centaur-tabs-gray-out-icons 'buffer) + :config + (centaur-tabs-group-by-projectile-project) + (centaur-tabs-headline-match) + (centaur-tabs-mode 1)) + +(use-package dashboard + :after org + :init + (setq dashboard-set-footer nil + dashboard-org-agenda-categories '("Tasks" "appointments") + dashboard-center-content t + dashboard-set-heading-icons t + dashboard-set-file-icons t + initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) + :ensure t + :config (dashboard-setup-startup-hook)) + +(use-package org + :mode ("\\.org\\'" . org-mode) + :bind + (:map org-mode-map + ("C-c C-r" . verb-command-map)) + (:map global-map + ("C-c a" . org-agenda) + ("C-c l" . org-store-link)) + :config + (setq org-replace-disputed-keys t + org-enforce-todo-dependencies t + org-enforce-todo-checkbox-dependencies t + org-log-done nil + org-clock-idle-time 10 + org-startup-with-inline-images t + org-startup-folded t + org-pretty-entities t + org-hide-leading-stars t + org-hide-emphasis-markers t + org-fontify-whole-heading-line t + org-fontify-done-headline t + org-fontify-quote-and-verse-blocks t + org-startup-with-latex-preview t + org-src-tab-acts-natively t + org-src-fontify-natively t + org-confirm-elisp-link-function nil + org-display-custom-times t + org-time-stamp-custom-formats '("<%a %b %e %Y>" . "<%a %b %e %Y %H:%M>") + org-tag-alist '(("bug" . ?b) ("feature" . ?f) ("polish" . ?p) ("optimization" . ?o) ("devops" . ?d) ("reading" . ?r) ("writing" . ?w)) + org-agenda-custom-commands + '(("p" "Projects" todo "TODO" + ((org-agenda-files '("~/Documents/org-mode/projects.org")) + (org-agenda-sorting-strategy '(priority-down))) + )) + org-agenda-skip-scheduled-if-done t + org-agenda-skip-deadline-if-done t + org-agenda-todo-ignore-deadlines t + org-agenda-todo-ignore-with-date t + org-agenda-todo-ignore-scheduled t + org-agenda-start-on-weekday nil + org-agenda-skip-additional-timestamps-same-entry nil + org-agenda-compact-blocks t + org-agenda-block-separator nil + org-agenda-start-day "+0d") + :hook + (org-agenda-mode . origami-mode) + ) + +(use-package org-alert + :ensure t + :config + (org-alert-enable) + (setq alert-default-style 'libnotify + org-alert-notify-cutoff 300 + )) + +(setq org-agenda-files + (list + "~/Documents/org-mode/school.org" + "~/Documents/org-mode/personal.org" + "~/Documents/org-mode/tweaking.org" + "~/Documents/org-mode/projects.org" + ) + ) + +(use-package org-super-agenda + :after org + :ensure t + :config + (setq org-super-agenda-groups + '( + (:auto-category t) + ) + ) + ) + + +;;(use-package org-roam +;; :ensure t +;; :after org +;; :init +;; (setq org-roam-v2-ack t) +;; :bind* (("C-c n l" . org-roam-buffer-toggle) +;; ("C-c n f" . org-roam-node-find) +;; ("C-c n c" . org-roam-dailies-capture-today)) +;; :bind (:map org-mode-map +;; ("C-c n i" . org-roam-node-insert)) +;; :custom +;; (org-roam-directory "~/Documents/slipbox") +;; (org-roam-capture-templates +;; '(("d" "default" plain +;; "%?" +;; :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n") +;; :unnarrowed t) +;; ("e" "encrypted" plain "%?" +;; :target (file+head "${slug}.org.gpg" +;; "#+title: ${title}\n") +;; :unnarrowed t) +;; ) +;; ) +;; (org-roam-completion-everywhere t) +;; (org-roam-completion-system 'default) +;; (org-roam-dailies-directory "daily/") +;; :config +;; (use-package org-roam-dailies) +;; (org-roam-setup) +;; (org-roam-db-autosync-mode)) + +(add-hook 'org-mode-hook 'flyspell-mode) diff --git a/i3/config b/i3/config index be468ed..a4f4126 100644 --- a/i3/config +++ b/i3/config @@ -198,11 +198,15 @@ set_from_resource $UNFOCUS iw3m.color7 client.focused $FOCUS $FOCUS "#FFFFFF" $FOCUS $FOCUS client.urgent $URGENT $URGENT "#FFFFFF" $URGENT $URGENT -for_window [class="^.*"] border pixel 2 +# default colors +client.focused_inactive #333333 #222222 #888888 #292d2e #222222 +client.unfocused #333333 #222222 #888888 #292d2e #222222 + +title_align center +for_window [class="^.*"] border pixel 1 default_floating_border none hide_edge_borders none - -gaps inner 20 -gaps outer 10 +gaps inner 0 +gaps outer 0 exec_always --no-startup-id /home/frosty/.config/polybar/launch.sh diff --git a/nvim/init.lua b/nvim/init.lua index 923a5e6..7f4d71e 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,43 +1,56 @@ -- some basic options local vim = vim -vim.opt.tabstop = 2 -vim.opt.shiftwidth = 2 +vim.opt.tabstop = 4 +vim.opt.shiftwidth = 4 vim.opt.softtabstop = 2 vim.opt.expandtab = true vim.opt.termguicolors = true +vim.opt.autoindent = true vim.opt.smartindent = true +vim.opt.smarttab = true vim.opt.number = true -vim.opt.autochdir = true -vim.opt.hidden = true vim.o.hidden = true vim.o.signcolumn = 'auto' +vim.o.breakindent = true vim.o.smarttab = true +vim.o.errorbells = true vim.o.clipboard = "unnamedplus" vim.g.noswapfile = true vim.cmd [[set mouse=a]] -- enable mouse vim.wo.cursorline = true +vim.opt.hlsearch = false +vim.opt.wrap = true +vim.opt.showmatch = true + +vim.api.nvim_create_user_command('W', 'write', {}) + +vim.opt.foldmethod = "expr" +vim.opt.foldexpr = "nvim_treesitter#foldexpr()" + +-- hit zc to enable folding +vim.o.foldenable = false vim.opt.guifont = "Iosevka Nerd Font:h12" vim.g.neovide_refresh_rate = 140 ---vim.g.coq_settings = { 'auto_start': 'shut-up' } +vim.g.neomake_open_list = 2 function map(mode, shortcut, command) - vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true }) + vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true }) end -- normal mode map function nmap(shortcut, command) - map('n', shortcut, command) + map('n', shortcut, command) end -- insert mode map function imap(shortcut, command) - map('i', shortcut, command) + map('i', shortcut, command) end -- is leader key; default is \ -nmap("v", "CHADopen") +nmap("v", "NvimTreeToggle") nmap("ec", "e ~/.config/nvim/init.lua") nmap("sc", "source ~/.config/nvim/init.lua") @@ -47,44 +60,83 @@ nmap("n", "BufferLineCycleNext") nmap("gb", "BufferLinePick") nmap("w", "bdelete!") +-- toggle terminal in both modes +nmap("t", "FloatermToggle") +map("t", "t", "FloatermToggle") + -- lsp on_attach mappings + +local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) local on_attach = function(client, bufnr) - -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'f', vim.lsp.buf.formatting, bufopts) - require 'illuminate'.on_attach(client) + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap = true, silent = true, buffer = bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'f', vim.lsp.buf.formatting, bufopts) + + require "coq".lsp_ensure_capabilities {} + require 'illuminate'.on_attach(client) + + -- format on save + if client.supports_method("textDocument/formatting") then + + -- get filetype + local filetype = vim.api.nvim_buf_get_option(bufnr, "filetype") + -- get null-ls supported sources + local available = require "null-ls.sources".get_available(filetype, require("null-ls").methods.FORMATTING) + + local enable = false + if #available > 0 then + enable = client.name == "null-ls" + else + enable = not (client.name == "null-ls") + end + + client.resolved_capabilities.document_formatting = enable + client.resolved_capabilities.document_range_formatting = enable + + if client.resolved_capabilities.document_formatting then + vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + buffer = bufnr, + callback = function() + vim.lsp.buf.formatting_sync() + end + }) + end + end end -- lsp config setup -require 'lspconfig'.hls.setup { on_attach = on_attach } -- haskell language server -require 'lspconfig'.pyright.setup {} -require 'lspconfig'.tsserver.setup { on_attach = on_attach } -require 'lspconfig'.sumneko_lua.setup { on_attach = on_attach, - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - } +local lsp = require "lspconfig" +lsp.hls.setup { on_attach = on_attach } -- haskell language server +lsp.pyright.setup { on_attach = on_attach } +lsp.tsserver.setup { on_attach = on_attach } +lsp.rust_analyzer.setup { on_attach = on_attach } +lsp.sumneko_lua.setup { on_attach = on_attach, + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } } - } } -- lsp diagnostic mapping @@ -94,124 +146,127 @@ vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) -vim.cmd("colorscheme nightfox") +vim.cmd("colorscheme carbonfox") -- packer boilerplate local fn = vim.fn local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' if fn.empty(fn.glob(install_path)) > 0 then - packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', - install_path }) + packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', + install_path }) end return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - use 'neovim/nvim-lspconfig' - use { - 'ms-jpq/coq_nvim', - branch = 'coq', - event = "VimEnter", - config = 'vim.cmd[[COQnow]]' - } - use { 'ms-jpq/coq.artifacts', branch = 'artifacts' } - use { - 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate', - config = function() require('nvim-treesitter.configs').setup { - highlight = { - enable = true, - additional_vim_regex_highlighting = { 'org' } - }, - indent = { - enable = true - }, - ensure_installed = { 'org' } - } - end - } - use { 'ms-jpq/chadtree', - branch = 'chad', - run = ':CHADdeps', - } - use { 'ahmedkhalf/project.nvim', config = function() require("project_nvim").setup { - manual_mode = true + use 'wbthomason/packer.nvim' + use 'nvim-lua/plenary.nvim' + use 'neovim/nvim-lspconfig' + use { + 'ms-jpq/coq_nvim', + branch = 'coq', + event = "VimEnter", + config = 'vim.cmd[[COQnow]]' } - end - } - use { - 'akinsho/bufferline.nvim', - tag = "v2.*", - requires = 'kyazdani42/nvim-web-devicons', - config = function() require("bufferline").setup { - options = { - seperator_style = { "slant", "slant" }, - diagnostics = false - } - } - end - } - use { 'windwp/nvim-autopairs' } -- auto close brackets, etc. - use { "EdenEast/nightfox.nvim", - config = function() require("nightfox").setup{} - end - } - use { - "nvim-lualine/lualine.nvim", - event = "VimEnter", - config = function() - require("lualine").setup { - options = { theme = 'auto', globalstatus = true }, - sections = { lualine_x = { 'filetype' } } - } - end, - requires = { 'kyazdani42/nvim-web-devicons', opt = true } - } - use { - "startup-nvim/startup.nvim", - requires = {"nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim"}, - config = function() - require"startup".setup() - end - } - use 'RRethy/vim-illuminate' - use { 'TimUntersberger/neogit', - requires = 'nvim-lua/plenary.nvim', - config = function() require("neogit").setup() - end - } - use { - 'nvim-telescope/telescope.nvim', - requires = { { 'nvim-lua/plenary.nvim' } }, - config = function() - require("telescope").setup {} - require("telescope").load_extension('projects') - end - } - use { - 'nvim-orgmode/orgmode', - config = function() - require('orgmode').setup_ts_grammar() - require('orgmode').setup { - org_agenda_files = { - "~/Documents/org-mode/school.org", - "~/Documents/org-mode/personal.org", - "~/Documents/org-mode/tweaking.org", - "~/Documents/org-mode/projects.org" + use { 'ms-jpq/coq.artifacts', branch = 'artifacts' } + use { 'ms-jpq/coq.thirdparty', branch = '3p' } + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate', + config = function() require('nvim-treesitter.configs').setup { + highlight = { + enable = true + }, + } + end + } + use { 'kyazdani42/nvim-tree.lua', + requires = { + 'kyazdani42/nvim-web-devicons' }, - win_split_mode = 'tabnew', - org_log_done = false, - -- notifications are supported?! emacs just got smoked fr - notifications = { - enabled = true, - cron_enabled = false, -- can set this up to send notifications even when vim is closed - deadline_reminder = true, - scheduled_reminder = true, - reminder_time = { 5, 10, 15 } - } - } + config = function() require('nvim-tree').setup {} end + } + use { + 'jose-elias-alvarez/null-ls.nvim', + config = function() require('null-ls').setup({ + sources = { + require('null-ls').builtins.formatting.eslint_d, + require('null-ls').builtins.diagnostics.eslint_d, + require("null-ls").builtins.code_actions.eslint_d, + require("null-ls").builtins.formatting.black + } + }) + end, + requires = { "nvim-lua/plenary.nvim" }, + } + use { + 'folke/trouble.nvim', + config = function() require("trouble").setup {} + end + } + use { + 'akinsho/bufferline.nvim', + tag = "v2.*", + requires = 'kyazdani42/nvim-web-devicons', + config = function() require("bufferline").setup { + options = { + diagnostics = "nvim_lsp", + } + } + end + } + use { "EdenEast/nightfox.nvim", + config = function() require("nightfox").setup {} + end + } + use { + "nvim-lualine/lualine.nvim", + event = "VimEnter", + config = function() + require("lualine").setup { + options = { theme = 'auto', globalstatus = true }, + sections = { lualine_x = { 'filetype' } } + } + end, + requires = { 'kyazdani42/nvim-web-devicons', opt = true } + } + use { + "startup-nvim/startup.nvim", + requires = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }, + config = function() + require "startup".setup() + end + } + use 'RRethy/vim-illuminate' + use { + 'nvim-telescope/telescope.nvim', + requires = { 'nvim-lua/plenary.nvim' }, + config = function() + require("telescope").setup {} + end + } + use { + 'j-hui/fidget.nvim', + config = function() + require('fidget').setup {} + end + } + use 'voldikss/vim-floaterm' + use { + 'kkoomen/vim-doge', + run = ':call doge#install()' + } + use { 'norcalli/nvim-colorizer.lua', + config = function() require('colorizer').setup { + 'css'; + 'javascript'; + } + end, + } + use { 'lewis6991/gitsigns.nvim', + config = function() + require('gitsigns').setup() + end + } + if packer_bootstrap then + require('packer').sync() end - } - if packer_bootstrap then - require('packer').sync() - end end) diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua index cdb0d70..9e48c83 100644 --- a/nvim/plugin/packer_compiled.lua +++ b/nvim/plugin/packer_compiled.lua @@ -70,21 +70,21 @@ time([[try_loadstring definition]], false) time([[Defining packer_plugins]], true) _G.packer_plugins = { ["bufferline.nvim"] = { - config = { "\27LJ\2\n‡\1\0\0\5\0\b\0\v6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\6\0005\3\4\0005\4\3\0=\4\5\3=\3\a\2B\0\2\1K\0\1\0\foptions\1\0\0\20seperator_style\1\0\1\16diagnostics\1\1\3\0\0\nslant\nslant\nsetup\15bufferline\frequire\0" }, + config = { "\27LJ\2\ng\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\foptions\1\0\0\1\0\1\16diagnostics\rnvim_lsp\nsetup\15bufferline\frequire\0" }, loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/bufferline.nvim", url = "https://github.com/akinsho/bufferline.nvim" }, - chadtree = { - loaded = true, - path = "/home/frosty/.local/share/nvim/site/pack/packer/start/chadtree", - url = "https://github.com/ms-jpq/chadtree" - }, ["coq.artifacts"] = { loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/coq.artifacts", url = "https://github.com/ms-jpq/coq.artifacts" }, + ["coq.thirdparty"] = { + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/coq.thirdparty", + url = "https://github.com/ms-jpq/coq.thirdparty" + }, coq_nvim = { config = { "vim.cmd[[COQnow]]" }, loaded = false, @@ -93,6 +93,18 @@ _G.packer_plugins = { path = "/home/frosty/.local/share/nvim/site/pack/packer/opt/coq_nvim", url = "https://github.com/ms-jpq/coq_nvim" }, + ["fidget.nvim"] = { + config = { "\27LJ\2\n8\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\vfidget\frequire\0" }, + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/fidget.nvim", + url = "https://github.com/j-hui/fidget.nvim" + }, + ["gitsigns.nvim"] = { + config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0" }, + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + url = "https://github.com/lewis6991/gitsigns.nvim" + }, ["lualine.nvim"] = { config = { "\27LJ\2\n›\1\0\0\5\0\n\0\r6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\0025\3\a\0005\4\6\0=\4\b\3=\3\t\2B\0\2\1K\0\1\0\rsections\14lualine_x\1\0\0\1\2\0\0\rfiletype\foptions\1\0\0\1\0\2\ntheme\tauto\17globalstatus\2\nsetup\flualine\frequire\0" }, loaded = false, @@ -101,30 +113,37 @@ _G.packer_plugins = { path = "/home/frosty/.local/share/nvim/site/pack/packer/opt/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, - neogit = { - config = { "\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vneogit\frequire\0" }, - loaded = true, - path = "/home/frosty/.local/share/nvim/site/pack/packer/start/neogit", - url = "https://github.com/TimUntersberger/neogit" - }, ["nightfox.nvim"] = { config = { "\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rnightfox\frequire\0" }, loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/nightfox.nvim", url = "https://github.com/EdenEast/nightfox.nvim" }, - ["nvim-autopairs"] = { + ["null-ls.nvim"] = { + config = { "\27LJ\2\nø\1\0\0\a\0\v\0%6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\t\0004\3\5\0006\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\4\0049\4\5\4>\4\1\0036\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\6\0049\4\5\4>\4\2\0036\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\a\0049\4\5\4>\4\3\0036\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\4\0049\4\b\4>\4\4\3=\3\n\2B\0\2\1K\0\1\0\fsources\1\0\0\nblack\17code_actions\16diagnostics\reslint_d\15formatting\rbuiltins\nsetup\fnull-ls\frequire\0" }, + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/null-ls.nvim", + url = "https://github.com/jose-elias-alvarez/null-ls.nvim" + }, + ["nvim-colorizer.lua"] = { + config = { "\27LJ\2\nN\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\3\0\0\bcss\15javascript\nsetup\14colorizer\frequire\0" }, loaded = true, - path = "/home/frosty/.local/share/nvim/site/pack/packer/start/nvim-autopairs", - url = "https://github.com/windwp/nvim-autopairs" + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua", + url = "https://github.com/norcalli/nvim-colorizer.lua" }, ["nvim-lspconfig"] = { loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, + ["nvim-tree.lua"] = { + config = { "\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14nvim-tree\frequire\0" }, + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", + url = "https://github.com/kyazdani42/nvim-tree.lua" + }, ["nvim-treesitter"] = { - config = { "\27LJ\2\nÖ\1\0\0\5\0\f\0\0156\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\6\0005\3\3\0005\4\4\0=\4\5\3=\3\a\0025\3\b\0=\3\t\0025\3\n\0=\3\v\2B\0\2\1K\0\1\0\21ensure_installed\1\2\0\0\borg\vindent\1\0\1\venable\2\14highlight\1\0\0&additional_vim_regex_highlighting\1\2\0\0\borg\1\0\1\venable\2\nsetup\28nvim-treesitter.configs\frequire\0" }, + config = { "\27LJ\2\ni\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\14highlight\1\0\0\1\0\1\venable\2\nsetup\28nvim-treesitter.configs\frequire\0" }, loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" @@ -134,12 +153,6 @@ _G.packer_plugins = { path = "/home/frosty/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/kyazdani42/nvim-web-devicons" }, - orgmode = { - config = { "\27LJ\2\nŸ\3\0\0\5\0\v\0\0186\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\1\0B\0\2\0029\0\3\0005\2\5\0005\3\4\0=\3\6\0025\3\a\0005\4\b\0=\4\t\3=\3\n\2B\0\2\1K\0\1\0\18notifications\18reminder_time\1\4\0\0\3\5\3\n\3\15\1\0\4\23scheduled_reminder\2\22deadline_reminder\2\17cron_enabled\1\fenabled\2\21org_agenda_files\1\0\2\19win_split_mode\vtabnew\17org_log_done\1\1\5\0\0$~/Documents/org-mode/school.org&~/Documents/org-mode/personal.org&~/Documents/org-mode/tweaking.org&~/Documents/org-mode/projects.org\nsetup\21setup_ts_grammar\forgmode\frequire\0" }, - loaded = true, - path = "/home/frosty/.local/share/nvim/site/pack/packer/start/orgmode", - url = "https://github.com/nvim-orgmode/orgmode" - }, ["packer.nvim"] = { loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/packer.nvim", @@ -150,12 +163,6 @@ _G.packer_plugins = { path = "/home/frosty/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, - ["project.nvim"] = { - config = { "\27LJ\2\nN\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\16manual_mode\2\nsetup\17project_nvim\frequire\0" }, - loaded = true, - path = "/home/frosty/.local/share/nvim/site/pack/packer/start/project.nvim", - url = "https://github.com/ahmedkhalf/project.nvim" - }, ["startup.nvim"] = { config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fstartup\frequire\0" }, loaded = true, @@ -163,11 +170,27 @@ _G.packer_plugins = { url = "https://github.com/startup-nvim/startup.nvim" }, ["telescope.nvim"] = { - config = { "\27LJ\2\nk\0\0\3\0\5\0\r6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\0016\0\0\0'\2\1\0B\0\2\0029\0\3\0'\2\4\0B\0\2\1K\0\1\0\rprojects\19load_extension\nsetup\14telescope\frequire\0" }, + config = { "\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14telescope\frequire\0" }, loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, + ["trouble.nvim"] = { + config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0" }, + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/trouble.nvim", + url = "https://github.com/folke/trouble.nvim" + }, + ["vim-doge"] = { + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/vim-doge", + url = "https://github.com/kkoomen/vim-doge" + }, + ["vim-floaterm"] = { + loaded = true, + path = "/home/frosty/.local/share/nvim/site/pack/packer/start/vim-floaterm", + url = "https://github.com/voldikss/vim-floaterm" + }, ["vim-illuminate"] = { loaded = true, path = "/home/frosty/.local/share/nvim/site/pack/packer/start/vim-illuminate", @@ -176,37 +199,49 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: orgmode -time([[Config for orgmode]], true) -try_loadstring("\27LJ\2\nŸ\3\0\0\5\0\v\0\0186\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\1\0B\0\2\0029\0\3\0005\2\5\0005\3\4\0=\3\6\0025\3\a\0005\4\b\0=\4\t\3=\3\n\2B\0\2\1K\0\1\0\18notifications\18reminder_time\1\4\0\0\3\5\3\n\3\15\1\0\4\23scheduled_reminder\2\22deadline_reminder\2\17cron_enabled\1\fenabled\2\21org_agenda_files\1\0\2\19win_split_mode\vtabnew\17org_log_done\1\1\5\0\0$~/Documents/org-mode/school.org&~/Documents/org-mode/personal.org&~/Documents/org-mode/tweaking.org&~/Documents/org-mode/projects.org\nsetup\21setup_ts_grammar\forgmode\frequire\0", "config", "orgmode") -time([[Config for orgmode]], false) --- Config for: nightfox.nvim -time([[Config for nightfox.nvim]], true) -try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rnightfox\frequire\0", "config", "nightfox.nvim") -time([[Config for nightfox.nvim]], false) --- Config for: project.nvim -time([[Config for project.nvim]], true) -try_loadstring("\27LJ\2\nN\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\16manual_mode\2\nsetup\17project_nvim\frequire\0", "config", "project.nvim") -time([[Config for project.nvim]], false) --- Config for: neogit -time([[Config for neogit]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vneogit\frequire\0", "config", "neogit") -time([[Config for neogit]], false) +-- Config for: null-ls.nvim +time([[Config for null-ls.nvim]], true) +try_loadstring("\27LJ\2\nø\1\0\0\a\0\v\0%6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\t\0004\3\5\0006\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\4\0049\4\5\4>\4\1\0036\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\6\0049\4\5\4>\4\2\0036\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\a\0049\4\5\4>\4\3\0036\4\0\0'\6\1\0B\4\2\0029\4\3\0049\4\4\0049\4\b\4>\4\4\3=\3\n\2B\0\2\1K\0\1\0\fsources\1\0\0\nblack\17code_actions\16diagnostics\reslint_d\15formatting\rbuiltins\nsetup\fnull-ls\frequire\0", "config", "null-ls.nvim") +time([[Config for null-ls.nvim]], false) +-- Config for: trouble.nvim +time([[Config for trouble.nvim]], true) +try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") +time([[Config for trouble.nvim]], false) +-- Config for: nvim-colorizer.lua +time([[Config for nvim-colorizer.lua]], true) +try_loadstring("\27LJ\2\nN\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\3\0\0\bcss\15javascript\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua") +time([[Config for nvim-colorizer.lua]], false) -- Config for: bufferline.nvim time([[Config for bufferline.nvim]], true) -try_loadstring("\27LJ\2\n‡\1\0\0\5\0\b\0\v6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\6\0005\3\4\0005\4\3\0=\4\5\3=\3\a\2B\0\2\1K\0\1\0\foptions\1\0\0\20seperator_style\1\0\1\16diagnostics\1\1\3\0\0\nslant\nslant\nsetup\15bufferline\frequire\0", "config", "bufferline.nvim") +try_loadstring("\27LJ\2\ng\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\foptions\1\0\0\1\0\1\16diagnostics\rnvim_lsp\nsetup\15bufferline\frequire\0", "config", "bufferline.nvim") time([[Config for bufferline.nvim]], false) -- Config for: nvim-treesitter time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\nÖ\1\0\0\5\0\f\0\0156\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\6\0005\3\3\0005\4\4\0=\4\5\3=\3\a\0025\3\b\0=\3\t\0025\3\n\0=\3\v\2B\0\2\1K\0\1\0\21ensure_installed\1\2\0\0\borg\vindent\1\0\1\venable\2\14highlight\1\0\0&additional_vim_regex_highlighting\1\2\0\0\borg\1\0\1\venable\2\nsetup\28nvim-treesitter.configs\frequire\0", "config", "nvim-treesitter") +try_loadstring("\27LJ\2\ni\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\14highlight\1\0\0\1\0\1\venable\2\nsetup\28nvim-treesitter.configs\frequire\0", "config", "nvim-treesitter") time([[Config for nvim-treesitter]], false) +-- Config for: gitsigns.nvim +time([[Config for gitsigns.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim") +time([[Config for gitsigns.nvim]], false) -- Config for: startup.nvim time([[Config for startup.nvim]], true) try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fstartup\frequire\0", "config", "startup.nvim") time([[Config for startup.nvim]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14nvim-tree\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) +-- Config for: nightfox.nvim +time([[Config for nightfox.nvim]], true) +try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\rnightfox\frequire\0", "config", "nightfox.nvim") +time([[Config for nightfox.nvim]], false) +-- Config for: fidget.nvim +time([[Config for fidget.nvim]], true) +try_loadstring("\27LJ\2\n8\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\vfidget\frequire\0", "config", "fidget.nvim") +time([[Config for fidget.nvim]], false) -- Config for: telescope.nvim time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\nk\0\0\3\0\5\0\r6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\0016\0\0\0'\2\1\0B\0\2\0029\0\3\0'\2\4\0B\0\2\1K\0\1\0\rprojects\19load_extension\nsetup\14telescope\frequire\0", "config", "telescope.nvim") +try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14telescope\frequire\0", "config", "telescope.nvim") time([[Config for telescope.nvim]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] diff --git a/polybar/config.ini b/polybar/config.ini index ba0e8af..cefe294 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -35,7 +35,7 @@ bottom = true offset-x = 0 offset-y = 0 radius = 0.0 -fixed-center = false +fixed-center = true background = ${colors.background} foreground = ${colors.foreground} @@ -47,18 +47,18 @@ border-size = 0 border-color = #00000000 padding-left = 0 -padding-right = 2 +padding-right = 1 -module-margin-left = 1 -module-margin-right = 2 +module-margin-left = 0 +module-margin-right = 1 -font-0 = Noto Sans:style=Regular:size=11;1 +font-0 = Hack:style=Regular:size=11;1 font-1 = unifont:style=Regular:size=11;0 font-2 = siji:style=Regular:size=11;1 modules-left = i3 -modules-center = -modules-right = cpu memory wlan pulseaudio date battery +modules-center = date +modules-right = cpu memory wlan pulseaudio battery tray-position = right tray-padding = 2 @@ -96,7 +96,7 @@ label-mode-background = ${colors.primary} ; focused = Active workspace on focused monitor label-focused = %index% label-focused-background = ${colors.background-alt} -label-focused-underline= +label-focused-underline= label-focused-padding = 2 ; unfocused = Inactive workspace on any monitor @@ -120,7 +120,7 @@ label-urgent-padding = 2 [module/cpu] type = internal/cpu interval = 2 -format-prefix = "CPU: " +format-prefix = "CPU:" format-prefix-foreground = ${xrdb:color7} format-underline = label = %percentage:2%% @@ -128,7 +128,7 @@ label = %percentage:2%% [module/memory] type = internal/memory interval = 2 -format-prefix = " " +format-prefix = "" format-prefix-foreground = ${xrdb:color7} format-underline = label = %gb_used% | %gb_free% @@ -138,7 +138,7 @@ type = internal/network interface = wlan0 interval = 3.0 -format-connected = +format-connected = format-connected-underline = label-connected = %essid% label-disconnected = "No connection" @@ -164,7 +164,7 @@ date-alt = " %D" time = %I:%M:%S %p time-alt = %I:%M:%S %p -format-prefix =  +format-prefix = format-prefix-foreground = ${colors.foreground-alt} format-underline = @@ -203,7 +203,7 @@ battery = BAT1 adapter = ADP1 full-at = 98 -label-full = "🔋" +label-full = "" format-charging = format-charging-underline = #ffb52a @@ -234,7 +234,7 @@ animation-discharging-framerate = 750 [settings] -screenchange-reload = false +screenchange-reload = true ;compositing-background = xor compositing-background = screen ;compositing-foreground = source diff --git a/zshrc b/zshrc index b1dc6be..e23c29b 100644 --- a/zshrc +++ b/zshrc @@ -17,7 +17,7 @@ source $ZSH/oh-my-zsh.sh export LANG=en_US.UTF-8 #LAMMPS path variables -export PATH=home/frosty/Programs/Python/NeoMDWeb/lammps/install/bin:$PATH +export PATH=/home/frosty/Programs/Python/NeoMDWeb/lammps/install/bin:$PATH #export PYTHONPATH=/home/frosty/Apps/lammps/install/python:$PYTHONPATH export LD_LIBRARY_PATH=/home/frosty/Programs/Python/NeoMDWeb/lammps/install/lib:$LD_LIBRARY_PATH #export SLEPC_DIR=/opt/slepc/linux-c-opt @@ -70,9 +70,6 @@ SAVEHIST=1000 bindkey -v # bind keys to vim mode eval "$(zoxide init zsh)" - -#PROMPT='%n@%m %B%F{240}%1~%f%b > ' - - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +path+=('/home/frosty/.local/bin') +export PATH [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh