From 59cd198cfceabd3dd0f2e09b304a2af1536c78af Mon Sep 17 00:00:00 2001 From: js0ny Date: Tue, 4 Mar 2025 23:23:28 +0000 Subject: [PATCH] Minor fix --- platforms/linux/kde/kglobalshortcutsrc | 102 ++++++++++++++++--------- tools/doom/.gitignore | 2 + tools/doom/config.el | 8 +- tools/doom/packages.el | 2 + tools/doom/telega.el | 2 +- tools/nvim/lua/plugins/appearance.lua | 25 +++++- 6 files changed, 102 insertions(+), 39 deletions(-) diff --git a/platforms/linux/kde/kglobalshortcutsrc b/platforms/linux/kde/kglobalshortcutsrc index bf0b6c6..f11d47d 100644 --- a/platforms/linux/kde/kglobalshortcutsrc +++ b/platforms/linux/kde/kglobalshortcutsrc @@ -65,6 +65,40 @@ ExposeClassCurrentDesktop=none,none,Toggle Present Windows (Window class on curr Grid View=Meta+G,Meta+G,Toggle Grid View Increase Opacity=none,,Increase Opacity of Active Window by 5% Kill Window=Meta+Ctrl+Esc,Meta+Ctrl+Esc,Kill Window +KrohnkiteBTreeLayout=Meta+X,none,Krohnkite: BTree Layout +KrohnkiteColumnsLayout=none,none,Krohnkite: Columns Layout +KrohnkiteDecrease=none,none,Krohnkite: Decrease +KrohnkiteFloatAll=none,none,Krohnkite: Toggle Float All +KrohnkiteFloatingLayout=none,none,Krohnkite: Floating Layout +KrohnkiteFocusDown=Meta+N,none,Krohnkite: Focus Down +KrohnkiteFocusLeft=Meta+H,none,Krohnkite: Focus Left +KrohnkiteFocusNext=none,none,Krohnkite: Focus Next +KrohnkiteFocusPrev=Meta+\\,,none,Krohnkite: Focus Previous +KrohnkiteFocusRight=Meta+I,none,Krohnkite: Focus Right +KrohnkiteFocusUp=Meta+E,none,Krohnkite: Focus Up +KrohnkiteGrowHeight=Meta+Ctrl+N,none,Krohnkite: Grow Height +KrohnkiteIncrease=none,none,Krohnkite: Increase +KrohnkiteMonocleLayout=Meta+M,none,Krohnkite: Monocle Layout +KrohnkiteNextLayout=Meta+\\\\,none,Krohnkite: Next Layout +KrohnkitePreviousLayout=Meta+|,none,Krohnkite: Previous Layout +KrohnkiteQuarterLayout=none,none,Krohnkite: Quarter Layout +KrohnkiteRotate=Meta+Y,none,Krohnkite: Rotate +KrohnkiteRotatePart=none,none,Krohnkite: Rotate Part +KrohnkiteSetMaster=Meta+Return,none,Krohnkite: Set master +KrohnkiteShiftDown=none,none,Krohnkite: Move Down/Next +KrohnkiteShiftLeft=Meta+Shift+H,none,Krohnkite: Move Left +KrohnkiteShiftRight=Meta+Shift+I,none,Krohnkite: Move Right +KrohnkiteShiftUp=none,none,Krohnkite: Move Up/Prev +KrohnkiteShrinkHeight=Meta+Ctrl+K,none,Krohnkite: Shrink Height +KrohnkiteShrinkWidth=Meta+Ctrl+H,none,Krohnkite: Shrink Width +KrohnkiteSpiralLayout=none,none,Krohnkite: Spiral Layout +KrohnkiteSpreadLayout=none,none,Krohnkite: Spread Layout +KrohnkiteStackedLayout=none,none,Krohnkite: Stacked Layout +KrohnkiteStairLayout=none,none,Krohnkite: Stair Layout +KrohnkiteTileLayout=none,none,Krohnkite: Tile Layout +KrohnkiteToggleFloat=Meta+Shift+F,none,Krohnkite: Toggle Float +KrohnkiteTreeColumnLayout=none,none,Krohnkite: Tree Column Layout +KrohnkitegrowWidth=Meta+Ctrl+I,none,Krohnkite: Grow Width Move Tablet to Next Output=none,none,Move the tablet to the next output MoveMouseToCenter=Meta+F6,Meta+F6,Move Mouse to Centre MoveMouseToFocus=Meta+F5,Meta+F5,Move Mouse to Focus @@ -72,18 +106,18 @@ MoveZoomDown=none,none,Move Zoomed Area Downwards MoveZoomLeft=none,none,Move Zoomed Area to Left MoveZoomRight=none,none,Move Zoomed Area to Right MoveZoomUp=none,none,Move Zoomed Area Upwards -Overview=Meta+W,Meta+W,Toggle Overview +Overview=Meta+W\tMeta+Tab,Meta+W,Toggle Overview Setup Window Shortcut=none,,Setup Window Shortcut Show Desktop=Meta+D,Meta+D,Peek at Desktop Switch One Desktop Down=Meta+Ctrl+Down,Meta+Ctrl+Down,Switch One Desktop Down Switch One Desktop Up=Meta+Ctrl+Up,Meta+Ctrl+Up,Switch One Desktop Up Switch One Desktop to the Left=Meta+Ctrl+Left,Meta+Ctrl+Left,Switch One Desktop to the Left Switch One Desktop to the Right=Meta+Ctrl+Right,Meta+Ctrl+Right,Switch One Desktop to the Right -Switch Window Down=Meta+Alt+Down\tMeta+N,Meta+Alt+Down,Switch to Window Below -Switch Window Left=Meta+H\tMeta+Alt+Left,Meta+Alt+Left,Switch to Window to the Left -Switch Window Right=Meta+I\tMeta+Alt+Right,Meta+Alt+Right,Switch to Window to the Right -Switch Window Up=Meta+Alt+Up\tMeta+E,Meta+Alt+Up,Switch to Window Above -Switch to Desktop 1=Meta+F1,Ctrl+F1,Switch to Desktop 1 +Switch Window Down=Meta+Alt+Down,Meta+Alt+Down,Switch to Window Below +Switch Window Left=Meta+Alt+Left,Meta+Alt+Left,Switch to Window to the Left +Switch Window Right=Meta+Alt+Right,Meta+Alt+Right,Switch to Window to the Right +Switch Window Up=Meta+Alt+Up,Meta+Alt+Up,Switch to Window Above +Switch to Desktop 1=Meta+1,Ctrl+F1,Switch to Desktop 1 Switch to Desktop 10=none,,Switch to Desktop 10 Switch to Desktop 11=none,,Switch to Desktop 11 Switch to Desktop 12=none,,Switch to Desktop 12 @@ -94,15 +128,15 @@ Switch to Desktop 16=none,,Switch to Desktop 16 Switch to Desktop 17=none,,Switch to Desktop 17 Switch to Desktop 18=none,,Switch to Desktop 18 Switch to Desktop 19=none,,Switch to Desktop 19 -Switch to Desktop 2=Meta+F2,Ctrl+F2,Switch to Desktop 2 +Switch to Desktop 2=Meta+2,Ctrl+F2,Switch to Desktop 2 Switch to Desktop 20=none,,Switch to Desktop 20 -Switch to Desktop 3=Meta+F3,Ctrl+F3,Switch to Desktop 3 -Switch to Desktop 4=Meta+F4,Ctrl+F4,Switch to Desktop 4 -Switch to Desktop 5=none,,Switch to Desktop 5 -Switch to Desktop 6=none,,Switch to Desktop 6 -Switch to Desktop 7=none,,Switch to Desktop 7 -Switch to Desktop 8=none,,Switch to Desktop 8 -Switch to Desktop 9=none,,Switch to Desktop 9 +Switch to Desktop 3=Meta+3,Ctrl+F3,Switch to Desktop 3 +Switch to Desktop 4=Meta+4,Ctrl+F4,Switch to Desktop 4 +Switch to Desktop 5=Meta+5,,Switch to Desktop 5 +Switch to Desktop 6=Meta+6,,Switch to Desktop 6 +Switch to Desktop 7=Meta+7,,Switch to Desktop 7 +Switch to Desktop 8=Meta+8,,Switch to Desktop 8 +Switch to Desktop 9=Meta+9,,Switch to Desktop 9 Switch to Next Desktop=none,,Switch to Next Desktop Switch to Next Screen=none,,Switch to Next Screen Switch to Previous Desktop=none,,Switch to Previous Desktop @@ -140,10 +174,10 @@ Window Fullscreen=none,,Make Window Fullscreen Window Grow Horizontal=none,,Expand Window Horizontally Window Grow Vertical=none,,Expand Window Vertically Window Lower=none,,Lower Window -Window Maximize=Meta+Shift+E\tMeta+PgUp,Meta+PgUp,Maximise Window +Window Maximize=Meta+PgUp,Meta+PgUp,Maximise Window Window Maximize Horizontal=none,,Maximise Window Horizontally Window Maximize Vertical=none,,Maximise Window Vertically -Window Minimize=Meta+Shift+N\tMeta+PgDown,Meta+PgDown,Minimise Window +Window Minimize=Meta+PgDown,Meta+PgDown,Minimise Window Window Move=none,,Move Window Window Move Center=none,,Move Window to the Centre Window No Border=none,,Toggle Window Titlebar and Frame @@ -174,7 +208,7 @@ Window Resize=none,,Resize Window Window Shade=none,,Shade Window Window Shrink Horizontal=none,,Shrink Window Horizontally Window Shrink Vertical=none,,Shrink Window Vertically -Window to Desktop 1=none,,Window to Desktop 1 +Window to Desktop 1=Meta+!,,Window to Desktop 1 Window to Desktop 10=none,,Window to Desktop 10 Window to Desktop 11=none,,Window to Desktop 11 Window to Desktop 12=none,,Window to Desktop 12 @@ -185,14 +219,14 @@ Window to Desktop 16=none,,Window to Desktop 16 Window to Desktop 17=none,,Window to Desktop 17 Window to Desktop 18=none,,Window to Desktop 18 Window to Desktop 19=none,,Window to Desktop 19 -Window to Desktop 2=none,,Window to Desktop 2 +Window to Desktop 2=Meta+@,,Window to Desktop 2 Window to Desktop 20=none,,Window to Desktop 20 -Window to Desktop 3=none,,Window to Desktop 3 -Window to Desktop 4=none,,Window to Desktop 4 -Window to Desktop 5=none,,Window to Desktop 5 -Window to Desktop 6=none,,Window to Desktop 6 -Window to Desktop 7=none,,Window to Desktop 7 -Window to Desktop 8=none,,Window to Desktop 8 +Window to Desktop 3=Meta+#,,Window to Desktop 3 +Window to Desktop 4=Meta+$,,Window to Desktop 4 +Window to Desktop 5=Meta+%,,Window to Desktop 5 +Window to Desktop 6=Meta+^,,Window to Desktop 6 +Window to Desktop 7=Meta+&,,Window to Desktop 7 +Window to Desktop 8=Meta+*,,Window to Desktop 8 Window to Desktop 9=none,,Window to Desktop 9 Window to Next Desktop=none,,Window to Next Desktop Window to Next Screen=Meta+Shift+Right,Meta+Shift+Right,Move Window to Next Screen @@ -242,16 +276,16 @@ powerProfile=Battery\tMeta+B,Battery\tMeta+B,Switch Power Profile [plasmashell] _k_friendly_name=plasmashell activate application launcher=Meta\tAlt+F1,Meta\tAlt+F1,Activate Application Launcher -activate task manager entry 1=Meta+1,Meta+1,Activate Task Manager Entry 1 +activate task manager entry 1=none,Meta+1,Activate Task Manager Entry 1 activate task manager entry 10=none,,Activate Task Manager Entry 10 -activate task manager entry 2=Meta+2,Meta+2,Activate Task Manager Entry 2 -activate task manager entry 3=Meta+3,Meta+3,Activate Task Manager Entry 3 -activate task manager entry 4=Meta+4,Meta+4,Activate Task Manager Entry 4 -activate task manager entry 5=Meta+5,Meta+5,Activate Task Manager Entry 5 -activate task manager entry 6=Meta+6,Meta+6,Activate Task Manager Entry 6 -activate task manager entry 7=Meta+7,Meta+7,Activate Task Manager Entry 7 -activate task manager entry 8=Meta+8,Meta+8,Activate Task Manager Entry 8 -activate task manager entry 9=Meta+9,Meta+9,Activate Task Manager Entry 9 +activate task manager entry 2=none,Meta+2,Activate Task Manager Entry 2 +activate task manager entry 3=none,Meta+3,Activate Task Manager Entry 3 +activate task manager entry 4=none,Meta+4,Activate Task Manager Entry 4 +activate task manager entry 5=none,Meta+5,Activate Task Manager Entry 5 +activate task manager entry 6=none,Meta+6,Activate Task Manager Entry 6 +activate task manager entry 7=none,Meta+7,Activate Task Manager Entry 7 +activate task manager entry 8=none,Meta+8,Activate Task Manager Entry 8 +activate task manager entry 9=none,Meta+9,Activate Task Manager Entry 9 activate widget 3=none,none,Activate Application Launcher Widget clear-history=none,,Clear Clipboard History clipboard_action=Meta+Ctrl+X,Meta+Ctrl+X,Automatic Action Popup Menu @@ -296,7 +330,7 @@ RectangularRegionScreenShot=Meta+C Map to fullscreen=Meta+Ctrl+F,Meta+Ctrl+F,Map to fullscreen Map to screen 1=Meta+Ctrl+1,Meta+Ctrl+1,Map to screen 1 Map to screen 2=Meta+Ctrl+2,Meta+Ctrl+2,Map to screen 2 -Next Profile=Meta+Ctrl+N,Meta+Ctrl+N,Next profile +Next Profile=none,Meta+Ctrl+N,Next profile Previous Profile=Meta+Ctrl+P,Meta+Ctrl+P,Previous Profile Toggle screen map selection=Meta+Ctrl+M,Meta+Ctrl+M,Toggle between all screens Toggle stylus mode=Meta+Ctrl+S,Meta+Ctrl+S,Toggle the Stylus Tool Relative/Absolute diff --git a/tools/doom/.gitignore b/tools/doom/.gitignore index 57fbc5e..e3c05d7 100644 --- a/tools/doom/.gitignore +++ b/tools/doom/.gitignore @@ -1,2 +1,4 @@ org-pomo-music.el .custom.el +local.el +themes/ diff --git a/tools/doom/config.el b/tools/doom/config.el index 7770251..3c55b39 100644 --- a/tools/doom/config.el +++ b/tools/doom/config.el @@ -48,7 +48,9 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-one) +(setq doom-theme 'catppuccin) +(setq catppuccin-flavor 'mocha) +;(catppuccin-reload) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. @@ -122,5 +124,7 @@ (load! "calendar.el") +(when (file-exists-p (expand-file-name "local.el" doom-user-dir)) + (load! "local.el")) -(load! "telega.el") +;; (load! "telega.el") diff --git a/tools/doom/packages.el b/tools/doom/packages.el index d9073dd..6a72348 100644 --- a/tools/doom/packages.el +++ b/tools/doom/packages.el @@ -59,3 +59,5 @@ (package! telega :recipe (:files (:defaults "contrib/*.el" "etc" "server" "Makefile"))) (package! org-super-agenda) + +(package! catppuccin-theme) diff --git a/tools/doom/telega.el b/tools/doom/telega.el index 82a18cc..7af2132 100644 --- a/tools/doom/telega.el +++ b/tools/doom/telega.el @@ -6,7 +6,7 @@ (setq telega-directory (expand-file-name "~/.local/share/telega")) - (prefix-key global-map (kbd "C-c t") telega-prefix-map) + ;; (prefix-key global-map (kbd "C-c t") telega-prefix-map) (unless (display-graphic-p) (setq telega-use-images nil)) (when (modulep! :editor evil) (cl-pushnew 'telega +evil-collection-disabled-list :test #'equal) diff --git a/tools/nvim/lua/plugins/appearance.lua b/tools/nvim/lua/plugins/appearance.lua index ff59dbd..148eee9 100644 --- a/tools/nvim/lua/plugins/appearance.lua +++ b/tools/nvim/lua/plugins/appearance.lua @@ -4,7 +4,7 @@ return { "catppuccin/nvim", name = "catppuccin", opts = { - floavor = "auto", + flavor = "auto", background = { light = "latte", dark = "mocha", @@ -14,7 +14,13 @@ return { }, }, }, - + { + "rose-pine/neovim", + name = "rose-pine", + opts = { + variant = "dawn", + }, + }, { "olimorris/onedarkpro.nvim" }, { "rebelot/kanagawa.nvim" }, -- Highlight objects under the cursor @@ -85,4 +91,19 @@ return { opts = {}, dependencies = { "nvim-lua/plenary.nvim" }, }, + { + "folke/noice.nvim", + event = "VeryLazy", + opts = { + -- add any options here + }, + dependencies = { + -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries + "MunifTanjim/nui.nvim", + -- OPTIONAL: + -- `nvim-notify` is only needed, if you want to use the notification view. + -- If not available, we use `mini` as the fallback + "rcarriga/nvim-notify", + }, + }, }