From 7a17c9bf043d61292c7e7947d0fedb5c80d63133 Mon Sep 17 00:00:00 2001 From: Nigel Date: Tue, 21 Jan 2025 20:07:49 +0100 Subject: [PATCH] git config removed gpg signkey, rofi theme updated to catpuccin emacs config update --- .gitmodules | 3 - git/dot-gitconfig | 3 +- rofi/config.rasi | 142 ++-------------------------------------- wezterm/dot-wezterm.lua | 82 +++++++++++++++++++++++ 4 files changed, 87 insertions(+), 143 deletions(-) delete mode 100644 .gitmodules create mode 100644 wezterm/dot-wezterm.lua diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index bdd2ec1..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "nvim"] - path = nvim - url = gitea@git.barink.dev:Nigel/neovim_config.git diff --git a/git/dot-gitconfig b/git/dot-gitconfig index 99a4bf5..97727e5 100644 --- a/git/dot-gitconfig +++ b/git/dot-gitconfig @@ -1,7 +1,6 @@ [user] email = nigelbarink@hotmail.com name = Nigel - signingkey = C54278C495538619 [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f @@ -10,4 +9,4 @@ [init] defaultBranch = main [commit] - gpgsign = true + gpgsign = false diff --git a/rofi/config.rasi b/rofi/config.rasi index cde2b85..1c63e73 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,141 +1,6 @@ configuration { -/* modi: "window,run,ssh";*/ -/* font: "mono 12";*/ -/* location: 0;*/ -/* yoffset: 0;*/ -/* xoffset: 0;*/ -/* fixed-num-lines: true;*/ -/* show-icons: false;*/ -/* terminal: "rofi-sensible-terminal";*/ -/* ssh-client: "ssh";*/ -/* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/ -/* run-command: "{cmd}";*/ -/* run-list-command: "";*/ -/* run-shell-command: "{terminal} -e {cmd}";*/ -/* window-command: "wmctrl -i -R {window}";*/ -/* window-match-fields: "all";*/ -/* icon-theme: ;*/ -/* drun-match-fields: "name,generic,exec,categories,keywords";*/ -/* drun-categories: ;*/ -/* drun-show-actions: false;*/ -/* drun-display-format: "{name} [({generic})]";*/ -/* drun-url-launcher: "xdg-open";*/ -/* disable-history: false;*/ -/* ignored-prefixes: "";*/ -/* sort: false;*/ -/* sorting-method: "normal";*/ -/* case-sensitive: false;*/ -/* cycle: true;*/ -/* sidebar-mode: false;*/ -/* hover-select: false;*/ -/* eh: 1;*/ -/* auto-select: false;*/ -/* parse-hosts: false;*/ -/* parse-known-hosts: true;*/ -/* combi-modi: "window,run";*/ -/* matching: "normal";*/ -/* tokenize: true;*/ -/* m: "-5";*/ -/* filter: ;*/ -/* dpi: -1;*/ -/* threads: 0;*/ -/* scroll-method: 0;*/ -/* window-format: "{w} {c} {t}";*/ -/* click-to-exit: true;*/ -/* max-history-size: 25;*/ -/* combi-hide-mode-prefix: false;*/ -/* combi-display-format: "{mode} {text}";*/ -/* matching-negate-char: '-' /* unsupported */;*/ -/* cache-dir: ;*/ -/* window-thumbnail: false;*/ -/* drun-use-desktop-cache: false;*/ -/* drun-reload-desktop-cache: false;*/ -/* normalize-match: false;*/ -/* steal-focus: false;*/ -/* application-fallback-icon: ;*/ -/* pid: "/run/user/1000/rofi.pid";*/ -/* display-window: ;*/ -/* display-windowcd: ;*/ -/* display-run: ;*/ -/* display-ssh: ;*/ -/* display-drun: ;*/ -/* display-combi: ;*/ -/* display-keys: ;*/ -/* display-filebrowser: ;*/ -/* kb-primary-paste: "Control+V,Shift+Insert";*/ -/* kb-secondary-paste: "Control+v,Insert";*/ -/* kb-clear-line: "Control+w";*/ -/* kb-move-front: "Control+a";*/ -/* kb-move-end: "Control+e";*/ -/* kb-move-word-back: "Alt+b,Control+Left";*/ -/* kb-move-word-forward: "Alt+f,Control+Right";*/ -/* kb-move-char-back: "Left,Control+b";*/ -/* kb-move-char-forward: "Right,Control+f";*/ -/* kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/ -/* kb-remove-word-forward: "Control+Alt+d";*/ -/* kb-remove-char-forward: "Delete,Control+d";*/ -/* kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/ -/* kb-remove-to-eol: "Control+k";*/ -/* kb-remove-to-sol: "Control+u";*/ -/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/ -/* kb-accept-custom: "Control+Return";*/ -/* kb-accept-custom-alt: "Control+Shift+Return";*/ -/* kb-accept-alt: "Shift+Return";*/ -/* kb-delete-entry: "Shift+Delete";*/ -/* kb-mode-next: "Shift+Right,Control+Tab";*/ -/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/ -/* kb-mode-complete: "Control+l";*/ -/* kb-row-left: "Control+Page_Up";*/ -/* kb-row-right: "Control+Page_Down";*/ -/* kb-row-up: "Up,Control+p,ISO_Left_Tab";*/ -/* kb-row-down: "Down,Control+n";*/ -/* kb-row-tab: "Tab";*/ -/* kb-page-prev: "Page_Up";*/ -/* kb-page-next: "Page_Down";*/ -/* kb-row-first: "Home,KP_Home";*/ -/* kb-row-last: "End,KP_End";*/ -/* kb-row-select: "Control+space";*/ -/* kb-screenshot: "Alt+S";*/ -/* kb-ellipsize: "Alt+period";*/ -/* kb-toggle-case-sensitivity: "grave,dead_grave";*/ -/* kb-toggle-sort: "Alt+grave";*/ -/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/ -/* kb-custom-1: "Alt+1";*/ -/* kb-custom-2: "Alt+2";*/ -/* kb-custom-3: "Alt+3";*/ -/* kb-custom-4: "Alt+4";*/ -/* kb-custom-5: "Alt+5";*/ -/* kb-custom-6: "Alt+6";*/ -/* kb-custom-7: "Alt+7";*/ -/* kb-custom-8: "Alt+8";*/ -/* kb-custom-9: "Alt+9";*/ -/* kb-custom-10: "Alt+0";*/ -/* kb-custom-11: "Alt+exclam";*/ -/* kb-custom-12: "Alt+at";*/ -/* kb-custom-13: "Alt+numbersign";*/ -/* kb-custom-14: "Alt+dollar";*/ -/* kb-custom-15: "Alt+percent";*/ -/* kb-custom-16: "Alt+dead_circumflex";*/ -/* kb-custom-17: "Alt+ampersand";*/ -/* kb-custom-18: "Alt+asterisk";*/ -/* kb-custom-19: "Alt+parenleft";*/ -/* kb-select-1: "Super+1";*/ -/* kb-select-2: "Super+2";*/ -/* kb-select-3: "Super+3";*/ -/* kb-select-4: "Super+4";*/ -/* kb-select-5: "Super+5";*/ -/* kb-select-6: "Super+6";*/ -/* kb-select-7: "Super+7";*/ -/* kb-select-8: "Super+8";*/ -/* kb-select-9: "Super+9";*/ -/* kb-select-10: "Super+0";*/ -/* ml-row-left: "ScrollLeft";*/ -/* ml-row-right: "ScrollRight";*/ -/* ml-row-up: "ScrollUp";*/ -/* ml-row-down: "ScrollDown";*/ -/* me-select-entry: "MousePrimary";*/ -/* me-accept-entry: "MouseDPrimary";*/ -/* me-accept-custom: "Control+MouseDPrimary";*/ + modi: "window,run,ssh"; + font: "SF Mono 12"; timeout { action: "kb-cancel"; delay: 0; @@ -145,4 +10,5 @@ configuration { sorting-method: "name"; } } -@theme "/home/nigel/.local/share/rofi/themes/rounded-purple-dark.rasi" + +@theme "/home/nigel/.local/share/rofi/themes/catppuccin-frappe.rasi" diff --git a/wezterm/dot-wezterm.lua b/wezterm/dot-wezterm.lua new file mode 100644 index 0000000..07f4d19 --- /dev/null +++ b/wezterm/dot-wezterm.lua @@ -0,0 +1,82 @@ +-- pull in the wezterm API +local wezterm = require('wezterm') +local launch_menu = {} + +-- This will hold the configuration +local config = wezterm.config_builder() +config.colors = { background = "#1e1e2e" } +config.color_scheme = 'Catppuccin Mocha' +config.window_background_opacity = 0.8 + +config.window_frame = { + font = wezterm.font { family = 'Roboto', weight = 'Bold' }, + font_size = 12, + active_titlebar_bg = '#1e1e2e', + inactive_titlebar_bg = '#1e1e2e', +} + +config.colors = { + tab_bar = { + active_tab = { + + bg_color = '#181825', + fg_color = "#B4BEFE" + }, + inactive_tab = { + bg_color = '#1e1e2e', + fg_color = "#CDD6F4" + }, + new_tab = { + bg_color = '#1e1e2e', + fg_color = "#CDD6F4" + }, + new_tab_hover = { + bg_color = '#1b1032', + fg_color = '#808080', + } + }, +} + +-- Keys +local act = wezterm.action +config.leader = { key = "a", mods = "CTRL", timeout_milliseconds = 1000 } + +config.keys = { + { key = "s", mods = "LEADER", action = act.SplitVertical { domain = "CurrentPaneDomain" } }, + { key = "v", mods = "LEADER", action = act.SplitHorizontal { domain = "CurrentPaneDomain" } }, + { key = "h", mods = "LEADER", action = act.ActivatePaneDirection("Left") }, + { key = "j", mods = "LEADER", action = act.ActivatePaneDirection("Down") }, + { key = "k", mods = "LEADER", action = act.ActivatePaneDirection("Up") }, + { key = "l", mods = "LEADER", action = act.ActivatePaneDirection("Right") }, + { key = "q", mods = "LEADER", action = act.CloseCurrentPane { confirm = false } }, + { key = "n", mods = "LEADER", action = act.ShowTabNavigator }, + { key = "t", mods = "LEADER", action = act.ShowLauncher }, +} + +config.enable_tab_bar = false +config.window_decorations = "INTEGRATED_BUTTONS | TITLE | RESIZE" +if wezterm.target_triple == 'x86_64-pc-windows-msvc' then + table.insert(launch_menu, { + label = 'PowerShell 7', + args = { 'pwsh.exe', '-NoLogo' }, + }) + table.insert(launch_menu, { + label = 'PowerShell', + args = { 'PowerShell.exe', '-NoLogo' }, + }) + + for _, vsvers in + ipairs(wezterm.glob('VisualStudio20*', 'D:/')) do + local year = vsvers:gsub('VisualStudio', '') + table.insert(launch_menu, { + label = 'X64 Native Tools VS ' .. year, + args = { + 'cmd.exe', + '/k', + 'D:/' .. vsvers .. '/VC/Auxiliary/Build/vcvars64.bat' }, + }) + end +end + +config.launch_menu = launch_menu +return config