Compare commits
9
Commits
3850a28fe4
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
440afaabf4 | ||
|
|
be2e26eb3f | ||
|
|
8eb5d34c5d | ||
|
|
fb0bf2ebb7 | ||
|
|
0e90085db5 | ||
|
|
1a1a343f86 | ||
|
|
642a03cf63 | ||
|
|
31cd448f44 | ||
|
|
ae20b8be07 |
@@ -7,10 +7,10 @@ vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
|
|||||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
|
||||||
|
|
||||||
-- Keybinds to make split navigation easier.
|
-- Keybinds to make split navigation easier.
|
||||||
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
|
--vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
|
||||||
vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
|
--vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
|
||||||
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
|
--vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
|
||||||
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
|
--vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
|
||||||
|
|
||||||
--vim.keymap.set('n', '<C-H>', '<C-w>H', { desc = 'Move window to the left' })
|
--vim.keymap.set('n', '<C-H>', '<C-w>H', { desc = 'Move window to the left' })
|
||||||
--vim.keymap.set('n', '<C-L>', '<C-w>L', { desc = 'Move window to the right' })
|
--vim.keymap.set('n', '<C-L>', '<C-w>L', { desc = 'Move window to the right' })
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ require('lazy').setup({
|
|||||||
require 'eliaskohout.plugins.conform', -- formatting
|
require 'eliaskohout.plugins.conform', -- formatting
|
||||||
require 'eliaskohout.plugins.lazydev', -- lua nvim setup
|
require 'eliaskohout.plugins.lazydev', -- lua nvim setup
|
||||||
require 'eliaskohout.plugins.fugitive', -- git support
|
require 'eliaskohout.plugins.fugitive', -- git support
|
||||||
|
require 'eliaskohout.plugins.goyo', -- distraction free writing
|
||||||
|
require 'eliaskohout.plugins.harpoon', -- quick switch lists
|
||||||
|
|
||||||
|
require 'eliaskohout.plugins.ax',
|
||||||
|
|
||||||
-- require 'eliaskohout.plugins.mini',
|
-- require 'eliaskohout.plugins.mini',
|
||||||
-- require 'eliaskohout.plugins.debug',
|
-- require 'eliaskohout.plugins.debug',
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
return { dir = "~/projects/ax/ax.nvim", config = function() require("ax").setup() end }
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
return {
|
||||||
|
'junegunn/goyo.vim',
|
||||||
|
config = function()
|
||||||
|
vim.api.nvim_create_autocmd('User', {
|
||||||
|
pattern = 'GoyoEnter',
|
||||||
|
callback = function()
|
||||||
|
vim.cmd.colorscheme 'melange'
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
return {
|
||||||
|
"ThePrimeagen/harpoon",
|
||||||
|
branch = "harpoon2",
|
||||||
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
|
config = function()
|
||||||
|
local harpoon = require("harpoon")
|
||||||
|
|
||||||
|
harpoon:setup()
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
|
||||||
|
vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<C-j>", function() harpoon:list():select(1) end)
|
||||||
|
vim.keymap.set("n", "<C-k>", function() harpoon:list():select(2) end)
|
||||||
|
vim.keymap.set("n", "<C-l>", function() harpoon:list():select(3) end)
|
||||||
|
vim.keymap.set("n", "<C-ö>", function() harpoon:list():select(4) end)
|
||||||
|
|
||||||
|
--vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
|
||||||
|
--vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
|
||||||
|
end,
|
||||||
|
}
|
||||||
Generated
+15
-15
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776613567,
|
"lastModified": 1781152676,
|
||||||
"narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
|
"narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
|
"rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -45,11 +45,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775425411,
|
"lastModified": 1779506708,
|
||||||
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
|
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
|
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -61,11 +61,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777077449,
|
"lastModified": 1781509190,
|
||||||
"narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
|
"narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
|
"rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -77,11 +77,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776877367,
|
"lastModified": 1781577229,
|
||||||
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
|
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
|
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -108,11 +108,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776771786,
|
"lastModified": 1781943681,
|
||||||
"narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
|
"narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=",
|
||||||
"owner": "mic92",
|
"owner": "mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
|
"rev": "420f8d2e9882911f65cfac15cc706f639ba96cca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -91,9 +91,6 @@
|
|||||||
pinentry.package = pkgs.pinentry-curses; # terminal PIN prompt for YubiKey
|
pinentry.package = pkgs.pinentry-curses; # terminal PIN prompt for YubiKey
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
# Home Manager should manage itself
|
# Home Manager should manage itself
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
htop
|
htop
|
||||||
home-manager
|
home-manager
|
||||||
usbutils
|
usbutils
|
||||||
|
cifs-utils
|
||||||
];
|
];
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
|
|||||||
+3
-3
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
pkgs.buildGoModule {
|
pkgs.buildGoModule {
|
||||||
pname = "ax";
|
pname = "ax";
|
||||||
version = "0.1.4";
|
version = "0.2.5";
|
||||||
|
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://g.eliaskohout.de/eliaskohout/ax";
|
url = "https://g.eliaskohout.de/eliaskohout/ax";
|
||||||
rev = "v0.1.4";
|
rev = "v0.2.5";
|
||||||
hash = "sha256-xAp02n6SDavTFn4ey60wp06EbaGyEpkK0JOy/P4EVAo=";
|
hash = "sha256-W0q2nft3Gp72jJSE8Q5WMhEqypcocr7wozil+xSf38M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "ax/src";
|
sourceRoot = "ax/src";
|
||||||
|
|||||||
Reference in New Issue
Block a user