michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: update lockfile

Browse Source
This commit is contained in:
Michael Thomas 2024-09-24 13:15:57 -04:00
parent f356dd720d
commit b518a4dc85
9 changed files with 213 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
flake.lock generated
View File

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1722339003,
"narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
"lastModified": 1723293904,
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
@ -29,11 +29,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1721306136,
"narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
"lastModified": 1725841979,
"narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=",
"owner": "Aylur",
"repo": "ags",
"rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
"rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
]
},
"locked": {
"lastModified": 1722609272,
"narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
"lastModified": 1727003835,
"narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
"rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
"type": "github"
},
"original": {
@ -141,11 +141,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
@ -162,11 +162,11 @@
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
@ -228,11 +228,11 @@
]
},
"locked": {
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"lastModified": 1726745158,
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"type": "github"
},
"original": {
@ -291,11 +291,11 @@
]
},
"locked": {
"lastModified": 1720042825,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "rycee",
"repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github"
},
"original": {
@ -313,11 +313,11 @@
]
},
"locked": {
"lastModified": 1722630065,
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
"lastModified": 1726902823,
"narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "afc892db74d65042031a093adb6010c4c3378422",
"rev": "14929f7089268481d86b83ed31ffd88713dcd415",
"type": "github"
},
"original": {
@ -328,11 +328,11 @@
},
"master": {
"locked": {
"lastModified": 1722891568,
"narHash": "sha256-tm6Nl2v3zqD8uqWA6b0xCLv85KtAWk8/CgrhRAwOIRA=",
"lastModified": 1727139668,
"narHash": "sha256-0Ri6ealH/fjeFeic73H+EEFtI0RThVl2JVj/+Envt3M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "feff2a407c08aafeffc6b653f665b891c4751ed2",
"rev": "d4efad6031d28ff4859148aca6377e4947430bb4",
"type": "github"
},
"original": {
@ -349,11 +349,11 @@
]
},
"locked": {
"lastModified": 1722609272,
"narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
"lastModified": 1726742753,
"narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
"rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
"type": "github"
},
"original": {
@ -369,11 +369,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1722821408,
"narHash": "sha256-FMCo35ZmMfvAcae+9neKfu6QzXjU3WL6vW2OFMXx6wI=",
"lastModified": 1727055858,
"narHash": "sha256-JZldqP3uEzphER/63J8crL9O9uR7g+cNAkb+erRmN48=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "f25962fbd632afea744dc7e6868f24d2e73ccedb",
"rev": "de538d220bccc69ad940a53e2b50fef7e05501f2",
"type": "github"
},
"original": {
@ -384,11 +384,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718714799,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github"
},
"original": {
@ -400,14 +400,14 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1722555339,
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
"lastModified": 1725233747,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
}
},
"nixpkgs_2": {
@ -428,11 +428,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1722791413,
"narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
"lastModified": 1726969270,
"narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
"rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
"type": "github"
},
"original": {
@ -459,16 +459,16 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"lastModified": 1726481836,
"narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"rev": "20f9370d5f588fb8c72e844c54511cab054b5f40",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -488,11 +488,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1722857280,
"narHash": "sha256-b5Bal3cElLrS9UtDN81ljQpOsbqBe/7CdWlTKhlswus=",
"lastModified": 1727118532,
"narHash": "sha256-nRzlwdPaSb1UCoqndT52AUNpx9e8wLCEjY28eAkCHIg=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "5922a48008e5759acb63a12b2de8348ec512760f",
"rev": "47364df49645e89d8aa03aa61c893e12ecbac366",
"type": "github"
},
"original": {
@ -503,11 +503,11 @@
},
"nur": {
"locked": {
"lastModified": 1722883188,
"narHash": "sha256-IahHa5WnNaiY7UANpVPgEWhQ9Yha9AWVBzckEs4twFw=",
"lastModified": 1727137239,
"narHash": "sha256-XyyoRkxuwCXiBzYVlBjBrdCQLdIM0rBij4o7xBTeLEM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "f80e85e5a4f92e6aee6fd09c1c704425b48e9f8b",
"rev": "85825d78900fa59224f5b0aa2afd77e4fed4c7be",
"type": "github"
},
"original": {
@ -525,11 +525,11 @@
]
},
"locked": {
"lastModified": 1722493084,
"narHash": "sha256-ktjl908zZKWcGdMyz6kX1kHSg7LFFGPYBvTi9FgQleM=",
"lastModified": 1726816132,
"narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
"owner": "NuschtOS",
"repo": "search",
"rev": "3f5abffa5f28b4ac3c9212c81c5e8d2d22876071",
"rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
"type": "github"
},
"original": {
@ -561,11 +561,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1722824458,
"narHash": "sha256-2k3/geD5Yh8JT1nrGaRycje5kB0DkvQA/OUZoel1bIU=",
"lastModified": 1727058553,
"narHash": "sha256-tY/UU3Qk5gP/J0uUM4DZ6wo4arNLGAVqLKBotILykfQ=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a8a937c304e62a5098c6276c9cdf65c19a43b1a5",
"rev": "edc5b0f896170f07bd39ad59d6186fcc7859bbb2",
"type": "github"
},
"original": {
@ -657,11 +657,11 @@
]
},
"locked": {
"lastModified": 1722330636,
"narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
"lastModified": 1726734507,
"narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
"rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
"type": "github"
},
"original": {
@ -675,11 +675,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1722330636,
"narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
"lastModified": 1727098951,
"narHash": "sha256-gplorAc0ISAUPemUNOnRUs7jr3WiLiHZb3DJh++IkZs=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
"rev": "35dfece10c642eb52928a48bee7ac06a59f93e9a",
"type": "github"
},
"original": {
@ -690,11 +690,11 @@
},
"unstable": {
"locked": {
"lastModified": 1722630782,
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github"
},
"original": {
@ -708,11 +708,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {

26
pkgs/nvim/config/bufferlines/bufferline.nix
View File

@ -7,17 +7,8 @@
plugins = {
bufferline = {
enable = true;
separatorStyle = "thin"; # “slant”, “padded_slant”, “slope”, “padded_slope”, “thick”, “thin”
alwaysShowBufferline = false;
diagnostics = "nvim_lsp";
diagnosticsIndicator = ''
function(_, _, diag)
local icons = ${helpers.toLuaObject icons.diagnostics}
local ret = (diag.error and icons.Error .. diag.error .. " " or "")
.. (diag.warning and icons.Warn .. diag.warning or "")
return vim.trim(ret)
end
'';
settings.options = {
always_show_bufferline = false;
offsets = [
{
filetype = "neo-tree";
@ -26,7 +17,18 @@
text_align = "left";
}
];
closeCommand = "Bdelete! %d";
diagnostics = "nvim_lsp";
diagnostics_indicator = ''
function(_, _, diag)
local icons = ${helpers.toLuaObject icons.diagnostics}
local ret = (diag.error and icons.Error .. diag.error .. " " or "")
.. (diag.warning and icons.Warn .. diag.warning or "")
return vim.trim(ret)
end
'';
separator_style = "thin"; # “slant”, “padded_slant”, “slope”, “padded_slope”, “thick”, “thin”
close_command = "Bdelete! %d";
};
};
};
extraPlugins = with pkgs.vimPlugins; [bufdelete-nvim];

3
pkgs/nvim/config/default.nix
View File

@ -57,7 +57,7 @@
# ./utils/better-escape.nix
./utils/flash.nix # better search labels
./utils/flutter-tools.nix
./utils/hardtime.nix # hints to get better at vim
# ./utils/hardtime.nix # hints to get better at vim
# ./utils/harpoon.nix # better navigation between files & terminals
./utils/illuminate.nix # highlight other uses of current word
./utils/markdown-preview.nix
@ -78,6 +78,7 @@
# ./utils/ultimate-autopair.nix # auto pairs (ew)
./utils/undotree.nix # browse undo history
./utils/vim-be-good.nix # game to get better at vim
./utils/web-devicons.nix # required for other packages
./utils/whichkey.nix # help with keybindings
./utils/wilder.nix # better wildmenu suggestions
];

6
pkgs/nvim/config/lsp/conform.nix
View File

@ -1,8 +1,9 @@
{pkgs, ...}: {
plugins.conform-nvim = {
enable = true;
notifyOnError = true;
formattersByFt = {
settings = {
notify_on_error = true;
formatters_by_ft = {
html = [["prettierd" "prettier"]];
css = [["prettierd" "prettier"]];
javascript = [["prettierd" "prettier"]];
@ -21,6 +22,7 @@
rust = ["rustfmt"];
};
};
};
extraPackages = with pkgs; [
prettierd

13
pkgs/nvim/config/lsp/lsp.nix
View File

@ -29,9 +29,8 @@
};
};
nil-ls = {enable = true;};
tsserver = {
ts-ls = {
enable = true;
filetypes = ["javascript" "javascriptreact" "typescript" "typescriptreact" "vue"];
extraOptions = {
settings = {
javascript = {
@ -57,21 +56,13 @@
};
};
};
init_options = {
plugins = [
{
name = "@vue/typescript-plugin";
location = "${pkgs.vue-language-server}/lib/node_modules/@vue/language-server";
languages = ["javascript" "typescript" "vue"];
}
];
};
};
};
astro = {enable = true;};
volar = {
enable = true;
package = pkgs.vue-language-server;
tslsIntegration = true;
rootDir = ''require("lspconfig.util").root_pattern("src/App.vue")'';
};
svelte = {enable = true;};

40
pkgs/nvim/config/statusline/lualine.nix
View File

@ -1,22 +1,22 @@
{icons, ...}: {
plugins.lualine = {
enable = true;
alwaysDivideMiddle = true;
settings = {
options = {
always_divide_middle = true;
globalstatus = true;
ignoreFocus = ["neo-tree"];
extensions = ["fzf"];
ignore_focus = ["neo-tree"];
theme = "auto";
disabledFiletypes = {
statusline = ["dashboard" "alpha" "starter"];
};
componentSeparators = {
component_separators = {
left = "·";
right = "·";
};
sectionSeparators = {
section_separators = {
left = ""; # 
right = ""; # 
};
};
extensions = ["fzf"];
sections = let
mkColor = color: {
__raw = ''function() return MVim.fg("${color}") end'';
@ -26,8 +26,8 @@
lualine_b = ["branch"];
lualine_c = [
{
name = "diagnostics";
extraConfig.symbols = {
__unkeyed-1 = "diagnostics";
symbols = {
error = icons.diagnostics.Error;
warn = icons.diagnostics.Warn;
info = icons.diagnostics.Info;
@ -35,8 +35,8 @@
};
}
{
name = "filetype";
extraConfig.icon_only = true;
__unkeyed-1 = "filetype";
icon_only = true;
separator = {
left = "";
right = "";
@ -52,24 +52,20 @@
lualine_x = [
# Command
{
name.__raw = ''function() return require("noice").api.status.command.get() end'';
__unkeyed-1.__raw = ''function() return require("noice").api.status.command.get() end'';
color = mkColor "Statement";
extraConfig = {
cond.__raw = ''function() return package.loaded["noice"] and require("noice").api.status.command.has() end'';
};
}
# Mode
{
name.__raw = ''function() return require("noice").api.status.mode.get() end'';
__unkeyed-1.__raw = ''function() return require("noice").api.status.mode.get() end'';
color = mkColor "Constant";
extraConfig = {
cond.__raw = ''function() return package.loaded["noice"] and require("noice").api.status.mode.has() end'';
};
}
];
lualine_y = [
{
name = "progress";
__unkeyed-1 = "progress";
separator = {
left = " ";
right = " ";
@ -80,7 +76,7 @@
};
}
{
name = "location";
__unkeyed-1 = "location";
padding = {
left = 0;
right = 1;
@ -89,5 +85,9 @@
];
lualine_z = [''" " .. os.date("%I:%M %p"):gsub("0*", "", 1)''];
};
disabled_filetypes = {
statusline = ["dashboard" "alpha" "starter"];
};
};
};
}

1
pkgs/nvim/config/ui/alpha.nix
View File

@ -2,7 +2,6 @@
plugins.alpha = {
enable = true;
theme = null;
iconsEnabled = true;
layout = let
padding = val: {
type = "padding";

3
pkgs/nvim/config/utils/web-devicons.nix Normal file
View File

@ -0,0 +1,3 @@
{
plugins.web-devicons.enable = true;
}

10
pkgs/nvim/config/utils/whichkey.nix
View File

@ -2,18 +2,16 @@
# TODO: Implement general mappings
plugins.which-key = {
enable = true;
ignoreMissing = false;
settings = {
icons = {
breadcrumb = "»";
group = "+";
separator = ""; # ➜
};
# registrations = {
# "<leader>t" = " Terminal";
# };
window = {
win = {
border = "none";
winblend = 0;
wo.winblend = 0;
};
};
};
}