1

Compare commits

...

4 Commits

4 changed files with 145 additions and 136 deletions

148
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1732307740,
"narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
"lastModified": 1736090999,
"narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=",
"owner": "Aylur",
"repo": "ags",
"rev": "81159966eb8b39b66c3efc133982fd76920c9605",
"rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c",
"type": "github"
},
"original": {
@ -27,11 +27,11 @@
]
},
"locked": {
"lastModified": 1731952585,
"narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
"lastModified": 1735172721,
"narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=",
"owner": "aylur",
"repo": "astal",
"rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
"rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2",
"type": "github"
},
"original": {
@ -45,11 +45,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1728330715,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"lastModified": 1735644329,
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
"owner": "numtide",
"repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
"type": "github"
},
"original": {
@ -66,11 +66,11 @@
]
},
"locked": {
"lastModified": 1728330715,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"lastModified": 1735644329,
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
"owner": "numtide",
"repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
"type": "github"
},
"original": {
@ -85,11 +85,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1733621237,
"narHash": "sha256-VssGAIF33aFHe+U7DaT9jSHjETD25rVWaW/Y+IWMrSI=",
"lastModified": 1736586776,
"narHash": "sha256-UAt225bI+EmplGmmiWQHzXN18ZxaK2l3PfF/SV/Zldo=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "d3f55c978e1faef8940ab52b580bb8a2c3f68cef",
"rev": "8e1fd211d50232c3227a6e7a555515e5b3d3e333",
"type": "github"
},
"original": {
@ -100,11 +100,11 @@
},
"flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@ -135,11 +135,11 @@
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github"
},
"original": {
@ -215,18 +215,14 @@
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733318908,
"narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
"lastModified": 1735882644,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github"
},
"original": {
@ -259,11 +255,11 @@
},
"hardware": {
"locked": {
"lastModified": 1733481457,
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
"lastModified": 1736441705,
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
"type": "github"
},
"original": {
@ -279,11 +275,11 @@
]
},
"locked": {
"lastModified": 1733484277,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"lastModified": 1736508663,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
"type": "github"
},
"original": {
@ -300,11 +296,11 @@
]
},
"locked": {
"lastModified": 1733484277,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"lastModified": 1736366465,
"narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5",
"type": "github"
},
"original": {
@ -350,11 +346,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1731668526,
"narHash": "sha256-ZszfGYOrwol3MGFpttahldT+UOfqXckk6XwZrUyHLxE=",
"lastModified": 1734239219,
"narHash": "sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "97fe58a8ac15663b1ecdebd84d2187eb71f8532d",
"rev": "a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15",
"type": "github"
},
"original": {
@ -371,11 +367,11 @@
]
},
"locked": {
"lastModified": 1733570843,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"lastModified": 1736370755,
"narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
"type": "github"
},
"original": {
@ -423,11 +419,11 @@
]
},
"locked": {
"lastModified": 1731593150,
"narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=",
"lastModified": 1734234111,
"narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "40d882b55e89add1ded379cc99edaab24983d6d9",
"rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d",
"type": "github"
},
"original": {
@ -438,11 +434,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github"
},
"original": {
@ -454,11 +450,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1733412085,
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"lastModified": 1736200483,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github"
},
"original": {
@ -486,11 +482,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1733392399,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
"lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github"
},
"original": {
@ -502,11 +498,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"lastModified": 1733940404,
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
"type": "github"
},
"original": {
@ -518,11 +514,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1733581040,
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github"
},
"original": {
@ -534,11 +530,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1733581040,
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github"
},
"original": {
@ -563,11 +559,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1733667809,
"narHash": "sha256-RajfsaKZIc3bk75wiaw+ZYVDSMljdLWW69VCT90f05w=",
"lastModified": 1736430661,
"narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "e2f81c8e8e8baa28b100e0e43b721f16de6299d8",
"rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b",
"type": "github"
},
"original": {
@ -583,11 +579,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1733669740,
"narHash": "sha256-N+aWRHO1XksDJcMM83Q71HlAkKgAoI9HZ6JdhdUw4aY=",
"lastModified": 1736596029,
"narHash": "sha256-94uEabKA6G6HUnkH8l34T2YOwbLbo95X13yhHymE1W8=",
"owner": "nix-community",
"repo": "NUR",
"rev": "b7c6c04c716faea302f961e60bb534906bc161d3",
"rev": "764ca2343bfb3ef4549c05309a3c23f35318b877",
"type": "github"
},
"original": {
@ -606,11 +602,11 @@
]
},
"locked": {
"lastModified": 1733411491,
"narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=",
"lastModified": 1735854821,
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
"owner": "NuschtOS",
"repo": "search",
"rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe",
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
"type": "github"
},
"original": {
@ -671,11 +667,11 @@
]
},
"locked": {
"lastModified": 1733440889,
"narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
"lastModified": 1736154270,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github"
},
"original": {

View File

@ -42,7 +42,7 @@ in {
clojure-lsp
cmake-language-server
haskell-language-server
# ltex-ls # Terribly slow
ltex-ls # TODO: Only enable on-demand
lua-language-server
nil
nixd
@ -393,39 +393,31 @@ in {
opts = {
keymap.preset = "enter";
appearance = {
use_nvim_cmp_as_default = true;
nerd_font_variant = "mono";
};
fuzzy = {
use_typo_resistance = true;
use_frequency = true;
use_proximity = true;
};
sources = {
completion = {
enabled_providers = ["lsp" "path" "snippets"]; # No "buffer"
};
keyword = {
range = "full"; # Fuzzy match on text before and after the cursor
};
completion = {
accept = {
auto_brackets = {
enabled = false;
enabled = true; # Insert brackets for functions
};
};
menu = {
enabled = true;
auto_show = true;
scrollbar = true;
border = "rounded";
};
documentation = {
auto_show = true;
auto_show_delay_ms = 250;
treesitter_highlighting = true;
window = {
scrollbar = true;
border = "rounded";
};
};
@ -441,6 +433,21 @@ in {
border = "rounded";
};
};
fuzzy = {
use_typo_resistance = true;
use_frecency = true;
use_proximity = true;
};
sources = {
default = ["lsp" "path" "snippets"]; # No "buffer"
};
appearance = {
use_nvim_cmp_as_default = true;
nerd_font_variant = "mono";
};
};
};
@ -693,7 +700,12 @@ in {
event = ["BufReadPost" "BufNewFile"];
config = mkDefaultConfig name;
opts = {
current_line_blame = false;
numhl = false;
linehl = false;
current_line_blame = true;
current_line_blame_opts = {
delay = 50;
};
};
};
@ -768,16 +780,17 @@ in {
intellitab = {
name = "intellitab";
# pkg = pkgs.vimPlugins.intellitab-nvim; # Prints at each indent :(
pkg = pkgs.vimUtils.buildVimPlugin {
name = "intellitab-nvim";
src = pkgs.fetchFromGitHub {
owner = "ChUrl";
repo = "intellitab.nvim";
rev = "6d644b7d92198477f2920d0c3b3b22dad470ef10"; # Disable print
sha256 = "sha256-MwBcsYpyrjoXa7nxcwaci3h0NIWyMoF1NyYfEbFzo0E=";
};
};
pkg = pkgs.vimPlugins.intellitab-nvim; # Prints at each indent :(
# TODO: Build broken
# pkg = pkgs.vimUtils.buildVimPlugin {
# name = "intellitab-nvim";
# src = pkgs.fetchFromGitHub {
# owner = "ChUrl";
# repo = "intellitab.nvim";
# rev = "6d644b7d92198477f2920d0c3b3b22dad470ef10"; # Disable print
# sha256 = "sha256-MwBcsYpyrjoXa7nxcwaci3h0NIWyMoF1NyYfEbFzo0E=";
# };
# };
lazy = true;
event = ["InsertEnter"];
};
@ -1332,7 +1345,7 @@ in {
end
'';
opts = {
render = "wrapped-compact";
render = "default";
max_width = 45; # In columns
top_down = false;
};
@ -1595,19 +1608,20 @@ in {
lazy = true;
};
_telescope-tabs = {
name = "telescope-tabs";
pkg = pkgs.vimUtils.buildVimPlugin {
name = "telescope-tabs";
src = pkgs.fetchFromGitHub {
owner = "LukasPietzschmann";
repo = "telescope-tabs";
rev = "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3";
sha256 = "sha256-IvxZVHPtApnzUXIQzklT2C2kAxgtAkBUq3GNxwgPdPY=";
};
};
lazy = true;
};
# TODO: Build broken
# _telescope-tabs = {
# name = "telescope-tabs";
# pkg = pkgs.vimUtils.buildVimPlugin {
# name = "telescope-tabs";
# src = pkgs.fetchFromGitHub {
# owner = "LukasPietzschmann";
# repo = "telescope-tabs";
# rev = "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3";
# sha256 = "sha256-IvxZVHPtApnzUXIQzklT2C2kAxgtAkBUq3GNxwgPdPY=";
# };
# };
# lazy = true;
# };
_telescope-undo = {
name = "telescope-undo";
@ -1629,7 +1643,7 @@ in {
dependencies = [
_plenary
_telescope-fzf-native
_telescope-tabs
# _telescope-tabs
_telescope-undo
_telescope-ui-select
];
@ -1638,7 +1652,7 @@ in {
"undo"
"ui-select"
"fzf"
"telescope-tabs"
# "telescope-tabs"
];
in ''
function(_, opts)

View File

@ -278,12 +278,12 @@
];
leader = [
# {
# mode = "n";
# key = "<leader>L";
# action = "<cmd>Lazy<cr>";
# options.desc = "Lazy Packages";
# }
{
mode = "n";
key = "<leader>L";
action = "<cmd>Lazy<cr>";
options.desc = "Lazy Packages";
}
{
mode = "n";
key = "<leader>n";
@ -320,12 +320,12 @@
action = "<cmd>Telescope commands<cr>";
options.desc = "Telescope Command";
}
# {
# mode = "n";
# key = "<leader>M";
# action = "<cmd>Telescope marks<cr>";
# options.desc = "Telescope Marks";
# }
{
mode = "n";
key = "<leader>M";
action = "<cmd>Telescope marks<cr>";
options.desc = "Telescope Marks";
}
# {
# mode = "n";
# key = "<leader>J";

View File

@ -328,8 +328,6 @@ with mylib.networking; {
# ausweisapp.openFirewall = true; # Directly set port in firewall
};
hardware.pulseaudio.enable = false; # Get off my lawn
# List services that you want to enable:
services = {
# Enable sound with pipewire.
@ -341,6 +339,7 @@ with mylib.networking; {
jack.enable = false;
wireplumber.enable = true;
};
pulseaudio.enable = false; # Get off my lawn
# Enable the X11 windowing system.
xserver = {