From 2b3f191572d429474f484624e3c6b83fdd7dd74b Mon Sep 17 00:00:00 2001 From: Mathias Magnusson Date: Tue, 6 Jan 2026 00:57:02 +0100 Subject: Initial commit --- dot-config/fish/config.fish | 25 ++++++++ dot-config/git/config | 9 +++ dot-config/lazygit/config.yml | 2 + dot-config/nvim/init.lua | 68 ++++++++++++++++++++++ .../default.target.wants/yubikey-agent.service | 1 + .../user/yubikey-agent.service.d/override.conf | 3 + 6 files changed, 108 insertions(+) create mode 100644 dot-config/fish/config.fish create mode 100644 dot-config/git/config create mode 100644 dot-config/lazygit/config.yml create mode 100644 dot-config/nvim/init.lua create mode 120000 dot-config/systemd/user/default.target.wants/yubikey-agent.service create mode 100644 dot-config/systemd/user/yubikey-agent.service.d/override.conf (limited to 'dot-config') diff --git a/dot-config/fish/config.fish b/dot-config/fish/config.fish new file mode 100644 index 0000000..ee0ce2c --- /dev/null +++ b/dot-config/fish/config.fish @@ -0,0 +1,25 @@ +if status is-interactive +end + +function fish_greeting +end + +fish_add_path "$HOME/.local/bin" + +alias e nvim +alias lg lazygit +alias sudo "sudo -A" +set -x SUDO_ASKPASS "$HOME/.local/bin/zenity-askpass" + +set -x SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" + +set -x VISUAL nvim +set -x EDITOR nvim + +set -x GOPATH "$HOME/.local/share/go" +fish_add_path "$GOPATH/bin" + +set -x CARGO_HOME "$HOME/.local/share/cargo" +fish_add_path "$CARGO_HOME/bin" + +# direnv hook fish | source diff --git a/dot-config/git/config b/dot-config/git/config new file mode 100644 index 0000000..441c814 --- /dev/null +++ b/dot-config/git/config @@ -0,0 +1,9 @@ +[init] + defaultBranch = master +[merge] + conflictStyle = diff3 +[user] + email = mathias@magnusson.space + name = Mathias Magnusson +[pull] + rebase = true diff --git a/dot-config/lazygit/config.yml b/dot-config/lazygit/config.yml new file mode 100644 index 0000000..5fd5726 --- /dev/null +++ b/dot-config/lazygit/config.yml @@ -0,0 +1,2 @@ +git: + autoFetch: false diff --git a/dot-config/nvim/init.lua b/dot-config/nvim/init.lua new file mode 100644 index 0000000..3fe7c82 --- /dev/null +++ b/dot-config/nvim/init.lua @@ -0,0 +1,68 @@ +-- Settings +local set = vim.o + +set.et = true +set.sw = 4 +set.sts = -1 +set.ts = 4 +set.nu = true +set.signcolumn = "yes" +set.updatetime = 1000 +set.ignorecase = true +set.smartcase = true +set.backup = false +set.undodir = vim.fn.stdpath("data") .. "/undodir" +set.undofile = true +set.splitright = true +set.splitbelow = true +set.breakindent = true +set.termguicolors = true +set.linebreak = true + +vim.g.omni_sql_no_default_maps = 1337 +-- vim.g.asmsyntax = "nasm" + +vim.api.nvim_create_autocmd("TermOpen", { + group = vim.api.nvim_create_augroup("TermNoNumbers", {}), + command = "setlocal nonu nornu signcolumn=no" +}) + +vim.api.nvim_create_autocmd("TextYankPost", { + group = vim.api.nvim_create_augroup("HighlightYank", {}), + callback = function() vim.highlight.on_yank() end, +}) + +vim.filetype.add({ + filename = { + ["compose.yaml"] = "yaml.docker-compose", + ["docker-compose.yaml"] = "yaml.docker-compose", + }, + extension = { + templ = "templ", + typ = "typst", + } +}) + +vim.diagnostic.config({ + virtual_text = true, + virtual_lines = { current_line = true }, +}) + +-- Keymaps +for _, mod in ipairs({ + function(x) return x end, + function(x) return "" .. x end, + function(x) return "" end, + function(x) return string.upper(x) end, +}) do + vim.keymap.set("", mod("n"), mod("j")) + vim.keymap.set("", mod("e"), mod("k")) + vim.keymap.set("", mod("k"), mod("n")) + vim.keymap.set("", mod("j"), mod("e")) +end + +vim.g.mapleader = " " +vim.keymap.set("n", "gp", vim.cmd.bp) +vim.keymap.set("n", "gn", vim.cmd.bn) +vim.keymap.set("n", "h", function() set.hls = not set.hls end) +vim.keymap.set("n", "", "", { silent = true }) diff --git a/dot-config/systemd/user/default.target.wants/yubikey-agent.service b/dot-config/systemd/user/default.target.wants/yubikey-agent.service new file mode 120000 index 0000000..c9efe90 --- /dev/null +++ b/dot-config/systemd/user/default.target.wants/yubikey-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/user/yubikey-agent.service \ No newline at end of file diff --git a/dot-config/systemd/user/yubikey-agent.service.d/override.conf b/dot-config/systemd/user/yubikey-agent.service.d/override.conf new file mode 100644 index 0000000..f5fa213 --- /dev/null +++ b/dot-config/systemd/user/yubikey-agent.service.d/override.conf @@ -0,0 +1,3 @@ +[Service] +Environment=WAYLAND_DISPLAY=wayland-0 +Environment=DISPLAY=:1 -- cgit v1.2.3