tmux, nvim

This commit is contained in:
2025-05-02 21:55:40 +02:00
parent ec0ebd2af0
commit 2dbac00ee4
10 changed files with 221 additions and 42 deletions

10
.bashrc
View File

@@ -162,7 +162,6 @@ alias edit-vim='cd ~/.config/nvim && vim .'
hostname=$(cat ~/hostname)
if [[ $hostname == "arch-bepis" ]]; then
setxkbmap se
export SSH_AUTH_SOCK=/home/wholteza/.bitwarden-ssh-agent.sock
else
export PATH="$PATH:/opt/nvim-linux-x86_64/bin"
@@ -170,7 +169,12 @@ else
fi
export PATH="/home/wholteza/.cargo/bin:$PATH"
### Start oh my posh
eval "$(oh-my-posh init bash --config '~/.config/oh-my-posh/theme.omp.json')"
source /usr/share/nvm/init-nvm.sh
export ompPath="$HOME/.config/oh-my-posh/theme.omp.json"
### Start oh my posh
eval "$(oh-my-posh init bash --config $ompPath)"
### Start tmux if not already in a session
[[ -z "$TMUX" ]] && exec tmux

View File

@@ -3,18 +3,18 @@
"LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" },
"SchemaStore.nvim": { "branch": "main", "commit": "d521e71f9d5ac1c29a7653528d4e5c66ffe229c5" },
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
"blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
"catppuccin": { "branch": "main", "commit": "b7bbdf93b42866f166af98d39a2563eedb7cabac" },
"cmake-tools.nvim": { "branch": "master", "commit": "1ee065c33ca777c0e03cd7c358010202ee70bb88" },
"conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
"copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" },
"dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitsigns.nvim": { "branch": "main", "commit": "ee28ba3e70ecea811b8f6d7b51d81976e94b121c" },
"gitsigns.nvim": { "branch": "main", "commit": "1796c7cedfe7e5dd20096c5d7b8b753d8f8d22eb" },
"grug-far.nvim": { "branch": "main", "commit": "6ff8a205a29db3a9b08e5debe09452b4d6fd6591" },
"inc-rename.nvim": { "branch": "main", "commit": "77accd33ef57c974213cf3bf131688796eced8cf" },
"inc-rename.nvim": { "branch": "main", "commit": "726d28468e900e1172a04faeb7af0b18acd609e7" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
@@ -28,10 +28,10 @@
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
"mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
"mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
"mini.snippets": { "branch": "main", "commit": "d005684e620e76eb2a5fbbbd211a1eba7212b4aa" },
"mini.starter": { "branch": "main", "commit": "d8038690eadf203a40863c3a9423df880a901d39" },
"neotest": { "branch": "master", "commit": "6267dcd577aa519c828d2526b05844770d3a2c6a" },
"neotest-golang": { "branch": "main", "commit": "bea3921363c04d576fcc9a4bd151fff4b48517c6" },
"neotest-dotnet": { "branch": "main", "commit": "5a2fa35c3c6a72cfd3fc6a28b3d1af6e68e6c3a8" },
"neotest-golang": { "branch": "main", "commit": "5d1fdb068914ac23593495e71ecf9b1fad309b45" },
"neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
"neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" },
"neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" },
@@ -39,14 +39,14 @@
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
"nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
"nvim-ansible": { "branch": "main", "commit": "bba61168b7aef735e7f950fdfece5ef6c388eacf" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
"nvim-dev-container": { "branch": "main", "commit": "ba9666bdaec23cfe8087c0b6bb0a15c93ec8ba87" },
"nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
"nvim-lspconfig": { "branch": "master", "commit": "94d0fec9135719e046903bbbbf8f39e3d3436d4e" },
"nvim-lspconfig": { "branch": "master", "commit": "46434074f188e6bfccf9d9153dd8be6b1381498b" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" },
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
"omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "ec1a2431f8872f650a85ed71c24f0715df2e49c2" },
"persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"render-markdown.nvim": { "branch": "main", "commit": "8c33733b9af902250731539b2fe3920c76993765" },

View File

@@ -6,6 +6,8 @@
"lazyvim.plugins.extras.coding.yanky",
"lazyvim.plugins.extras.editor.dial",
"lazyvim.plugins.extras.editor.inc-rename",
"lazyvim.plugins.extras.editor.snacks_explorer",
"lazyvim.plugins.extras.editor.snacks_picker",
"lazyvim.plugins.extras.formatting.black",
"lazyvim.plugins.extras.formatting.prettier",
"lazyvim.plugins.extras.lang.ansible",
@@ -17,6 +19,7 @@
"lazyvim.plugins.extras.lang.json",
"lazyvim.plugins.extras.lang.markdown",
"lazyvim.plugins.extras.lang.nix",
"lazyvim.plugins.extras.lang.omnisharp",
"lazyvim.plugins.extras.lang.php",
"lazyvim.plugins.extras.lang.python",
"lazyvim.plugins.extras.lang.sql",
@@ -32,7 +35,7 @@
"lazyvim.plugins.extras.util.gitui",
"lazyvim.plugins.extras.util.mini-hipatterns"
],
"install_version": 8,
"install_version": 7,
"news": {
"NEWS.md": "10960"
},

View File

@@ -13,12 +13,11 @@ return {
},
-- Theming
{ "catppuccin/nvim" },
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 },
{
"LazyVim/LazyVim",
opts = {
colorscheme = "catppuccin",
style = "mocha",
colorscheme = "catppuccin-mocha",
},
},
@@ -36,7 +35,6 @@ return {
{
"hrsh7th/nvim-cmp",
dependencies = { "hrsh7th/cmp-emoji" },
---@param opts cmp.ConfigSchema
opts = {
sources = {
{ name = "emoji" }

View File

@@ -1,5 +1,54 @@
{
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
"palette": {
"base": "#1E1E2E",
"blue": "#89B4FA",
"crust": "#11111B",
"docker": "p:sky",
"false": "p:red",
"flamingo": "#F2CDCD",
"git": "p:lavender",
"go": "p:mauve",
"green": "#A6E3A1",
"haskell": "p:mauve",
"julia": "p:mauve",
"lavender": "#B4BEFE",
"lua": "p:mauve",
"mantle": "#181825",
"maroon": "#EBA0AC",
"mauve": "#CBA6F7",
"os-bg": "p:overlay1",
"os-fg": "p:base",
"overlay0": "#6C7086",
"overlay1": "#7F849C",
"overlay2": "#9399B2",
"path": "p:yellow",
"peach": "#FAB387",
"pink": "#F5C2E7",
"python": "p:mauve",
"red": "#F38BA8",
"root-bg": "p:yellow",
"root-fg": "p:base",
"rosewater": "#F5E0DC",
"rust": "p:mauve",
"sapphire": "#74C7EC",
"sky": "#89DCEB",
"subtext0": "#A6ADC8",
"subtext1": "#BAC2DE",
"surface0": "#313244",
"surface1": "#45475A",
"surface2": "#585B70",
"teal": "#94E2D5",
"text": "#CDD6F4",
"time": "p:overlay1",
"true": "p:green",
"yellow": "#F9E2AF"
},
"transient_prompt": {
"template": "{{ now | date \"15:04:05\" }} {{ if gt .Code 0 }}<p:false></>{{ else }}<p:true></>{{ end }} ",
"foreground": "p:time"
},
"console_title_template": "{{ .Shell }} in {{ .PWD }}",
"blocks": [
{
"type": "prompt",
@@ -7,39 +56,47 @@
"segments": [
{
"properties": {
"cache_duration": "none"
"cache_duration": "none",
"windows": "\ue70f"
},
"template": "{{ .UserName }} ",
"foreground": "#E36464",
"type": "session",
"style": "plain"
},
{
"properties": {
"cache_duration": "none"
},
"template": "➜",
"foreground": "#62ED8B",
"type": "text",
"style": "plain"
"trailing_diamond": "\ue0b0",
"template": " {{ .Icon }} ",
"foreground": "p:os-fg",
"background": "p:os-bg",
"type": "os",
"style": "diamond",
"foreground_templates": ["{{ if .Root }}p:root-fg{{ end }}"],
"background_templates": ["{{ if .Root }}p:root-bg{{ end }}"]
},
{
"properties": {
"cache_duration": "none",
"style": "folder"
"folder_icon": "..",
"home_icon": "~",
"style": "agnoster_short"
},
"template": " {{ .Path }} ",
"foreground": "#56B6C2",
"foreground": "p:path",
"type": "path",
"style": "plain"
},
{
"properties": {
"branch_icon": "",
"cache_duration": "none"
"branch_icon": "\ue725 ",
"cache_duration": "none",
"cherry_pick_icon": "\ue29b ",
"commit_icon": "\uf417 ",
"fetch_stash_count": false,
"fetch_status": false,
"fetch_upstream_icon": false,
"merge_icon": "\ue727 ",
"no_commits_icon": "\uf0c3 ",
"rebase_icon": "\ue728 ",
"revert_icon": "\uf0e2 ",
"tag_icon": "\uf412 "
},
"template": " <#DDB15F>git(</>{{ .HEAD }}<#DDB15F>)</>",
"foreground": "#D4AAFC",
"template": "{{ .HEAD }} ",
"foreground": "p:git",
"type": "git",
"style": "plain"
},
@@ -47,14 +104,101 @@
"properties": {
"cache_duration": "none"
},
"template": " \uf119",
"foreground": "#DCB977",
"type": "status",
"template": "\uf308 {{ .Context }} ",
"foreground": "p:docker",
"type": "docker",
"style": "plain"
},
{
"properties": {
"cache_duration": "none"
},
"template": "\ue627 {{ if not .Error }}{{ .Full }}{{ end }} ",
"foreground": "p:go",
"type": "go",
"style": "plain"
},
{
"properties": {
"cache_duration": "none"
},
"template": "\ue61f {{ if not .Error }}{{ .Full }}{{ end }} ",
"foreground": "p:haskell",
"type": "haskell",
"style": "plain"
},
{
"properties": {
"cache_duration": "none"
},
"template": "\ue624 {{ if not .Error }}{{ .Full }}{{ end }} ",
"foreground": "p:julia",
"type": "julia",
"style": "plain"
},
{
"properties": {
"cache_duration": "none"
},
"template": "\ue620 {{ if not .Error }}{{ .Full }}{{ end }} ",
"foreground": "p:lua",
"type": "lua",
"style": "plain"
},
{
"properties": {
"cache_duration": "none",
"display_default": false,
"display_mode": "context"
},
"template": "\ue73c {{ if not .Error }}{{ if .Venv }}venv/{{ end }}{{ .Full }}{{ end }} ",
"foreground": "p:python",
"type": "python",
"style": "plain"
},
{
"properties": {
"cache_duration": "none"
},
"template": "\ue7a8 {{ if not .Error }}{{ .Full }}{{ end }} ",
"foreground": "p:rust",
"type": "rust",
"style": "plain"
},
{
"properties": {
"cache_duration": "none",
"style": "austin",
"threshold": 500
},
"template": "\udb81\udd1f {{ .FormattedMs }} ",
"foreground": "p:true",
"type": "executiontime",
"style": "plain",
"foreground_templates": ["{{ if .Code }}p:false{{ end }}"]
}
]
],
"newline": true
},
{
"type": "prompt",
"alignment": "left",
"segments": [
{
"properties": {
"always_enabled": true,
"cache_duration": "none"
},
"template": " ",
"foreground": "p:true",
"type": "status",
"style": "plain",
"foreground_templates": ["{{ if gt .Code 0 }}p:false{{ end }}"]
}
],
"newline": true
}
],
"version": 3,
"final_space": true
"shell_integration": true
}

7
.gitconfig Normal file
View File

@@ -0,0 +1,7 @@
[user]
email = zackarias@montell.se
name = wholteza
[credential]
helper = store --file ~/.git-credentials
[init]
defaultBranch = main

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "/home/wholteza/.tmux/plugins/tpm"]
path = /home/wholteza/.tmux/plugins/tpm
url = git@github.com:tmux-plugins/tpm.git

0
.hushlogin Normal file
View File

19
.tmux.conf Normal file
View File

@@ -0,0 +1,19 @@
set -g mouse on
# List of plugins
set -g @plugin 'catppuccin/tmux#v2.1.3'
set -g @catppuccin_flavor 'mocha'
set -g @plugin 'jaclu/tmux-menus'
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
# Other examples:
# set -g @plugin 'github_username/plugin_name'
# set -g @plugin 'github_username/plugin_name#branch'
# set -g @plugin 'git@github.com:user/plugin'
# set -g @plugin 'git@bitbucket.com:user/plugin'
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.tmux/plugins/tpm/tpm'

1
.tmux/plugins/tpm Submodule

Submodule .tmux/plugins/tpm added at 99469c4a9b