diff options
| -rw-r--r-- | .bashrc | 5 | ||||
| -rw-r--r-- | .config/konsolerc | 10 | ||||
| -rw-r--r-- | .config/mpv/mpv.conf | 1 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 203 | ||||
| -rw-r--r-- | .emacs | 4 | ||||
| -rw-r--r-- | .emacs.d/config.org | 147 | ||||
| -rw-r--r-- | .emacs.d/themes/materia-theme.el | 90 | ||||
| -rw-r--r-- | .local/share/konsole/MateriaDark.colorscheme | 100 | ||||
| -rw-r--r-- | .local/share/konsole/drnuget.profile | 12 | ||||
| -rw-r--r-- | .tmux.conf | 4 |
10 files changed, 549 insertions, 27 deletions
@@ -17,6 +17,11 @@ alias grep="grep --color=auto" alias vrc="vim $HOME/.config/nvim/init.lua" +alias mn="udisksctl mount -b" +alias um="udisksctl unmount -b" + +alias objdump="objdump --disassembler-color=on" + #Arch default PS1: PS1="[\u@\h \W]\$ " diff --git a/.config/konsolerc b/.config/konsolerc new file mode 100644 index 0000000..8883cd1 --- /dev/null +++ b/.config/konsolerc @@ -0,0 +1,10 @@ +MenuBar=Disabled + +[Desktop Entry] +DefaultProfile=drnuget.profile + +[General] +ConfigVersion=1 + +[UiSettings] +ColorScheme= diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf new file mode 100644 index 0000000..d2dfe9e --- /dev/null +++ b/.config/mpv/mpv.conf @@ -0,0 +1 @@ +script-opts=ytdl_hook-ytdl_path=/usr/bin/yt-dlp diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 86800d7..24e4f78 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,5 +1,6 @@ -vim.cmd([[ +vim.cmd([=[ set nu + set rnu set smarttab set tabstop=4 set shiftwidth=4 @@ -7,43 +8,97 @@ vim.cmd([[ set autoindent filetype plugin indent on - colorscheme vim - set notermguicolors + set guicursor=n-v-c-i:block + + set nohlsearch set splitbelow splitright + " PIO filetype + autocmd BufRead,BufNewFile *.pio set filetype=pio + " Insert mode hjkl inoremap <C-h> <left> inoremap <C-j> <down> inoremap <C-k> <up> inoremap <C-l> <right> - " Command mode hjkl - cnoremap <C-h> <left> - cnoremap <C-j> <down> - cnoremap <C-k> <up> - cnoremap <C-l> <right> + let mapleader = " " - nnoremap <space> : + nnoremap <leader>r :luafile $MYVIMRC<enter> + nnoremap <leader>vrc :e $MYVIMRC<enter> nnoremap <leader>o o<esc> nnoremap <leader>O O<esc> - nnoremap <leader>t :NvimTreeOpen<enter> + " fzf settings + let fzf_size = "20%" + nnoremap <leader>ff :call fzf#run({"sink": "e", "down": fzf_size})<enter> + nnoremap <leader>fv :call fzf#run({"sink": "vsp", "down": fzf_size})<enter> + nnoremap <leader>fs :call fzf#run({"sink": "sp", "down": fzf_size})<enter> + nnoremap <leader>fd :call fzf#run({"sink": "e", "down": fzf_size, "dir": input("directory: ")})<enter> + + nnoremap <tab> <esc>/<++><enter>ca< + + " Buffer keybinds + nnoremap <leader>b :bn<enter> + nnoremap <leader>B :bp<enter> + + " Org mode keybinds + nnoremap <leader>ww :e ~/orgfiles/index.org<enter> + nnoremap <leader>wr :e ~/orgfiles/refile.org<enter> + + " Default to commandline in command mode + nnoremap : :<C-f>A + + " Keep cursor at center of screen while scrolling + nnoremap <C-d> <C-d>zz + nnoremap <C-u> <C-u>zz + + " Map escape+space key to exit insert mode in a terminal buffer + tnoremap <esc><space> <C-\><C-n> - nnoremap <tab> <esc>/<++><enter>vf>di + " Theme overrides + autocmd ColorScheme * highlight Normal guibg=NONE ctermbg=NONE + autocmd ColorScheme * highlight NormalNC guibg=NONE ctermbg=NONE + autocmd ColorScheme * highlight LineNrAbove guifg=gray ctermfg=gray cterm=bold gui=bold + autocmd ColorScheme * highlight LineNrBelow guifg=gray ctermfg=gray cterm=bold gui=bold + autocmd ColorScheme * highlight LineNr guifg=white ctermfg=white cterm=bold gui=bold + + " Automatically strip trailing whitespace when saving + autocmd BufWritePre * lua strip_whitespace() + + autocmd BufRead,BufNewFile *.vht setfiletype vhdl + + " VHDL Macros + autocmd Filetype vhdl inoremap if<tab> if () then<enter>end if;<esc><<k0f)i + autocmd Filetype vhdl inoremap re<tab> rising_edge()<esc>i + autocmd Filetype vhdl inoremap sr<tab> shift_right()<left> + autocmd Filetype vhdl inoremap sl<tab> shift_left()<left> + autocmd Filetype vhdl inoremap pr<tab> process() is<enter>begin<enter><++><enter>end process;<esc>3k0f)i + autocmd Filetype vhdl inoremap for<tab> for in <++> to <++> loop<enter>end loop;<esc><<k2bf a + autocmd Filetype vhdl inoremap iv<tab> std_logic_vector(to_unsigned(, <++>))<esc>F,i + autocmd Filetype vhdl inoremap vi<tab> to_integer(unsigned())<esc>hi + autocmd Filetype vhdl inoremap uv<tab> std_logic_vector()<esc>i + autocmd Filetype vhdl inoremap vu<tab> unsigned()<esc>i + autocmd Filetype vhdl inoremap iu<tab> to_unsigned(, <++>)<esc>F,i + autocmd Filetype vhdl inoremap ui<tab> to_integer()<esc>i + autocmd Filetype vhdl inoremap im<tab> library ieee;<enter>use ieee.std_logic_1164.all;<enter>use ieee.numeric_std.all;<enter><enter>entity <++> is<enter>port (<enter>);<enter>end <++>;<enter><enter>architecture <++> of <++> is<enter>begin<enter>end architecture;<esc>:%s/<++>//g<left><left> + + " Assembly Macros + autocmd Filetype asm inoremap im<tab> .global _start<enter>_start:<enter> - " Vim Wiki Macros - autocmd Filetype vimwiki inoremap m<tab> -<space>[<space>]<space> - autocmd Filetype vimwiki inoremap h<tab> ==<left> - autocmd Filetype vimwiki inoremap hh<tab> ====<left><left> - " C Macros - autocmd Filetype c inoremap im<tab> int<space>main()<enter>{<enter><enter>return<space>0;<enter>}<up><up><tab> - autocmd Filetype c inoremap i<tab> #include<space><><left> - autocmd Filetype c inoremap w<tab> while()<space>{<enter>}<esc>ke2li - autocmd Filetype c inoremap f<tab> for(;;)<space>{<enter>}<esc>ke2li - autocmd Filetype c inoremap s<tab> switch()<space>{<enter>}<esc>ke2li + autocmd Filetype c,c++,arduino inoremap im<tab> int main()<enter>{<enter><enter>return 0;<enter>}<up><up><tab> + autocmd Filetype c,c++,arduino inoremap inc<tab> #include <><left> + autocmd Filetype c,c++,arduino inoremap Inc<tab> #include ""<left> + autocmd Filetype c,c++,arduino inoremap while<tab> while () {<enter>}<esc>k0f(a + autocmd Filetype c,c++,arduino inoremap for<tab> for (;;) {<enter>}<esc>k0f(a + autocmd Filetype c,c++,arduino inoremap fori<tab> for (int i=0;i<;i++) {<enter>}<esc>k0f<a + autocmd Filetype c,c++,arduino inoremap switch<tab> switch () {<enter>}<esc>k0f(a + autocmd Filetype c,c++,arduino inoremap if<tab> if () {<enter>}<esc>kf)i + autocmd Filetype c,c++,arduino inoremap eli<tab> else if () {<enter>}<esc>kf)i + autocmd Filetype c,c++,arduino inoremap el<tab> else {<enter>}<esc>ko " HTML Macros autocmd Filetype html,php inoremap im<tab> <!DOCTYPE html><enter><html><enter><body><enter><enter></body><enter></html><up><up><tab><tab> @@ -73,8 +128,14 @@ vim.cmd([[ autocmd Filetype tex inoremap nc<tab> \newcounter{}<enter>\forloop{}{}{\value{}}{<enter>}<esc>kkf}i autocmd Filetype tex inoremap fl<tab> <esc>0f{lvf}hyj0f{p/\\value{<enter>f{pl:noh<enter>a autocmd Filetype tex inoremap ut<tab> \usetikzlibrary{}<left> - autocmd Filetype tex inoremap ts<tab> \tikzstyle{}<space>=<space>[<++>]<esc>0f{a -]]) + autocmd Filetype tex inoremap ts<tab> \tikzstyle{} = [<++>]<esc>0f{a +]=]) + +function strip_whitespace() + local cursor_pos = vim.fn.getpos(".") + vim.cmd([[%s/\s*$//g]]) + vim.fn.setpos(".", cursor_pos) +end vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 @@ -83,6 +144,11 @@ vim.g.calendar_monday = 1 vim.g.calendar_weeknm = 5 vim.g.tex_flavor = 'latex' +vim.g.python_recommended_style = 0 + +vim.opt.conceallevel = 2 +vim.opt.concealcursor = 'nc' + local function bootstrap_pckr() local pckr_path = vim.fn.stdpath("data") .. "/pckr/pckr.nvim" @@ -127,15 +193,98 @@ require("pckr").add{ end }, { - "nvim-tree/nvim-tree.lua", + "nvim-treesitter/nvim-treesitter", + run = ":TSUpdate", config = function() - require("nvim-tree").setup() + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "c", + "lua", + "groovy", + "latex", + "comment" + }, + sync_install = false, + auto_install = true, + highlight = { + enable = true, + disable = {"latex"} + } + }) end }, { - "vimwiki/vimwiki" + "neovim/nvim-lspconfig", + config = function() + vim.lsp.config("clangd", { + filetypes = {"c"}, + root_markers = {".clangd", "compile_commands.json"} + }) + vim.lsp.enable("clangd") + end + }, + { + "loctvl842/monokai-pro.nvim", + config = function() + require("monokai-pro").setup({ + transparent_background = true, + terminal_colors = true, + devicons = true, + styles = { + comment = { italic = false }, + keyword = { italic = false }, + type = { italic = false }, + storageclass = { italic = false }, + structure = { italic = false }, + parameter = { italic = false }, + annotation = { italic = false }, + tag_attribute = { italic = false } + }, + filter = "pro", + inc_search = "background", + background_clear = { + "toggleterm", + "telescope", + "nvim-tree", + "renamer", + "notify", + }, + plugins = { + bufferline = { + underline_selected = false, + underline_visible = false, + }, + indent_blankline = { + context_highlight = "default", + context_start_underline = false, + }, + } + }) + end + }, + { + "nvim-orgmode/orgmode", + config = function() + require("orgmode").setup({ + org_agenda_files = "~/orgfiles/*", + org_default_notes_file = "~/orgfiles/refile.org", + org_adapt_indentation = true, + org_capture_templates = { + t = { description = 'Task', template = '\n* TODO %?\n %u' } + } + }) + end + }, + { + "chipsenkbeil/org-roam.nvim" }, { - "mattn/calendar-vim" + "mikebentley15/vim-pio" + }, + { + "blazkowolf/gruber-darker.nvim", + config = function() + vim.cmd("colo gruber-darker") + end } } @@ -0,0 +1,4 @@ +(org-babel-load-file + (expand-file-name + "config.org" + user-emacs-directory)) diff --git a/.emacs.d/config.org b/.emacs.d/config.org new file mode 100644 index 0000000..afe20e6 --- /dev/null +++ b/.emacs.d/config.org @@ -0,0 +1,147 @@ +#+TITLE: DrNuget's Emacs config +#+AUTHOR: DrNuget +#+STARTUP: showeverything + +* Disable redundant ui elements + +#+begin_src emacs-lisp + +(tool-bar-mode -1) +(menu-bar-mode -1) +(scroll-bar-mode -1) + +(setq ring-bell-function 'ignore) + + +#+end_src + +* Enabled modes + +#+begin_src emacs-lisp + +(ido-mode 1) +(electric-pair-mode 1) + +#+end_src + +* Line numbering + +#+begin_src emacs-lisp + +(defun line-number-hook () + (setq display-line-numbers-type 'relative) + (display-line-numbers-mode +1) + ) +(add-hook 'text-mode-hook 'line-number-hook) +(add-hook 'prog-mode-hook 'line-number-hook) + +#+end_src + +* Indentation + +#+begin_src emacs-lisp + +(setq-default indent-tabs-mode t) +(setq-default tab-width 4) +(setq indent-line-function 'insert-tab) + +#+end_src + +* Autopairs + +#+begin_src emacs-lisp + +(setq electric-pair-pairs + '( + (?\" . ?\") + (?\{ . ?\}) + (?\( . ?\)) + (?\[ . ?\]) + (?\' . ?\') + )) + +#+end_src + +* MELPA + +#+begin_src emacs-lisp + +(require 'package) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) +;; Comment/uncomment this line to enable MELPA Stable if desired. See `package-archive-priorities` +;; and `package-pinned-packages`. Most users will not need or want to do this. +;;(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t) +(package-initialize) + +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(custom-safe-themes + '("f222c303b514c79fb79c3907a34102f888d6b473a4367c6366a9f10142bf0297" + "cb86bb04d8c43cb305fa8456e5ebbf278a53a828cf5a1584b25775bf6e3e0c05" + "a3ca3e616433bea2d6060672701f12caefb8aff9cfdb20923fbbec8efb4e8024" + "2eda8a24f66e6a1a4ebe8445c3bdcc2edb521234c475dabe1e037867a7650094" + "85af9fd7eabcbf051ddbcdfd13c8874e3e8483e879614a56ae6f5c190517a069" + default)) + '(package-selected-packages '(## org-modern power-mode tree-sitter vterm))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) + +#+end_src + +* VTerm + +#+begin_src emacs-lisp + +(use-package vterm + :ensure t) + +#+end_src + +* Load custom theme + +#+begin_src emacs-lisp + +(add-to-list 'custom-theme-load-path "~/.emacs.d/themes") +(load-theme 'materia :no-confirm) + +(setq font-lock-maximum-decoration t) +(setq inhibit-startup-screen t) + +#+end_src + +* Settings to make Emacs look more like the terminal + +#+begin_src emacs-lisp + +; (modify-all-frames-parameters '((alpha-background . 80))) +(set-frame-font "Hack-9" nil t) + +(setq-default line-spacing 0) + +#+end_src + + +* Tree sitter settings + +#+begin_src emacs-lisp + +(global-tree-sitter-mode) + +#+end_src + +* ORG Mode + +#+begin_src emacs-lisp + +(use-package org) + +(setq org-hide-emphasis-markers t) + +#+end_src diff --git a/.emacs.d/themes/materia-theme.el b/.emacs.d/themes/materia-theme.el new file mode 100644 index 0000000..d59c043 --- /dev/null +++ b/.emacs.d/themes/materia-theme.el @@ -0,0 +1,90 @@ +(deftheme materia "Materia/Monokai Dark") +(defun materia--face (name &rest args) + (list name `((t, args)))) + +(let ((bg "#121212") + (fg "#dfdfdf") + (black "#474747") + (red "#f44336") + (green "#4caf50") + (yellow "#ff9800") + (blue "#1a73e8") + (purple "#9c27b0") + (cyan "#0097a7") + (white "#ffffff") + + (monokai-dark2 "#19181a") + (monokai-dark1 "#221f22") + (monokai-accent1 "#ff6188") ;; Red + (monokai-accent2 "#fc9867") ;; Light orange + (monokai-accent3 "#ffd866") ;; Yellow + (monokai-accent4 "#a9dc76") ;; Green + (monokai-accent5 "#78dce8") ;; Light blue + (monokai-accent6 "#ab9df2") ;; Light purple + (monokai-dimmed1 "#c1c0c0") + (monokai-dimmed2 "#939293") + (monokai-dimmed3 "#727072") + (monokai-dimmed4 "#5b595c") + (monokai-dimmed5 "#403e41") + ) + +(custom-theme-set-faces 'materia + (materia--face 'default :background bg :foreground fg) + (materia--face 'vertical-border :inherit 'default) + (materia--face 'fringe :inherit 'default) + (materia--face 'cursor :inherit 'default) + (materia--face 'bold :inherit 'default :bold t) + (materia--face 'italic :inherit 'default) + (materia--face 'bold-italic :inherit 'default :bold t) + (materia--face 'region :foreground bg :background fg) + (materia--face 'underline :inherit 'default) + (materia--face 'custom-face-tag :inherit 'default) + (materia--face 'custom-state :inherit 'default) + + ;; ORG Mode + (materia--face 'org-level-1 :foreground monokai-accent1) + (materia--face 'org-level-2 :foreground monokai-accent2) + (materia--face 'org-level-3 :foreground monokai-accent3) + (materia--face 'org-level-4 :foreground monokai-accent4) + (materia--face 'org-level-5 :foreground monokai-accent5) + (materia--face 'org-level-6 :foreground monokai-accent6) + ;; (materia--face 'org-block :foreground fg :background black) + + ;; Mode line + (materia--face 'mode-line :background cyan :foreground white) + (materia--face 'mode-line-inactive :bacground black :foreground white) + + ;; Line numbers + (materia--face 'line-number :background bg :foreground white) + + ;; Syntax highlighting + (materia--face 'font-lock-comment-face :background bg :foreground monokai-dimmed2) + (materia--face 'font-lock-keyword-face :background bg :foreground monokai-accent1) + (materia--face 'font-lock-string-face :background bg :foreground monokai-accent3) + (materia--face 'font-lock-bracket-face :background bg :foreground monokai-accent1) + (materia--face 'font-lock-type-face :background bg :foreground monokai-accent5) + (materia--face 'font-lock-function-name-face :background bg :foreground monokai-accent4) + (materia--face 'font-lock-operator-face :background bg :foreground monokai-accent1) + (materia--face 'font-lock-variable-name-face :background bg :foreground monokai-accent2) + (materia--face 'font-lock-builtin-face :background bg :foreground monokai-accent1) + (materia--face 'font-lock-number-face :background bg :foreground monokai-accent6) + + ;; VTerm colors + (materia--face 'vterm-color-white :background white :foreground white) + (materia--face 'vterm-color-black :background black :foreground black) + (materia--face 'vterm-color-red :background red :foreground red) + (materia--face 'vterm-color-green :background green :foreground green) + (materia--face 'vterm-color-yellow :background yellow :foreground yellow) + (materia--face 'vterm-color-blue :background blue :foreground blue) + (materia--face 'vterm-color-magenta :background purple :foreground purple) + (materia--face 'vterm-color-cyan :background cyan :foreground cyan) + + (materia--face 'vterm-color-bright-black :background black :foreground black) + (materia--face 'vterm-color-bright-red :background red :foreground red) + (materia--face 'vterm-color-bright-green :background green :foreground green) + (materia--face 'vterm-color-bright-yellow :background yellow :foreground yellow) + (materia--face 'vterm-color-bright-blue :background blue :foreground blue) + (materia--face 'vterm-color-bright-magenta :background purple :foreground purple) + (materia--face 'vterm-color-bright-cyan :background cyan :foreground cyan) + )) +(provide-theme 'materia) diff --git a/.local/share/konsole/MateriaDark.colorscheme b/.local/share/konsole/MateriaDark.colorscheme new file mode 100644 index 0000000..f0edb54 --- /dev/null +++ b/.local/share/konsole/MateriaDark.colorscheme @@ -0,0 +1,100 @@ +[Background] +Color=18,18,18 + +[BackgroundFaint] +Color=18,18,18 + +[BackgroundIntense] +Color=18,18,18 + +[Color0] +Color=71,71,71 + +[Color0Faint] +Color=71,71,71 + +[Color0Intense] +Color=71,71,71 + +[Color1] +Color=244,67,54 + +[Color1Faint] +Color=244,67,54 + +[Color1Intense] +Color=244,67,54 + +[Color2] +Color=76,175,80 + +[Color2Faint] +Color=76,175,80 + +[Color2Intense] +Color=76,175,80 + +[Color3] +Color=255,152,0 + +[Color3Faint] +Color=255,152,0 + +[Color3Intense] +Color=255,152,0 + +[Color4] +Color=26,115,232 + +[Color4Faint] +Color=26,115,232 + +[Color4Intense] +Color=26,115,232 + +[Color5] +Color=156,39,176 + +[Color5Faint] +Color=156,39,176 + +[Color5Intense] +Color=156,39,176 + +[Color6] +Color=0,151,167 + +[Color6Faint] +Color=0,151,167 + +[Color6Intense] +Color=0,151,167 + +[Color7] +Color=255,255,255 + +[Color7Faint] +Color=255,255,255 + +[Color7Intense] +Color=255,255,255 + +[Foreground] +Color=223,223,223 + +[ForegroundFaint] +Color=223,223,223 + +[ForegroundIntense] +Color=255,255,255 + +[General] +Anchor=0.5,0.5 +Blur=false +ColorRandomization=false +Description=Materia Dark +FillStyle=Tile +Opacity=1 +Wallpaper= +WallpaperFlipType=NoFlip +WallpaperOpacity=1 diff --git a/.local/share/konsole/drnuget.profile b/.local/share/konsole/drnuget.profile new file mode 100644 index 0000000..df15766 --- /dev/null +++ b/.local/share/konsole/drnuget.profile @@ -0,0 +1,12 @@ +[Appearance] +ColorScheme=MateriaDark +Font=Hack Nerd Font,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1 + +[General] +Name=drnuget +Parent=FALLBACK/ + +[Scrolling] +HighlightScrolledLines=false +HistoryMode=0 +ScrollBarPosition=2 @@ -3,6 +3,10 @@ bind m split-window -v bind r source-file ~/.tmux.conf set -g status-fg white set -g status-bg black +setw -g mode-keys vi +bind-key -T copy-mode-vi 'v' send -X begin-selection +bind-key -T copy-mode-vi 'y' send -X copy-selection +bind p pasteb # Smart pane switching with awareness of Vim splits. # See: https://github.com/christoomey/vim-tmux-navigator |