✨ (config/waybar) Update waybar config

Author: Comamoca

config/nvim/lua/configs/kastel.lua

@@ -1,29 +1,29 @@
 vim.api.nvim_create_autocmd("FileType", {
-    pattern = "gleam",
-    callback = function()
-        vim.b.symbol_list = { "->", "|>", "<>", "<-", "_ ->" }
-    end,
+  pattern = "gleam",
+  callback = function()
+    vim.b.symbol_list = { "->", "|>", "<>", "<-", "_ ->" }
+  end,
 })
 
 function _G.symbol_cmp()
-  local triggers = vim.fn.split('hjklnmfdsavcuiorew',[[\zs]])
+  local triggers = vim.fn.split("hjklnmfdsavcuiorew", [[\zs]])
 
-  local comp_list = vim.fn.map(vim.fn.copy(vim.b.symbol_list), function (i, v)
-    return { word = v, menu = vim.fn.get(triggers, i, '') }
+  local comp_list = vim.fn.map(vim.fn.copy(vim.b.symbol_list), function(i, v)
+    return { word = v, menu = vim.fn.get(triggers, i, "") }
   end)
 
   -- vim.on_key(symbol_select)
 
-  vim.fn.complete(vim.fn.col('.')-1, comp_list)
+  vim.fn.complete(vim.fn.col(".") - 1, comp_list)
 end
 
 function _G.symbol_select(key, typed)
-  local items = vim.fn.complete_info({"items"}).items
-  local idx = vim.fn.indexof(items, function (_, v)
-    return vim.fn.get(v, 'menu', '') == key
+  local items = vim.fn.complete_info({ "items" }).items
+  local idx = vim.fn.indexof(items, function(_, v)
+    return vim.fn.get(v, "menu", "") == key
   end)
 
-  if (idx >= 0) then
+  if idx >= 0 then
     vim.print(idx)
     -- vim.fn.feedkeys("i<BS>" .. items[idx].word,"i")
 
@@ -32,11 +32,8 @@ function _G.symbol_select(key, typed)
     -- vim.print(items[idx].word)
     return ""
   end
-
 end
 
-vim.keymap.set("i", ",", function ()
-  return vim.fn.exists('b:symbol_list')
-  and ',<cmd>lua symbol_cmp()<cr>'
-  or ','
+vim.keymap.set("i", ",", function()
+  return vim.fn.exists("b:symbol_list") and ",<cmd>lua symbol_cmp()<cr>" or ","
 end, { expr = true, noremap = true })

config/nvim/lua/configs/keymap.lua

@@ -17,7 +17,7 @@ keymap("i", "jj", "<ESC>", opts)
 
 keymap("i", "<C-g>", "<C-[><C-[>")
 
-keymap("n", "q", "<C-[><C-[>")
+-- keymap("n", "q", "<C-[><C-[>")
 
 -- keymap("n", "<S-k>", "{", opts)
 -- keymap("n", "<S-j>", "}", opts)
@@ -90,10 +90,10 @@ vim.fn.filter(vim.fn.getwininfo(), function(key, val)
 end)
 vim.print()
 
-keymap("n", "q", function()
-  if vim.fn.empty(vim.fn.filter(vim.fn.getwininfo(), "v:val.quickfix")) then
-    vim.cmd("copen")
-  else
-    vim.cmd("cclose")
-  end
-end)
+-- keymap("n", "q", function()
+--   if vim.fn.empty(vim.fn.filter(vim.fn.getwininfo(), "v:val.quickfix")) then
+--     vim.cmd("copen")
+--   else
+--     vim.cmd("cclose")
+--   end
+-- end)

config/sway/config

@@ -46,9 +46,9 @@ font pango:monospace 8
 # https://wiki.archlinux.org/index.php/XDG_Autostart
 # exec --no-startup-id dex --autostart --environment i3
 
-bar {
- status_command waybar
-}
+# bar {
+#  status_command 
+# }
 
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
@@ -60,6 +60,7 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
 exec --no-startup-id nm-applet
+exec waybar
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status

config/vim/.netrwhist

@@ -1,3 +1,4 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =1
+let g:netrw_dirhistcnt =2
+let g:netrw_dirhist_2='/home/coma/.ghq/github.com/Comamoca/dotfiles/config/vim'
 let g:netrw_dirhist_1='/home/coma/.ghq/github.com/Comamoca/dotfiles/vim'

config/waybar/config

@@ -6,7 +6,7 @@
     "cpu",
     "memory",
     "tray",
-    "hyprland/workspaces"
+    "sway/workspaces"
   ],
   "modules-center": ["custom/media"],
   "modules-right": [
@@ -28,6 +28,11 @@
       "default": ["", "", ""]
     }
   },
+  "sway/workspaces": {
+    "format": "{icon}",
+    "on-scroll-up": "hyprctl dispatch workspace e+1",
+    "on-scroll-down": "hyprctl dispatch workspace e-1"
+  },
   "hyprland/workspaces": {
     "format": "{icon}",
     "on-scroll-up": "hyprctl dispatch workspace e+1",

config/waybar/style.css

@@ -26,6 +26,12 @@
 	margin-right: 2px;
 }
 
+#workspaces button.focused {
+	border-radius: 10px;
+	color: @mantle;
+	background: @lavender;
+}
+
 #workspaces button.active {
 	border-radius: 10px;
 	color: @mantle;

configuration.nix

@@ -284,8 +284,11 @@ in
   };
 
   # services.flatpak.enable = true;
-  # xdg.portal.enable = pkgs.lib.mkDefault true;
-  xdg.portal.wlr.enable = true;
+  xdg.portal = {
+    xdgOpenUsePortal = true;
+    enable = pkgs.lib.mkDefault true;
+    wlr.enable = true;
+  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget

emacs.d/init.el

@@ -70,13 +70,16 @@
 
 ;; Emacs evil-mode
 (leaf evil
-  :defer-config
+  :config
   ;; (define-key evil-insert-state-map "jk" #'evil-normal-state)
   ;; (define-key evil-normal-state-map (kbd "S-j") nil)
   ;; (define-key evil-normal-state-map (kbd "S-j") #'evil-scroll-down)
+  (define-key global-map (kbd "C-<return>") #'vterm-toggle-show)
+  (define-key vterm-mode-map (kbd "C-<return>") #'vterm-toggle-hide)
 
   (define-key evil-normal-state-map (kbd "C-k") #'evil-scroll-up)
   (define-key evil-normal-state-map (kbd "C-j") #'evil-scroll-down)
+  (define-key evil-insert-state-map (kbd "C-j") #'newline-and-indent)
 
   (define-key evil-normal-state-map (kbd "M-g") #'projectile-switch-project)
   (define-key evil-normal-state-map (kbd "C-o") #'projectile-find-file)
@@ -117,6 +120,8 @@
   (global-treesit-auto-mode))
 
 (leaf treesit
+  :config
+  (setq treesit-extra-load-path `(,(expand-file-name "~/.cache/dpp/_generated/nvim-treesitter/parser")))
   :init
   (add-to-list 'auto-mode-alist '("\\.cshtml\\'" . web-mode))
   (add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-ts-mode))
@@ -248,8 +253,7 @@
 ;; org-modern
 (leaf org-modern
   :init
-  ;; (with-eval-after-load 'org (global-org-modern-mode))
-  )
+  (with-eval-after-load 'org (global-org-modern-mode)))
 
 (leaf org-modern-indent)
 
@@ -331,20 +335,32 @@
 
 
 ;; LSP
-;; (leaf lsp-bridge :require t
-;;   :config
-;;   (setq acm-enable-capf t)
-;;   :init
-;;   (global-lsp-bridge-mode))
+(leaf lsp-bridge :require t
+  :config
+  (setq acm-enable-capf t)
+  :init
+  (global-lsp-bridge-mode))
 
 
-(leaf lsp-mode :require t
+(leaf lsp-mode
+  :require t
   :config
+  (setenv "LSP_USE_PLISTS" "true")
+  (setq lsp-completion-provider :none)
+
   (define-key evil-normal-state-map (kbd "K") 'lsp-ui-doc-glance)
-  :hook
-  (add-hook 'prog-mode-hook #'lsp-deferred)
-  ;; (add-hook 'prog-mode-hook #'lsp-deferred)
-  )
+
+  (add-to-list 'lsp-language-id-configuration
+	       '(nix-mode . "nil")
+	       '(python-mode . "python"))
+
+  (defun corfu-lsp-setup ()
+    (setq completion-at-point-functions '(lsp-completion-at-point))
+    (setq-local completion-styles '(orderless)
+		completion-category-defaults nil))
+
+  (add-hook 'lsp-mode-hook #'corfu-lsp-setup)
+  (add-hook 'prog-mode-hook #'lsp-deferred))
 
 ;; Eglot
 ;; (defun node-project-p ()
@@ -416,12 +432,25 @@
 
 (advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command)
 
+;; Auto Formatting
+(leaf reformatter
+  :config
+  (reformatter-define dprint
+    :program "dprint" :args `("fmt" "--stdin" ,buffer-file-name))
+  (reformatter-define deno
+    :program "deno" :args `("fmt" ,buffer-file-name))
+  (reformatter-define black
+    :program "black" :args '("-"))
+  (reformatter-define nixfmt
+    :program "nixfmt-rfcstyle" :args '("-")))
+
 ;; Lua support
 (leaf lua-mode)
 
 ;; Completion
 (leaf corfu
   :config
+  (setq corfu-cycle t)
   (setq corfu-auto t)
   (setq corfu-auto-prefix 1)
   :init
@@ -747,19 +776,10 @@
                  :stream t
                  :models '(starcoder2))))
 
-(leaf dash)
-
 (leaf editorconfig
   :config
   (editorconfig-mode 1))
 
-(leaf reformatter
-  :config
-  (reformatter-define dprint
-    :program "dprint" :args `("fmt" "--stdin" ,buffer-file-name))
-  (reformatter-define deno
-    :program "deno" :args `("fmt" ,buffer-file-name)))
-
 (leaf ledger
   :config)
 
@@ -790,6 +810,42 @@
 
 (leaf iscroll)
 
+(leaf folding-mode
+  :require t)
+
+(leaf rg
+  :require t)
+
+(leaf open-junk-file :require t)
+
+(leaf fold-this)
+
+(leaf alert
+  :config
+  (setq alert-default-style 'libnotify))
+
+(leaf dashboard
+  :config
+  (setq dashboard-startup-banner (expand-file-name "~/Pictures/.emacs-logos/gnu_color_resize.png"))
+  (setq dashboard-startup-banner 'logo))
+
+(leaf aas
+  :config
+  (aas-set-snippets 'text-mode
+    "「" "「」"
+    "『" "『』"
+    "`" "``")
+  (aas-set-snippets 'prog-mode
+    "`" "``"))
+
+(leaf vterm)
+
+(leaf vterm-toggle)
+
+(leaf multi-vterm
+  :config
+  (setq multi-vterm-dedicated-window-height 50))
+
 
 ;; ================ My extentions ================ 
 
@@ -1014,16 +1070,6 @@
 
     (find-file (org-roam-node-file select-node))))
 
-;; Search
-(leaf rg
-  :require t)
-
-(leaf open-junk-file
-  :bind (("C-x j" . open-junk-file))
-  :config
-  (setq open-junk-file-format "/tmp/junk/%Y_%m_%d_%H%M%S."))
-
-
 ;; nano-tools
 ;; (leaf nano-theme)
 ;; (leaf nano-popup)
@@ -1070,6 +1116,11 @@
 
 (setq create-lockfiles nil)
 
+;; For lsp-mode
+(setq gc-cons-threshold 100000000)
+(setq read-process-output-max (* 1024 1024))
+
+
 ;; Key mapping
 (define-key global-map (kbd "C-x s") 'blackening-region)
 (define-key global-map (kbd "C-;") 'comment-dwim)