MROE CLEANING

master
Dustin Swan 10 months ago
parent 8b978b5a03
commit 493f981b76
Signed by: dustinswan
GPG Key ID: AB49BD6B2B3A6377

@ -1,8 +1,10 @@
{ {
"global": { "global": {
"ask_for_confirmation_before_quitting": true,
"check_for_updates_on_startup": true, "check_for_updates_on_startup": true,
"show_in_menu_bar": false, "show_in_menu_bar": false,
"show_profile_name_in_menu_bar": false "show_profile_name_in_menu_bar": false,
"unsafe_ui": false
}, },
"profiles": [ "profiles": [
{ {
@ -41,73 +43,6 @@
} }
] ]
}, },
{
"description": "Ctrl-h to backspace",
"manipulators": [
{
"conditions": [
{
"bundle_identifiers": [
"^org\\.gnu\\.Emacs$",
"^org\\.gnu\\.AquamacsEmacs$",
"^org\\.gnu\\.Aquamacs$",
"^org\\.pqrs\\.unknownapp.conkeror$",
"^com\\.microsoft\\.rdc$",
"^com\\.microsoft\\.rdc\\.",
"^net\\.sf\\.cord$",
"^com\\.thinomenon\\.RemoteDesktopConnection$",
"^com\\.itap-mobile\\.qmote$",
"^com\\.nulana\\.remotixmac$",
"^com\\.p5sys\\.jump\\.mac\\.viewer$",
"^com\\.p5sys\\.jump\\.mac\\.viewer\\.",
"^com\\.teamviewer\\.TeamViewer$",
"^com\\.vmware\\.horizon$",
"^com\\.2X\\.Client\\.Mac$",
"^com\\.apple\\.Terminal$",
"^com\\.googlecode\\.iterm2$",
"^co\\.zeit\\.hyperterm$",
"^co\\.zeit\\.hyper$",
"^org\\.alacritty$",
"^net\\.kovidgoyal\\.kitty$",
"^org\\.vim\\.",
"^com\\.qvacua\\.VimR$",
"^com\\.vmware\\.fusion$",
"^com\\.vmware\\.horizon$",
"^com\\.vmware\\.view$",
"^com\\.parallels\\.desktop$",
"^com\\.parallels\\.vm$",
"^com\\.parallels\\.desktop\\.console$",
"^org\\.virtualbox\\.app\\.VirtualBoxVM$",
"^com\\.citrix\\.XenAppViewer$",
"^com\\.vmware\\.proxyApp\\.",
"^com\\.parallels\\.winapp\\.",
"^org\\.x\\.X11$",
"^com\\.apple\\.x11$",
"^org\\.macosforge\\.xquartz\\.X11$",
"^org\\.macports\\.X11$",
"^com\\.sublimetext\\.",
"^com\\.microsoft\\.VSCode$"
],
"type": "frontmost_application_unless"
}
],
"from": {
"key_code": "j",
"modifiers": {
"mandatory": [
"control"
]
}
},
"to": [
{
"key_code": "delete_or_backspace"
}
],
"type": "basic"
}
]
},
{ {
"description": "Ctrl-m to enter", "description": "Ctrl-m to enter",
"manipulators": [ "manipulators": [
@ -175,76 +110,6 @@
} }
] ]
}, },
{
"description": "Ctrl-w to backspace",
"manipulators": [
{
"conditions": [
{
"bundle_identifiers": [
"^org\\.gnu\\.Emacs$",
"^org\\.gnu\\.AquamacsEmacs$",
"^org\\.gnu\\.Aquamacs$",
"^org\\.pqrs\\.unknownapp.conkeror$",
"^com\\.microsoft\\.rdc$",
"^com\\.microsoft\\.rdc\\.",
"^net\\.sf\\.cord$",
"^com\\.thinomenon\\.RemoteDesktopConnection$",
"^com\\.itap-mobile\\.qmote$",
"^com\\.nulana\\.remotixmac$",
"^com\\.p5sys\\.jump\\.mac\\.viewer$",
"^com\\.p5sys\\.jump\\.mac\\.viewer\\.",
"^com\\.teamviewer\\.TeamViewer$",
"^com\\.vmware\\.horizon$",
"^com\\.2X\\.Client\\.Mac$",
"^com\\.apple\\.Terminal$",
"^com\\.googlecode\\.iterm2$",
"^co\\.zeit\\.hyperterm$",
"^co\\.zeit\\.hyper$",
"^org\\.alacritty$",
"^net\\.kovidgoyal\\.kitty$",
"^org\\.vim\\.",
"^com\\.qvacua\\.VimR$",
"^com\\.vmware\\.fusion$",
"^com\\.vmware\\.horizon$",
"^com\\.vmware\\.view$",
"^com\\.parallels\\.desktop$",
"^com\\.parallels\\.vm$",
"^com\\.parallels\\.desktop\\.console$",
"^org\\.virtualbox\\.app\\.VirtualBoxVM$",
"^com\\.citrix\\.XenAppViewer$",
"^com\\.vmware\\.proxyApp\\.",
"^com\\.parallels\\.winapp\\.",
"^org\\.x\\.X11$",
"^com\\.apple\\.x11$",
"^org\\.macosforge\\.xquartz\\.X11$",
"^org\\.macports\\.X11$",
"^com\\.sublimetext\\.",
"^com\\.microsoft\\.VSCode$"
],
"type": "frontmost_application_unless"
}
],
"from": {
"key_code": "comma",
"modifiers": {
"mandatory": [
"control"
]
}
},
"to": [
{
"key_code": "delete_or_backspace",
"modifiers": [
"left_option"
]
}
],
"type": "basic"
}
]
},
{ {
"description": "Ctrl-p to up", "description": "Ctrl-p to up",
"manipulators": [ "manipulators": [
@ -385,7 +250,9 @@
{ {
"disable_built_in_keyboard_if_exists": false, "disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [], "fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": { "identifiers": {
"is_game_pad": false,
"is_keyboard": true, "is_keyboard": true,
"is_pointing_device": false, "is_pointing_device": false,
"product_id": 1553, "product_id": 1553,
@ -393,6 +260,12 @@
}, },
"ignore": false, "ignore": false,
"manipulate_caps_lock_led": false, "manipulate_caps_lock_led": false,
"mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [ "simple_modifications": [
{ {
"from": { "from": {
@ -434,12 +307,15 @@
} }
] ]
} }
] ],
"treat_as_built_in_keyboard": false
}, },
{ {
"disable_built_in_keyboard_if_exists": false, "disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [], "fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": { "identifiers": {
"is_game_pad": false,
"is_keyboard": true, "is_keyboard": true,
"is_pointing_device": false, "is_pointing_device": false,
"product_id": 601, "product_id": 601,
@ -447,12 +323,21 @@
}, },
"ignore": false, "ignore": false,
"manipulate_caps_lock_led": true, "manipulate_caps_lock_led": true,
"simple_modifications": [] "mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [],
"treat_as_built_in_keyboard": false
}, },
{ {
"disable_built_in_keyboard_if_exists": false, "disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [], "fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": { "identifiers": {
"is_game_pad": false,
"is_keyboard": true, "is_keyboard": true,
"is_pointing_device": false, "is_pointing_device": false,
"product_id": 49970, "product_id": 49970,
@ -460,12 +345,21 @@
}, },
"ignore": true, "ignore": true,
"manipulate_caps_lock_led": false, "manipulate_caps_lock_led": false,
"simple_modifications": [] "mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [],
"treat_as_built_in_keyboard": false
}, },
{ {
"disable_built_in_keyboard_if_exists": false, "disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [], "fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": { "identifiers": {
"is_game_pad": false,
"is_keyboard": false, "is_keyboard": false,
"is_pointing_device": true, "is_pointing_device": true,
"product_id": 49970, "product_id": 49970,
@ -473,12 +367,21 @@
}, },
"ignore": true, "ignore": true,
"manipulate_caps_lock_led": false, "manipulate_caps_lock_led": false,
"simple_modifications": [] "mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [],
"treat_as_built_in_keyboard": false
}, },
{ {
"disable_built_in_keyboard_if_exists": false, "disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [], "fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": { "identifiers": {
"is_game_pad": false,
"is_keyboard": true, "is_keyboard": true,
"is_pointing_device": false, "is_pointing_device": false,
"product_id": 4694, "product_id": 4694,
@ -486,12 +389,21 @@
}, },
"ignore": false, "ignore": false,
"manipulate_caps_lock_led": false, "manipulate_caps_lock_led": false,
"simple_modifications": [] "mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [],
"treat_as_built_in_keyboard": false
}, },
{ {
"disable_built_in_keyboard_if_exists": false, "disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [], "fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": { "identifiers": {
"is_game_pad": false,
"is_keyboard": true, "is_keyboard": true,
"is_pointing_device": false, "is_pointing_device": false,
"product_id": 34304, "product_id": 34304,
@ -499,7 +411,58 @@
}, },
"ignore": false, "ignore": false,
"manipulate_caps_lock_led": true, "manipulate_caps_lock_led": true,
"simple_modifications": [] "mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [],
"treat_as_built_in_keyboard": false
},
{
"disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": {
"is_game_pad": false,
"is_keyboard": true,
"is_pointing_device": false,
"product_id": 0,
"vendor_id": 0
},
"ignore": false,
"manipulate_caps_lock_led": true,
"mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [],
"treat_as_built_in_keyboard": false
},
{
"disable_built_in_keyboard_if_exists": false,
"fn_function_keys": [],
"game_pad_swap_sticks": false,
"identifiers": {
"is_game_pad": false,
"is_keyboard": false,
"is_pointing_device": true,
"product_id": 0,
"vendor_id": 0
},
"ignore": true,
"manipulate_caps_lock_led": false,
"mouse_flip_horizontal_wheel": false,
"mouse_flip_vertical_wheel": false,
"mouse_flip_x": false,
"mouse_flip_y": false,
"mouse_swap_wheels": false,
"mouse_swap_xy": false,
"simple_modifications": [],
"treat_as_built_in_keyboard": false
} }
], ],
"fn_function_keys": [ "fn_function_keys": [
@ -639,4 +602,4 @@
} }
} }
] ]
} }

@ -0,0 +1,6 @@
-- Options are automatically loaded before lazy.nvim startup
-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
-- Add any additional options here
vim.opt.relativenumber = false
vim.g.autoformat = false

@ -1,32 +1,101 @@
return { return {
{ "catppuccin/nvim", name = "catppuccin" },
{ "tpope/vim-sleuth" },
{
"LazyVim/LazyVim", {
opts = { "catppuccin/nvim",
colorscheme = "catppuccin", name = "catppuccin",
}, config = function()
}, require("catppuccin").setup({
transparent_background = true,
{ })
"nvim-orgmode/orgmode", end,
config = function() },
require("orgmode").setup_ts_grammar()
-- {
require("nvim-treesitter.configs").setup({ -- "f-person/auto-dark-mode.nvim",
highlight = { -- config = {
enable = true, -- set_dark_mode = function()
additional_vim_regex_highlighting = { "org" }, -- Required for spellcheck, some LaTex highlights and code block highlights that do not have ts grammar -- vim.api.nvim_set_option("background", "dark")
}, -- vim.cmd("colorscheme catppuccin")
ensure_installed = { "org" }, -- Or run :TSUpdate org -- -- vim.cmd("colorscheme rose-pine")
}) -- end,
-- set_light_mode = function()
require("orgmode").setup({ -- vim.api.nvim_set_option("background", "light")
org_agenda_files = { "~/Sync/Notes/*" }, -- vim.cmd("colorscheme catppuccin")
org_default_notes_file = "~/Sync/Notes/Main.org", -- -- vim.cmd("colorscheme rose-pine")
}) -- end,
end, -- },
}, -- },
{ "dhruvasagar/vim-table-mode" }, {
"LazyVim/LazyVim",
opts = {
colorscheme = "catppuccin",
background_colour = "#000000",
},
},
{
"nvim-orgmode/orgmode",
config = function()
require("orgmode").setup_ts_grammar()
require("nvim-treesitter.configs").setup({
highlight = {
enable = true,
additional_vim_regex_highlighting = { "org" }, -- Required for spellcheck, some LaTex highlights and code block highlights that do not have ts grammar
},
ensure_installed = { "org" }, -- Or run :TSUpdate org
})
require("orgmode").setup({
org_agenda_files = { "~/Sync/Notes/*" },
org_default_notes_file = "~/Sync/Notes/Main.org",
})
end,
},
{ "dhruvasagar/vim-table-mode" },
{
"akinsho/toggleterm.nvim",
version = "*",
config = true,
keys = {
{ [[<C-\>]] },
{
"<leader>TT",
"<cmd>ToggleTerm direction=horizontal<cr>",
desc = "Open a horizontal terminal",
},
{
"<leader>TV",
"<cmd>ToggleTerm size=60 direction=vertical<cr>",
desc = "Open a vertical terminal",
},
},
},
{
"christoomey/vim-tmux-navigator",
cmd = {
"TmuxNavigateLeft",
"TmuxNavigateDown",
"TmuxNavigateUp",
"TmuxNavigateRight",
"TmuxNavigatePrevious",
},
keys = {
{ "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
{ "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
{ "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
{ "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
{ "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
},
},
-- {
-- "https://git.sr.ht/~soywod/himalaya-vim",
-- },
} }

Loading…
Cancel
Save