Skip to content

Commit

Permalink
chore: update config
Browse files Browse the repository at this point in the history
  • Loading branch information
isabelroses committed Dec 29, 2023
1 parent 356f3a5 commit 5976a5f
Show file tree
Hide file tree
Showing 11 changed files with 186 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
use flake --accept-flake-config
use flake . --accept-flake-config
52 changes: 36 additions & 16 deletions _sources/generated.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 28 additions & 16 deletions _sources/generated.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 19 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,22 @@
neovim-nix = {
url = "github:willruggiano/neovim.nix";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
neovim.follows = "";
nixpkgs.follows = "nixpkgs";
pre-commit-nix.follows = "pre-commit-nix";
};
};

nekowinston-nur = {
url = "github:nekowinston/nur";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
rust-overlay.follows = "";
};
};

# maintenance
flake-utils.url = "github:numtide/flake-utils";
flake-compat = {
Expand All @@ -58,7 +67,13 @@
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [];
overlays = [
(_: p: {
repos = {
nekowinston = import inputs.nekowinston-nur {inherit (p) pkgs;};
};
})
];
};

checks = {
Expand Down Expand Up @@ -92,10 +107,12 @@
nixConfig = {
extra-substituters = [
"https://pre-commit-hooks.cachix.org"
"https://nekowinston.cachix.org"
"https://isabelroses.cachix.org"
];
extra-trusted-public-keys = [
"pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
"nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs="
"isabelroses.cachix.org-1:mXdV/CMcPDaiTmkQ7/4+MzChpOe6Cb97njKmBQQmLPM="
];
};
Expand Down
22 changes: 1 addition & 21 deletions neovim.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,7 @@
deadnix

# go
# see https://github.com/ray-x/go.nvim/blob/master/lua/go/install.lua
go
delve # dlv
ginkgo
# go-enum
gofumpt
golangci-lint
golines
gomodifytags
# gomvp
gopls
gotests
gotestsum
gotools # callgraph, goimports, gorename, guru
govulncheck
iferr
impl
# json-to-struct
mockgen
reftools # fillstruct, fillswitch
richgo
repos.nekowinston.gonvim-tools

# etc
emmet-ls
Expand Down
5 changes: 5 additions & 0 deletions nvfetcher.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ src.git = "https://github.com/ray-x/go.nvim"
fetch.github = "ray-x/guihua.lua"
src.git = "https://github.com/ray-x/guihua.lua"

[harpoon]
fetch.github = "ThePrimeagen/harpoon"
src.git = "https://github.com/ThePrimeagen/harpoon"
src.branch = "harpoon2"

[indent-blankline]
fetch.github = "lukas-reineke/indent-blankline.nvim"
src.git = "https://github.com/lukas-reineke/indent-blankline.nvim"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/snippets/src/nix.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"body": [
"{ pkgs ? import <nixpkgs> {} }:",
"pkgs.mkShell {",
" buildInputs = [",
" buildInputs = with pkgs; [",
" $1",
" ];",
"}"
Expand Down
5 changes: 4 additions & 1 deletion plugins/catppuccin.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
return function()
require("catppuccin").setup({
flavour = "mocha",
background = {
light = "latte",
dark = "mocha",
},
transparent_background = true,
styles = {
comments = { "italic" },
Expand Down
Loading

0 comments on commit 5976a5f

Please sign in to comment.