Compare commits
3 Commits
842e4ea6fa
...
21be163a23
| Author | SHA1 | Date | |
|---|---|---|---|
| 21be163a23 | |||
| 6312060c76 | |||
| 36fc9d2f97 |
54
flake.lock
generated
54
flake.lock
generated
@@ -184,11 +184,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774274588,
|
"lastModified": 1774559029,
|
||||||
"narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=",
|
"narHash": "sha256-deix7yg3j6AhjMPnFDCmWB3f83LsajaaULP5HH2j34k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b",
|
"rev": "a0bb0d11514f92b639514220114ac8063c72d0a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -247,11 +247,11 @@
|
|||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774283383,
|
"lastModified": 1774620721,
|
||||||
"narHash": "sha256-3aCfmL8hOcdIl783LTnK+lHcjMGCnc+2zQ98xUyefCU=",
|
"narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "8a583029606cf072cc01c7e2f4298cc75a7ada28",
|
"rev": "fb83d584532282f585cd02f3aa513e98b843e7e7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -280,11 +280,11 @@
|
|||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773130184,
|
"lastModified": 1774616418,
|
||||||
"narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
|
"narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
|
"rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -311,11 +311,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774244481,
|
"lastModified": 1774388614,
|
||||||
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
|
"narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
|
"rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -327,11 +327,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774244481,
|
"lastModified": 1774388614,
|
||||||
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
|
"narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
|
"rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -343,11 +343,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774106199,
|
"lastModified": 1774386573,
|
||||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -359,11 +359,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771008912,
|
"lastModified": 1774386573,
|
||||||
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -424,11 +424,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774370747,
|
"lastModified": 1774687915,
|
||||||
"narHash": "sha256-yjVgtiGCf0/nH8bp8tPhZrkGAQ575QImTLyndA7GYTA=",
|
"narHash": "sha256-cv2Yx6EAsDgbhhf3UbDR2zqEzVvZgFH2RtbvxzgyYlA=",
|
||||||
"owner": "notashelf",
|
"owner": "notashelf",
|
||||||
"repo": "nvf",
|
"repo": "nvf",
|
||||||
"rev": "795711598394281a0a7a912765c18d8a8611a85f",
|
"rev": "ac5cf327c84ff5c8c929de73e352972ab7fe68b7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -633,11 +633,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773722260,
|
"lastModified": 1774672774,
|
||||||
"narHash": "sha256-U8MsSiqqYZHR3oKE+cCZ2AJt3b4LcXs+oQuNLipaO78=",
|
"narHash": "sha256-YRCl611V07lCKRURJXFKEfje9Dc05DtE7cuIqGq/25A=",
|
||||||
"owner": "youwen5",
|
"owner": "youwen5",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "0e6e43342fb3e9a3439fafa777d8cdf98e4ffc49",
|
"rev": "983f4799fc91a7341d12d657cc10c4ec771b4e1a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB |
@@ -21,8 +21,6 @@ in
|
|||||||
source = ../../../wallpapers;
|
source = ../../../wallpapers;
|
||||||
recursive = true;
|
recursive = true;
|
||||||
};
|
};
|
||||||
".face.icon".source = ../face.jpg;
|
|
||||||
".config/face.jpg".source = ../face.jpg;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.niri = {
|
programs.niri = {
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
{ inputs
|
{
|
||||||
, config
|
inputs,
|
||||||
, ...
|
config,
|
||||||
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [ inputs.nvf.homeManagerModules.default ];
|
imports = [inputs.nvf.homeManagerModules.default];
|
||||||
|
|
||||||
programs.nvf = {
|
programs.nvf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -50,55 +51,55 @@
|
|||||||
keymaps = [
|
keymaps = [
|
||||||
{
|
{
|
||||||
key = "jk";
|
key = "jk";
|
||||||
mode = [ "i" ];
|
mode = ["i"];
|
||||||
action = "<ESC>";
|
action = "<ESC>";
|
||||||
desc = "Exit insert mode";
|
desc = "Exit insert mode";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<leader>nh";
|
key = "<leader>nh";
|
||||||
mode = [ "n" ];
|
mode = ["n"];
|
||||||
action = ":nohl<CR>";
|
action = ":nohl<CR>";
|
||||||
desc = "Clear search highlights";
|
desc = "Clear search highlights";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<leader>ff";
|
key = "<leader>ff";
|
||||||
mode = [ "n" ];
|
mode = ["n"];
|
||||||
action = "<cmd>Telescope find_files<cr>";
|
action = "<cmd>Telescope find_files<cr>";
|
||||||
desc = "Search files by name";
|
desc = "Search files by name";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<leader>lg";
|
key = "<leader>lg";
|
||||||
mode = [ "n" ];
|
mode = ["n"];
|
||||||
action = "<cmd>Telescope live_grep<cr>";
|
action = "<cmd>Telescope live_grep<cr>";
|
||||||
desc = "Search files by contents";
|
desc = "Search files by contents";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<leader>fe";
|
key = "<leader>fe";
|
||||||
mode = [ "n" ];
|
mode = ["n"];
|
||||||
action = "<cmd>Neotree toggle<cr>";
|
action = "<cmd>Neotree toggle<cr>";
|
||||||
desc = "File browser toggle";
|
desc = "File browser toggle";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<C-h>";
|
key = "<C-h>";
|
||||||
mode = [ "i" ];
|
mode = ["i"];
|
||||||
action = "<Left>";
|
action = "<Left>";
|
||||||
desc = "Move left in insert mode";
|
desc = "Move left in insert mode";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<C-j>";
|
key = "<C-j>";
|
||||||
mode = [ "i" ];
|
mode = ["i"];
|
||||||
action = "<Down>";
|
action = "<Down>";
|
||||||
desc = "Move down in insert mode";
|
desc = "Move down in insert mode";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<C-k>";
|
key = "<C-k>";
|
||||||
mode = [ "i" ];
|
mode = ["i"];
|
||||||
action = "<Up>";
|
action = "<Up>";
|
||||||
desc = "Move up in insert mode";
|
desc = "Move up in insert mode";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
key = "<C-l>";
|
key = "<C-l>";
|
||||||
mode = [ "i" ];
|
mode = ["i"];
|
||||||
action = "<Right>";
|
action = "<Right>";
|
||||||
desc = "Move right in insert mode";
|
desc = "Move right in insert mode";
|
||||||
}
|
}
|
||||||
@@ -108,7 +109,7 @@
|
|||||||
|
|
||||||
spellcheck = {
|
spellcheck = {
|
||||||
enable = true;
|
enable = true;
|
||||||
languages = [ "en" ];
|
languages = ["en"];
|
||||||
programmingWordlist.enable = true;
|
programmingWordlist.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -121,6 +122,9 @@
|
|||||||
lspSignature.enable = true;
|
lspSignature.enable = true;
|
||||||
otter-nvim.enable = false;
|
otter-nvim.enable = false;
|
||||||
nvim-docs-view.enable = false;
|
nvim-docs-view.enable = false;
|
||||||
|
servers.nil = {
|
||||||
|
settings.nil.nix.autoEvalInputs = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
languages = {
|
languages = {
|
||||||
@@ -136,7 +140,12 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
lsp.enable = true;
|
lsp.enable = true;
|
||||||
format.type = ["prettierd"];
|
format.type = ["prettierd"];
|
||||||
extensions.ts-error-translator.enable = true;
|
extensions.ts-error-translator = {
|
||||||
|
enable = true;
|
||||||
|
setupOpts = {
|
||||||
|
auto_attach = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
html.enable = true;
|
html.enable = true;
|
||||||
lua.enable = true;
|
lua.enable = true;
|
||||||
@@ -223,20 +232,8 @@
|
|||||||
comments = {
|
comments = {
|
||||||
comment-nvim.enable = true;
|
comment-nvim.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
luaConfigPost = ''
|
luaConfigPost = ''
|
||||||
-- Nix LSP (nil) configuration for auto-eval-inputs
|
|
||||||
local lspconfig = require('lspconfig')
|
|
||||||
lspconfig.nil_ls.setup({
|
|
||||||
settings = {
|
|
||||||
['nil'] = {
|
|
||||||
nix = {
|
|
||||||
auto_eval_inputs = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Auto-update programming wordlist on first startup
|
-- Auto-update programming wordlist on first startup
|
||||||
vim.api.nvim_create_autocmd("VimEnter", {
|
vim.api.nvim_create_autocmd("VimEnter", {
|
||||||
callback = function()
|
callback = function()
|
||||||
@@ -258,7 +255,7 @@
|
|||||||
dirtytalkUpdate = ''
|
dirtytalkUpdate = ''
|
||||||
# Create the spell directory if it doesn't exist
|
# Create the spell directory if it doesn't exist
|
||||||
mkdir -p "$HOME/.local/share/nvim/site/spell"
|
mkdir -p "$HOME/.local/share/nvim/site/spell"
|
||||||
|
|
||||||
# Try to run DirtytalkUpdate in headless mode with better error handling
|
# Try to run DirtytalkUpdate in headless mode with better error handling
|
||||||
if ! ${config.programs.nvf.finalPackage}/bin/nvim --headless -c "DirtytalkUpdate" -c "qa!" 2>/dev/null; then
|
if ! ${config.programs.nvf.finalPackage}/bin/nvim --headless -c "DirtytalkUpdate" -c "qa!" 2>/dev/null; then
|
||||||
echo "Note: DirtytalkUpdate will run automatically on first Neovim startup"
|
echo "Note: DirtytalkUpdate will run automatically on first Neovim startup"
|
||||||
|
|||||||
Reference in New Issue
Block a user