Merge pull request #2 from dc-tec/development

Add new features
This commit is contained in:
Roel de Cort 2024-05-09 01:36:10 +02:00 committed by GitHub
commit f761ba7614
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 184 additions and 59 deletions

33
config/auto_cmds.nix Normal file
View file

@ -0,0 +1,33 @@
{
autoGroups = {
highlight_yank = {};
vim_enter = {};
};
autoCmd = [
{
group = "highlight_yank";
event = ["TextYankPost"];
pattern = "*";
callback = {
__raw = ''
function()
vim.highlight.on_yank()
end
'';
};
}
{
group = "vim_enter";
event = ["VimEnter"];
pattern = "*";
callback = {
__raw = ''
function()
vim.cmd('Startup')
end
'';
};
}
];
}

View file

@ -3,6 +3,7 @@ _: {
# General Configuration
./settings.nix
./keymaps.nix
./auto_cmds.nix
# Themes
./plugins/themes/default.nix
@ -25,6 +26,7 @@ _: {
# UI plugins
./plugins/ui/bufferline.nix
./plugins/ui/lualine.nix
./plugins/ui/startup.nix
# LSP
./plugins/lsp/lsp.nix

View file

@ -21,7 +21,7 @@
keymaps = [
{
mode = ["n"];
key = "<C-e>";
key = "<leader>e";
action = "<cmd>Neotree toggle<cr>";
options = {desc = "Open/Close Neotree";};
}

View file

@ -1,4 +1,3 @@
#TODO: Find out why we get an error when we have luasnip enabled, disabled for now!
{pkgs, ...}: {
plugins.luasnip = {
enable = true;

View file

@ -16,6 +16,7 @@
cmp = true;
notify = true;
gitsigns = true;
neotree = true;
which_key = true;
illuminate = {
enabled = true;

View file

@ -5,26 +5,7 @@ _: {
disabledFiletypes = {
statusline = ["dashboard" "alpha"];
};
theme = {
normal = {
a = {
bg = "#b4befe";
fg = "#1c1d21";
};
b = {
bg = "nil";
};
c = {
bg = "nil";
};
z = {
bg = "nil";
};
y = {
bg = "nil";
};
};
};
theme = "catppuccin";
sections = {
lualine_a = [
{

View file

@ -0,0 +1,75 @@
{
plugins.startup = {
enable = true;
colors = {
background = "#ffffff";
foldedSection = "#ffffff";
};
sections = {
header = {
type = "text";
oldfilesDirectory = false;
align = "center";
foldSection = false;
title = "Header";
margin = 5;
content = [
" "
" "
" "
" "
" "
" "
];
highlight = "Statement";
defaultColor = "";
oldfilesAmount = 0;
};
body = {
type = "mapping";
oldfilesDirectory = false;
align = "center";
foldSection = false;
title = "Menu";
margin = 5;
content = [
[
" Find File"
"Telescope find_files"
"<leader>ff"
]
[
"󰍉 Find Word"
"Telescope live_grep"
"<leader>fr"
]
[
" Recent Files"
"Telescope oldfiles"
"<leader>fg"
]
[
" File Browser"
"Telescope file_browser"
"<leader>fe"
]
];
highlight = "string";
defaultColor = "";
oldfilesAmount = 0;
};
};
options = {
paddings = [1 3];
};
parts = [
"header"
"body"
];
};
}

View file

@ -19,6 +19,8 @@
foldenable = false;
linebreak = true;
spell = false;
swapfile = false;
timeoutlen = 300;
};
};
}

106
flake.lock generated
View file

@ -73,11 +73,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github"
},
"original": {
@ -94,11 +94,11 @@
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github"
},
"original": {
@ -107,6 +107,21 @@
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -212,11 +227,11 @@
]
},
"locked": {
"lastModified": 1713732794,
"narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=",
"lastModified": 1715077503,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4",
"type": "github"
},
"original": {
@ -233,11 +248,11 @@
]
},
"locked": {
"lastModified": 1713543876,
"narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=",
"lastModified": 1713946171,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"type": "github"
},
"original": {
@ -248,11 +263,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"lastModified": 1715087517,
"narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
"type": "github"
},
"original": {
@ -264,20 +279,14 @@
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
"lastModified": 1714640452,
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
}
},
"nixpkgs-stable": {
@ -301,19 +310,21 @@
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"flake-root": "flake-root",
"home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks"
"pre-commit-hooks": "pre-commit-hooks",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1713856119,
"narHash": "sha256-TfNc8vxF7IaRhTlMgOeUN01y7QoBx50MYmGU1sSU6Vw=",
"lastModified": 1715115147,
"narHash": "sha256-oREqXPEtuYbOdBKbsDQzr2V01EzK4kD8MTdwO9ljTnU=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "c826d146c65bfa8164f31931cf54278b99f5a3a0",
"rev": "f7f255afe22fcca0c07177c3707fd61fa0c85835",
"type": "github"
},
"original": {
@ -337,11 +348,11 @@
]
},
"locked": {
"lastModified": 1713775815,
"narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=",
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4",
"rev": "2849da033884f54822af194400f8dff435ada242",
"type": "github"
},
"original": {
@ -361,11 +372,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1713775815,
"narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=",
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4",
"rev": "2849da033884f54822af194400f8dff435ada242",
"type": "github"
},
"original": {
@ -426,6 +437,27 @@
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1714058656,
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
}
},
"root": "root",