diff --git a/doom-emacs/.doom.d/config.el b/doom-emacs/.doom.d/config.el index b246a07..d5aa9f9 100644 --- a/doom-emacs/.doom.d/config.el +++ b/doom-emacs/.doom.d/config.el @@ -30,21 +30,21 @@ (setq fancy-splash-image "/home/minhradz/.doom.d/marivector.png") (defun synchronize-theme () - (let* ((light-theme 'doom-nord-light) - (dark-theme 'doom-nord) - (start-time-light-theme 6) - (end-time-light-theme 16) - (hour (string-to-number (substring (current-time-string) 11 13))) - (next-theme (if (member hour (number-sequence start-time-light-theme end-time-light-theme)) - light-theme dark-theme))) - (when (not (equal doom-theme next-theme)) - (setq doom-theme next-theme) - (load-theme next-theme t)))) + (let* ((light-theme 'doom-nord-light) + (dark-theme 'doom-nord) + (start-time-light-theme 6) + (end-time-light-theme 16) + (hour (string-to-number (substring (current-time-string) 11 13))) + (next-theme (if (member hour (number-sequence start-time-light-theme end-time-light-theme)) + light-theme dark-theme))) + (when (not (equal doom-theme next-theme)) + (setq doom-theme next-theme) + (load-theme next-theme t)))) (run-with-timer 0 900 'synchronize-theme) (setq doom-themes-enable-bold t ; if nil, bold is universally disabled - doom-themes-enable-italic t) ; if nil, italics is universally disabled + doom-themes-enable-italic t) ; if nil, italics is universally disabled (with-eval-after-load 'doom-themes (doom-themes-treemacs-config)) @@ -57,10 +57,10 @@ (setq ispell-alternate-dictionary "/home/minhradz/.english.dict.txt") (add-hook 'spell-fu-mode-hook - (lambda () - (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "en")) - (spell-fu-dictionary-add - (spell-fu-get-personal-dictionary "en-personal" "/home/minhradz/.aspell.en.pws")))) + (lambda () + (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "en")) + (spell-fu-dictionary-add + (spell-fu-get-personal-dictionary "en-personal" "/home/minhradz/.aspell.en.pws")))) ;; Clangd lsp for C/C++ dev (setq lsp-clients-clangd-args '("-j=3" @@ -155,19 +155,19 @@ (setq doom-modeline-minor-modes nil) (use-package! websocket - :after org-roam) + :after org-roam) (use-package! org-roam-ui - :after org-roam ;; or :after org -;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have -;; a hookable mode anymore, you're advised to pick something yourself -;; if you don't care about startup time, use -;; :hook (after-init . org-roam-ui-mode) - :config - (setq org-roam-ui-sync-theme t - org-roam-ui-follow t - org-roam-ui-update-on-save t - org-roam-ui-open-on-start t)) + :after org-roam ;; or :after org + ;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have + ;; a hookable mode anymore, you're advised to pick something yourself + ;; if you don't care about startup time, use + ;; :hook (after-init . org-roam-ui-mode) + :config + (setq org-roam-ui-sync-theme t + org-roam-ui-follow t + org-roam-ui-update-on-save t + org-roam-ui-open-on-start t)) (setq org-roam-dailies-directory "daily/") @@ -184,8 +184,8 @@ (consult-ripgrep org-roam-directory))) (map! :leader - :desc "Search org-roam with consult-ripgrep" - "n r F" #'org-roam-rg-search) + :desc "Search org-roam with consult-ripgrep" + "n r F" #'org-roam-rg-search) ;; (setq org-roam-node-display-template ;; #("${doom-hierarchy:20} ${doom-type:12} ${doom-tags:42}" 20 35 @@ -205,6 +205,7 @@ ;; this never worked lol (setq lsp-treemacs-sync-mode 1) (setq treemacs-project-follow-mode 1) +(treemacs-add-and-display-current-project-exclusively) ;; bitmap very funni (setq highlight-indent-guides-method 'bitmap) @@ -227,9 +228,9 @@ (blamer-min-offset 40) :custom-face (blamer-face ((t :foreground "#7a88cf" - :background nil - :height 110 - :italic t)))) + :background nil + :height 110 + :italic t)))) ;; elfeed the rss reader (after! elfeed @@ -344,5 +345,5 @@ (setq org-read-date-prefer-future 'time) (map! :leader - :desc "Start/Stop pomodoro" - "m c p" #'org-pomodoro) + :desc "Start/Stop pomodoro" + "m c p" #'org-pomodoro) diff --git a/git/.gitconfig b/git/.gitconfig index def4bce..ad19032 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -44,3 +44,7 @@ clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process +[rebase] + autostash = true +[core] + autocrlf = input diff --git a/lvim/.config/lvim/config.lua b/lvim/.config/lvim/config.lua index 5e89f7e..9044225 100644 --- a/lvim/.config/lvim/config.lua +++ b/lvim/.config/lvim/config.lua @@ -173,3 +173,9 @@ require("presence"):setup({ workspace_text = "Working on %s", -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string) line_number_text = "Line %s out of %s", -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string) }) + +vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "clangd" }) +local capabilities = require("lvim.lsp").common_capabilities() +capabilities.offsetEncoding = { "utf-16" } +local opts = { capabilities = capabilities } +require("lvim.lsp.manager").setup("clangd", opts) diff --git a/lvim/.config/lvim/lazy-lock.json b/lvim/.config/lvim/lazy-lock.json index 6d563e1..8f8a31c 100644 --- a/lvim/.config/lvim/lazy-lock.json +++ b/lvim/.config/lvim/lazy-lock.json @@ -1,60 +1,60 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, - "alpha-nvim": { "branch": "main", "commit": "7a6b9487dba044a43fde534bf5036f0fda5b6b23" }, + "LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" }, + "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, "bigfile.nvim": { "branch": "main", "commit": "9616b73670ffeb92679677554ded88854ae42cf8" }, - "bufferline.nvim": { "branch": "main", "commit": "417b303328118b6d836ae330142e88771c48a8a3" }, + "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" }, - "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" }, "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" }, "hlargs.nvim": { "branch": "main", "commit": "6218a401824c5733ac50b264991b62d064e85ab2" }, "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "is.vim": { "branch": "master", "commit": "d393cb346dcdf733fecd7bbfc45b70b8c05e9eb4" }, - "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, + "lazy.nvim": { "branch": "main", "commit": "f73986546cadecbcc0531c14b73d4e2cd679d672" }, "lir.nvim": { "branch": "master", "commit": "969e95bd07ec315b5efc53af69c881278c2b74fa" }, - "lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" }, + "lsp_signature.nvim": { "branch": "master", "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, - "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" }, - "neodev.nvim": { "branch": "main", "commit": "3de41fe4b07443c9f1d75062920dfbb9cd31d641" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" }, + "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, + "neodev.nvim": { "branch": "main", "commit": "24b403eabde652904077f84fd55441744e77a109" }, "nlsp-settings.nvim": { "branch": "main", "commit": "2a52e793d4f293c0e1d61ee5794e3ff62bfbbb5d" }, - "nord.nvim": { "branch": "master", "commit": "15fbfc38a83980b93e169b32a1bf64757f1e2bf4" }, - "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, - "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, + "none-ls.nvim": { "branch": "main", "commit": "b8fd44ee1616e6a9c995ed5f94ad9f1721d303ef" }, + "nord.nvim": { "branch": "master", "commit": "0a22a387c92bb3b46e3d245522712ae7497bec38" }, + "nvim-autopairs": { "branch": "master", "commit": "f6c71641f6f183427a651c0ce4ba3fb89404fa9e" }, + "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "4377a05b9476587b7b485d6a9d9745768c4e4b37" }, - "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, - "nvim-lspconfig": { "branch": "master", "commit": "f7922e59aeb9bc3e31a660ea4e7405ffa3fc2c3a" }, - "nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" }, - "nvim-tree.lua": { "branch": "master", "commit": "920868dba13466586897a8f40220eca6b2caac41" }, - "nvim-treesitter": { "branch": "master", "commit": "31f608e47b838594d32a7bc42028e2cefd0ddaad" }, + "nvim-dap": { "branch": "master", "commit": "92dc531eea2c9a3ef504a5c8ac0decd1fa59a6a3" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" }, + "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, + "nvim-tree.lua": { "branch": "master", "commit": "40b9b887d090d5da89a84689b4ca0304a9649f62" }, + "nvim-treesitter": { "branch": "master", "commit": "9c4fc86b67c1d68141cef57846d24cbee9b74fb0" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, + "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" }, "onedarker.nvim": { "branch": "freeze", "commit": "b00dd2189f264c5aeb4cf04c59439655ecd573ec" }, - "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "presence.nvim": { "branch": "other", "commit": "3c22ea345ae716589356cb225bf348ec4d518fef" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "schemastore.nvim": { "branch": "main", "commit": "c7c6353db3208608786503cbade1e9f8d3531f15" }, + "schemastore.nvim": { "branch": "main", "commit": "f714bc7c4c94972a7d2d05a198e50370f0b5f026" }, "spellsitter.nvim": { "branch": "master", "commit": "4af8640d9d706447e78c13150ef7475ea2c16b30" }, "structlog.nvim": { "branch": "main", "commit": "45b26a2b1036bb93c0e83f4225e85ab3cee8f476" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, - "tmux.nvim": { "branch": "main", "commit": "673782b74a6055d430d3f5148a033edd99e5519f" }, - "toggleterm.nvim": { "branch": "main", "commit": "12cba0a1967b4f3f31903484dec72a6100dcf515" }, - "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, - "vim-fugitive": { "branch": "master", "commit": "99db68d9b3304580bd383da7aaee05c7a954a344" }, - "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, + "tmux.nvim": { "branch": "main", "commit": "ea67d59721eb7e12144ce2963452e869bfd60526" }, + "toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" }, + "tokyonight.nvim": { "branch": "main", "commit": "633039585dff7fd2b9b62fb190bf768702609d95" }, + "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-sandwich": { "branch": "master", "commit": "c5a2cc438ce6ea2005c556dc833732aa53cae21a" }, - "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } + "which-key.nvim": { "branch": "main", "commit": "6962dae3565369363b59dd51fb206051555fcb4d" } } \ No newline at end of file diff --git a/sway/.config/sway/config b/sway/.config/sway/config index d9f2f7a..f60a724 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -135,6 +135,10 @@ for_window [app_id="emacs"] inhibit_idle visible; max_render_time off bindsym $mod+p exec clipman pick -t wofi bindsym $mod+t exec firefox + + bindsym $mod+y exec youtube-watch + + bindsym $mod+o exec "grim -g "$(slurp)" - | swappy -f -" # # Moving around: # diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index 93c86d1..ceb8d7f 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -96,12 +96,14 @@ "clock": { "tooltip-format": "{:%Y %B}\n{calendar}", "format": "{:%I:%M %p}", + "timezone": "America/Toronto", "on-click": "" }, "clock#date": { "tooltip-format": "{:%Y %B}\n{calendar}", "format": "{:%B %d, %A}", + "timezone": "America/Toronto", "on-click": "" },