From 714e8f254b8a903929224b9cb2a97459b10b0daf Mon Sep 17 00:00:00 2001 From: minhtrannhat Date: Wed, 26 Jul 2023 18:39:38 -0400 Subject: [PATCH] Feat(Desktop): Use zsh on desktop --- doom-emacs/.doom.d/config.el | 40 +++++++++------ doom-emacs/.doom.d/init.el | 10 ++-- doom-emacs/.doom.d/packages.el | 2 + kitty/.config/kitty/kitty.conf | 2 +- lvim/.config/lvim/config.lua | 41 ++------------- lvim/.config/lvim/lazy-lock.json | 85 ++++++++++++++++---------------- sway/.config/sway/config | 24 ++++----- waybar/.config/waybar/config | 4 +- wlogout/.config/wlogout/layout | 2 +- zsh/.zprofile | 1 + zsh/.zshenv | 9 ++++ zsh/.zshrc | 56 +++++++++++++++++++++ 12 files changed, 160 insertions(+), 116 deletions(-) create mode 100644 zsh/.zprofile create mode 100644 zsh/.zshenv create mode 100644 zsh/.zshrc diff --git a/doom-emacs/.doom.d/config.el b/doom-emacs/.doom.d/config.el index 67bff78..5842275 100644 --- a/doom-emacs/.doom.d/config.el +++ b/doom-emacs/.doom.d/config.el @@ -7,7 +7,7 @@ ;; Some functionality uses this to identify you, e.g. GPG configuration, email ;; clients, file templates and snippets. (setq user-full-name "minhtrannhat" - user-mail-address "minhtrannhat@minhtrannhat.com") + user-mail-address "minh@minhtrannhat.com") ;; Doom exposes five (optional) variables for controlling fonts in Doom. Here ;; are the three important ones: @@ -16,11 +16,7 @@ ;; + `doom-variable-pitch-font' ;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for ;; presentations or streaming. -(setq doom-font (font-spec :family "JetBrainsMono Nerd Font" :size 18) - doom-big-font (font-spec :family "JetBrainsMono Nerd Font" :size 26) - doom-variable-pitch-font (font-spec :family "Overpass" :size 16) - doom-unicode-font (font-spec :family "JuliaMono") - doom-serif-font (font-spec :family "IBM Plex Mono" :weight 'light)) +(setq doom-font (font-spec :family "JetBrainsMono Nerd Font" :size 18)) (setq doom-emoji-fallback-font-families nil) (setq doom-symbol-fallback-font-families nil) @@ -75,6 +71,8 @@ "--header-insertion-decorators=0")) (after! lsp-clangd (set-lsp-priority! 'clangd 2)) +(setq lsp-auto-guess-root nil) + ;; I mindlessly press ESC, so stop me from wreaking havoc (global-set-key (kbd "") 'keyboard-escape-quit) @@ -84,14 +82,26 @@ ;; ;; tree-sitter syntax highlighting -(require 'treesit) -(treesit-available-p) -(setq treesit-extra-load-path "/home/minhradz/Desktop/Packages/tree-sitter-module/dist/") +;; (require 'treesit) +;; (treesit-available-p) +;; (setq major-mode-remap-alist +;; '((yaml-mode . yaml-ts-mode) +;; (bash-mode . bash-ts-mode) +;; (js2-mode . js-ts-mode) +;; (typescript-mode . typescript-ts-mode) +;; (json-mode . json-ts-mode) +;; (css-mode . css-ts-mode) +;; (python-mode . python-ts-mode))) +(use-package! tree-sitter + :config + (require 'tree-sitter-langs) + (global-tree-sitter-mode) + (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode)) -;; (require 'elcord) -;; (elcord-mode) -;; (setq elcord-use-major-mode-as-main-icon 't) +(require 'elcord) +(elcord-mode) +(setq elcord-use-major-mode-as-main-icon 't) ;; gpg (setq epg-pinentry-mode 'loopback) @@ -104,8 +114,8 @@ ;; auto render latex in org mode (add-hook 'org-mode-hook 'org-fragtog-mode) -;; fish fish -(setq vterm-shell 'fish) +;; zsh zsh +(setq vterm-shell 'zsh) (defun doom-modeline-conditional-buffer-encoding () "We expect the encoding to be LF UTF-8, so only show the modeline when this is not the case" @@ -193,7 +203,7 @@ (setq lsp-signature-auto-activate nil)) ;; this never worked lol -(lsp-treemacs-sync-mode 1) +(setq lsp-treemacs-sync-mode 1) ;; bitmap very funni (setq highlight-indent-guides-method 'bitmap) diff --git a/doom-emacs/.doom.d/init.el b/doom-emacs/.doom.d/init.el index aa63ae5..286e8a9 100644 --- a/doom-emacs/.doom.d/init.el +++ b/doom-emacs/.doom.d/init.el @@ -81,10 +81,10 @@ :tools ;;ansible ;;debugger ; FIXME stepping through code, to help you add bugs - ;;tree-sitter + tree-sitter direnv - ;;(docker +lsp) - ;;editorconfig ; let someone else argue about tabs vs spaces + (docker +lsp) + editorconfig ; let someone else argue about tabs vs spaces ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) gist ; interacting with github gists @@ -148,14 +148,14 @@ ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - (python +lsp +pyright +pyenv +poetry) + (python +lsp +pyright +pyenv +poetry +treesitter) ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 rest ; Emacs as a REST client ;;rst ; ReST in peace ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (rust +lsp +treesitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() scala ; java, but good ;;(scheme +guile +mit +racket) ; a fully conniving family of lisps (sh +fish) ; she sells {ba,z,fi}sh shells on the C xor diff --git a/doom-emacs/.doom.d/packages.el b/doom-emacs/.doom.d/packages.el index eb28840..3e59679 100644 --- a/doom-emacs/.doom.d/packages.el +++ b/doom-emacs/.doom.d/packages.el @@ -56,4 +56,6 @@ (package! org-fragtog) (package! org-recur) (package! evil-cleverparens) +(package! elcord) (unpin! rustic) +(package! org :pin "5890ac") diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index 5a597a4..0d44a71 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -1,6 +1,6 @@ term xterm-kitty -shell fish +shell zsh font_family JetBrainsMono Nerd Font bold_font auto diff --git a/lvim/.config/lvim/config.lua b/lvim/.config/lvim/config.lua index 97fc6bf..5e89f7e 100644 --- a/lvim/.config/lvim/config.lua +++ b/lvim/.config/lvim/config.lua @@ -1,7 +1,7 @@ -- general lvim.format_on_save = true lvim.lint_on_save = true -lvim.shell = "/bin/fish" +lvim.shell = "/bin/zsh" lvim.leader = "space" vim.opt.relativenumber = true vim.opt.wrap = true @@ -12,9 +12,10 @@ lvim.builtin.autopairs.active = true lvim.builtin.gitsigns.active = true lvim.builtin.dap.active = true lvim.builtin.treesitter.rainbow.enable = true +lvim.builtin.cmp.cmdline.enable = true lvim.builtin.nvimtree.side = "left" -lvim.builtin.terminal.shell = "/bin/fish" +lvim.builtin.terminal.shell = "/bin/zsh" vim.termguicolors = true vim.background = "dark" @@ -85,7 +86,7 @@ lvim.plugins = { end, }, { "ellisonleao/glow.nvim" }, - { "andweeb/presence.nvim" }, + { "TakenMC/presence.nvim", branch = "other" }, { "m-demare/hlargs.nvim", config = function() @@ -172,37 +173,3 @@ 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) }) - --- Changes to clangd -vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "clangd" }) - --- some settings can only passed as commandline flags `clangd --help` -local clangd_flags = { - "--all-scopes-completion", - "--suggest-missing-includes", - "--background-index", - "--pch-storage=disk", - "--cross-file-rename", - "--log=info", - "--completion-style=detailed", - "--enable-config", -- clangd 11+ supports reading from .clangd configuration file - "--clang-tidy", - "--offset-encoding=utf-16", - "--clang-tidy-checks=-*,llvm-*,clang-analyzer-*,modernize-*,-modernize-use-trailing-return-type", - "--fallback-style=Google", -} - -local clangd_bin = "clangd" - -local custom_on_attach = function(client, bufnr) - require("lvim.lsp").common_on_attach(client, bufnr) - local opts = { noremap = true, silent = true } - vim.api.nvim_buf_set_keymap(bufnr, "n", "lh", "ClangdSwitchSourceHeader", opts) -end - -local opts = { - cmd = { clangd_bin, unpack(clangd_flags) }, - on_attach = custom_on_attach, -} - -require("lvim.lsp.manager").setup("clangd", opts) diff --git a/lvim/.config/lvim/lazy-lock.json b/lvim/.config/lvim/lazy-lock.json index ea979fd..affa2c5 100644 --- a/lvim/.config/lvim/lazy-lock.json +++ b/lvim/.config/lvim/lazy-lock.json @@ -1,59 +1,60 @@ { - "Comment.nvim": { "branch": "master", "commit": "ab62084fa992ed7ee3c19bbb5227ce2c4234612b" }, - "LuaSnip": { "branch": "master", "commit": "dc2e307287e9a9eabc18f0e3984c7e8cb164bb38" }, - "alpha-nvim": { "branch": "main", "commit": "dafa11a6218c2296df044e00f88d9187222ba6b0" }, - "better-escape.nvim": { "branch": "master", "commit": "426d29708064d5b1bfbb040424651c92af1f3f64" }, - "bigfile.nvim": { "branch": "main", "commit": "c1bad34ce742b4f360b67ca23c873fef998240fc" }, - "bufferline.nvim": { "branch": "main", "commit": "ef4fdc5cea3473801dce89b5fdfe633380c80c65" }, + "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" }, + "LuaSnip": { "branch": "master", "commit": "1f72e43a446961a1372c54038882c1d36e105cab" }, + "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, + "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, + "bigfile.nvim": { "branch": "main", "commit": "9616b73670ffeb92679677554ded88854ae42cf8" }, + "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "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": "8d91ba2dc2421a54981115f61b914974f938fa77" }, - "gitsigns.nvim": { "branch": "main", "commit": "372d5cb485f2062ac74abc5b33054abac21d8b58" }, - "glow.nvim": { "branch": "main", "commit": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215" }, - "hlargs.nvim": { "branch": "main", "commit": "aec119b4c39f8e04ffbcfaaa998ac24a09a480b9" }, + "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, + "gitsigns.nvim": { "branch": "main", "commit": "1e01b2958aebb79f1c33e7427a1bac131a678e0d" }, + "glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" }, + "hlargs.nvim": { "branch": "main", "commit": "cfc9beab4e176a13311efe03e38e6b6fed5df4f6" }, "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" }, - "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, + "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "is.vim": { "branch": "master", "commit": "d393cb346dcdf733fecd7bbfc45b70b8c05e9eb4" }, - "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" }, - "lir.nvim": { "branch": "master", "commit": "1aa871f20637eccc4e1e26b0fbcf9aafc9b6caf7" }, - "lsp_signature.nvim": { "branch": "master", "commit": "72b0d4ece23338fe2d03fc7b6fd8c8bace6bb441" }, - "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" }, + "lazy.nvim": { "branch": "main", "commit": "14d76aac4bd3ff07c1fca074c210f28f766a931e" }, + "lir.nvim": { "branch": "master", "commit": "969e95bd07ec315b5efc53af69c881278c2b74fa" }, + "lsp_signature.nvim": { "branch": "master", "commit": "58d4e810801da74c29313da86075d6aea537501f" }, + "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a8d5db8f227b9b236d1c54a9c6234bc033825ce7" }, - "mason.nvim": { "branch": "main", "commit": "3fb2be48864b7850a26c54c04cedb54e95dcdf3f" }, - "neodev.nvim": { "branch": "main", "commit": "864b35006d3de24c60e44b566de8018f919b13e6" }, - "nlsp-settings.nvim": { "branch": "main", "commit": "fd5ca6e4c2b01f97309e6b515b9957e7454587e1" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, + "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "neodev.nvim": { "branch": "main", "commit": "62515f64dfb196e8abe1263e17e2546559e41292" }, + "nlsp-settings.nvim": { "branch": "main", "commit": "64976a5ac70a9a43f3b1b42c5b1564f7f0e4077e" }, "nord.nvim": { "branch": "master", "commit": "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f" }, - "null-ls.nvim": { "branch": "main", "commit": "7e362189bc1598f36ba5e349ad6b35bed541ec40" }, - "nvim-autopairs": { "branch": "master", "commit": "7470af886ffb3df32800e5ef9c072a6cd825770d" }, - "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" }, + "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, + "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, + "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" }, - "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" }, - "nvim-lspconfig": { "branch": "master", "commit": "10fa01d553ce10646350461ac5ddc71f189e9d1a" }, - "nvim-navic": { "branch": "master", "commit": "27124a773d362628b114cd12016e743dab4ccf3e" }, - "nvim-tree.lua": { "branch": "master", "commit": "48d53a5934fbd51b655d03db7dad35551838f2c9" }, - "nvim-treesitter": { "branch": "master", "commit": "ac4020c70722337c326bf65b645b162ee6e1796b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "cac97f3b47bcb927db6d1d784c0c323056506ef3" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" }, + "nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" }, + "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, + "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, + "nvim-navic": { "branch": "master", "commit": "e6da6f74d89de65258ea7e98e22103ff5de6dcf5" }, + "nvim-tree.lua": { "branch": "master", "commit": "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35" }, + "nvim-treesitter": { "branch": "master", "commit": "19b29f7cb046317b74e60fc7bff2f86ece4dc118" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "defb7da4d3d313bf31982c52fd78e414f02840c9" }, + "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, "onedarker.nvim": { "branch": "freeze", "commit": "b00dd2189f264c5aeb4cf04c59439655ecd573ec" }, - "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, - "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, + "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "presence.nvim": { "branch": "other", "commit": "3c22ea345ae716589356cb225bf348ec4d518fef" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "schemastore.nvim": { "branch": "main", "commit": "a592fbe98959d13014b022ec1b1418498309019c" }, + "schemastore.nvim": { "branch": "main", "commit": "0682f56392ddc86cf5e6b2af76a63bc48ad4ed84" }, "spellsitter.nvim": { "branch": "master", "commit": "4af8640d9d706447e78c13150ef7475ea2c16b30" }, "structlog.nvim": { "branch": "main", "commit": "45b26a2b1036bb93c0e83f4225e85ab3cee8f476" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "9de317bdea2bc393074651179c4fc7f93e9b2d56" }, - "tmux.nvim": { "branch": "main", "commit": "b6da35847df972f50df27d938b6e5ea09bcc8391" }, - "toggleterm.nvim": { "branch": "main", "commit": "2e477f7ee8ee8229ff3158e3018a067797b9cd38" }, - "tokyonight.nvim": { "branch": "main", "commit": "1b0c88094548a62641ece1e668fa9a234e1c539e" }, - "vim-fugitive": { "branch": "master", "commit": "e6651a79facf5cc2b7c554fdc19eb8a9fe89602c" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, + "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, + "toggleterm.nvim": { "branch": "main", "commit": "00c13dccc78c09fa5da4c5edda990a363e75035e" }, + "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, + "vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }, "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, "vim-sandwich": { "branch": "master", "commit": "c5a2cc438ce6ea2005c556dc833732aa53cae21a" }, - "which-key.nvim": { "branch": "main", "commit": "4b73390eec680b4c061ea175eb32c0ff3412271d" } + "which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" } } \ No newline at end of file diff --git a/sway/.config/sway/config b/sway/.config/sway/config index b7771d8..945ee93 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -71,14 +71,13 @@ input type:keyboard { output * bg /home/minhradz/Downloads/wall.png fill -output LVDS-1 pos 0 0 res 1366x768 -output DP-1 res 1920x1080 position 1366,0 +output HDMI-A-1 res 1920x1080 position 0,0 adaptive_sync on -### Idle configuration +## Idle configuration exec swayidle -w \ - timeout 300 'swaylock -f -c 000000' \ - timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -f -c 000000' + timeout 1800 'swaylock --ignore-empty-password --show-failed-attempts -f -c 000000' \ + timeout 1800 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ + before-sleep 'swaylock --ignore-empty-password --show-failed-attempts -f -c 000000' for_window [title="Firefox — Sharing Indicator"] floating enable for_window [title="Firefox — Sharing Indicator"] nofocus @@ -124,12 +123,12 @@ for_window [app_id="emacs"] inhibit_idle visible; max_render_time off bindsym $mod+Shift+c reload # Exit sway (logs you out of your Wayland session) - bindsym $mod+Shift+e exec exec wlogout + bindsym $mod+Shift+e exec wlogout # clipboard manager bindsym $mod+p exec clipman pick -t wofi - bindsym $mod+t exec librewolf + bindsym $mod+t exec firefox # # Moving around: # @@ -155,6 +154,9 @@ for_window [app_id="emacs"] inhibit_idle visible; max_render_time off # # Workspaces: # + # Switch to last workspace + bindsym $mod+Tab workspace back_and_forth + # Switch to workspace bindsym $mod+1 workspace number 1 bindsym $mod+2 workspace number 2 @@ -262,8 +264,6 @@ bindsym $mod+e exec emacsclient -nc bindsym $mod+Right workspace next bindsym $mod+Left workspace prev -bindsym $mod+Tab exec swayr next-window current-workspace - # # Status Bar: # @@ -274,8 +274,8 @@ bar { include /etc/sway/config.d/* -bindsym XF86AudioRaiseVolume exec pulsemixer --change-volume +2 && pulsemixer --get-volume > $SWAYSOCK.wob -bindsym XF86AudioLowerVolume exec pulsemixer --change-volume -2 && pulsemixer --get-volume > $SWAYSOCK.wob +bindsym XF86AudioRaiseVolume exec pactl -- set-sink-volume 0 +5% > $SWAYSOCK.wob +bindsym XF86AudioLowerVolume exec pactl -- set-sink-volume 0 -5% > $SWAYSOCK.wob bindsym XF86AudioMute exec pulsemixer --toggle-mute && ( pulsemixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob bindsym XF86MonBrightnessUp exec light -A 10 bindsym XF86MonBrightnessDown exec light -U 10 diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index e96ccf0..aa76b8a 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -38,9 +38,7 @@ "17": "十七", "18": "十八", "19": "十九", - "20": "二十", - "focused": "", - "default": "" + "20": "二十" } }, "cpu": { diff --git a/wlogout/.config/wlogout/layout b/wlogout/.config/wlogout/layout index d364253..d111b82 100644 --- a/wlogout/.config/wlogout/layout +++ b/wlogout/.config/wlogout/layout @@ -1,6 +1,6 @@ { "label" : "lock", - "action" : "swaylock -i ~/Downloads/william-moreland-W61Rp5RouCA-unsplash.png .s fill", + "action" : "swaylock --ignore-empty-password --show-failed-attempts -f -c 000000", "text" : "Lock", "keybind" : "l" } diff --git a/zsh/.zprofile b/zsh/.zprofile new file mode 100644 index 0000000..0023bea --- /dev/null +++ b/zsh/.zprofile @@ -0,0 +1 @@ +eval $(keychain --eval --agents "gpg,ssh" --quiet id_ed25519 E13CFA85C53F8062) diff --git a/zsh/.zshenv b/zsh/.zshenv new file mode 100644 index 0000000..e719ac2 --- /dev/null +++ b/zsh/.zshenv @@ -0,0 +1,9 @@ +export EDITOR=lvim +export MANPAGER="lvim +Man!" +export MOZ_ENABLE_WAYLAND=1 + +path+=('/home/minhradz/.cargo/bin') +path+=('/home/minhradz/.local/bin') + +export BUN_INSTALL="$HOME/.bun" +export PATH="$BUN_INSTALL/bin:$PATH" diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 100644 index 0000000..3a29274 --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1,56 @@ + +# The following lines were added by compinstall + +zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate +zstyle ':completion:*' list-colors '' +zstyle :compinstall filename '/home/minhradz/.zshrc' + +autoload -Uz compinit +compinit +# End of lines added by compinstall +# Lines configured by zsh-newuser-install +HISTFILE=~/.histfile +HISTSIZE=1000 +SAVEHIST=1000 +# End of lines configured by zsh-newuser-install + +export GPG_TTY=$(tty) + +test -s ~/.alias && . ~/.alias || true + +### Added by Zinit's installer +if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then + print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f" + command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit" + command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \ + print -P "%F{33} %F{34}Installation successful.%f%b" || \ + print -P "%F{160} The clone has failed.%f%b" +fi + +source "$HOME/.local/share/zinit/zinit.git/zinit.zsh" +autoload -Uz _zinit +(( ${+_comps} )) && _comps[zinit]=_zinit + +# Load a few important annexes, without Turbo +# (this is currently required for annexes) +zinit light-mode for \ + zdharma-continuum/zinit-annex-as-monitor \ + zdharma-continuum/zinit-annex-bin-gem-node \ + zdharma-continuum/zinit-annex-patch-dl \ + zdharma-continuum/zinit-annex-rust + +### End of Zinit's installer chunk + +# zsh-fzf-history-search +zinit ice lucid wait'0' +zinit light joshskidmore/zsh-fzf-history-search + +# Two regular plugins loaded without investigating. +zinit light zsh-users/zsh-autosuggestions +zinit light zdharma-continuum/fast-syntax-highlighting +zinit light chitoku-k/fzf-zsh-completions +zinit light greymd/docker-zsh-completion + +eval "$(fnm env --use-on-cd)" + +eval "$(starship init zsh)"