daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps

Browse source
This commit is contained in:
Daniel Kempkens 2023-07-13 12:02:14 +02:00
parent 45462f676e
commit 25e0b8b054
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
6 changed files with 78 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
flake.lock
View file

@ -3,7 +3,7 @@
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": [ "darwin": [
"darwin" "nix-darwin"
], ],
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
@ -103,26 +103,6 @@
"type": "github" "type": "github"
} }
}, },
"darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1689178160,
"narHash": "sha256-TVR0hn/JWo1qmtvgzqjfNerLPsIxfdFR3hf3QrnEj7U=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "795492c9a895762f36f6c1ff43d6e0de66fdffa8",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -152,11 +132,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689152829, "lastModified": 1689239870,
"narHash": "sha256-Eu+mMX7YDaALLdttrGBbmYB83mJ+AtFRW3YV87Ih3/s=", "narHash": "sha256-G19sYUrNeIOa8I+WXQ6dKS9Tvuavz8AyzyXNwTqLE94=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "610e337bb2e354c34a5fa1c6822375a688efb0d7", "rev": "68eb09b1833301d729ae6e89583173b6ceaade1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +301,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1689129533, "lastModified": 1689233736,
"narHash": "sha256-weblTqEh9qClHxChFpR9gHJXHfxDpid/wZEzgXxNAjU=", "narHash": "sha256-Ben5Pt+puvG5zazBZmmCOGWX++l2pY99/FQDKYA0dk0=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "ef94fb69c65bc2e4c67826de6373c202b55b7d5a", "rev": "998bebc15e9de70b3daaaa5900e974dea5abda3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +326,11 @@
"weewx-proxy-flake": "weewx-proxy-flake" "weewx-proxy-flake": "weewx-proxy-flake"
}, },
"locked": { "locked": {
"lastModified": 1689150183, "lastModified": 1689236539,
"narHash": "sha256-jRJD6+U1IP6rrXywU/FeLkyBzmLhML3AQNUdSrFa+Us=", "narHash": "sha256-07E7PnfWdipXZsrR1GZbWzGR1i/HNAuvO5m2HEeGiRQ=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "77e298c5ab5201b6ae68ddcf80c997364d87fa9d", "rev": "667ac494d6eb28e02c2e46bc5c139218216c37eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,6 +339,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1689188243,
"narHash": "sha256-v3EDlWWLBQ+LIRWZ03jd8bnvHLyNae6iaqd03rbYhwo=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "2ad716c2786dabf8f458ae1e7d343775d3acc65c",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1689060619, "lastModified": 1689060619,
@ -377,11 +377,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689138773, "lastModified": 1689196637,
"narHash": "sha256-NEcJPQfwc1jNDI/ITvieJW2Y+IWdGIYCFHLJl5PGx3o=", "narHash": "sha256-ij4T7iwOrvdXZiV/iXoKhEarANvOkr24sLBhvaqZ7Qk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bf57c599729771cd23054a18c0f3a391ae85e193", "rev": "04dc69b62ec24a462585c1e705b711e2e05f3080",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -429,11 +429,11 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"attic": "attic", "attic": "attic",
"darwin": "darwin",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nix-darwin": "nix-darwin",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }

6
flake.nix
View file

@ -9,7 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
darwin = { nix-darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -24,7 +24,7 @@
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.darwin.follows = "darwin"; inputs.darwin.follows = "nix-darwin";
}; };
attic = { attic = {
@ -46,7 +46,7 @@
outputs = inputs@{ self, ... }: outputs = inputs@{ self, ... }:
let let
Styx = import ./system/flakes/Styx.nix { Styx = import ./system/flakes/Styx.nix {
inherit (inputs) nixpkgs home-manager darwin; inherit (inputs) nixpkgs home-manager nix-darwin;
inherit inputs; inherit inputs;
}; };

13
home/config/nvim/nifoc/formatting.fnl
View file

@ -26,6 +26,9 @@
:filetype))] :filetype))]
(vim.tbl_contains formatter-fts ft))) (vim.tbl_contains formatter-fts ft)))
(fn has-treefmt-config? [ft]
(and (= treefmt-exists 1) (has-formatter-config? ft)))
(fn run-formatter-exe [] (cmd :FormatWriteLock)) (fn run-formatter-exe [] (cmd :FormatWriteLock))
(fn run-lsp-format [] (fn run-lsp-format []
@ -44,7 +47,6 @@
(fn mod.active? [] (fn mod.active? []
(let [ft vim.bo.filetype] (let [ft vim.bo.filetype]
(if (= b.nifoc_formatter_disabled 1) false (if (= b.nifoc_formatter_disabled 1) false
(= treefmt-exists 1) true
(= b.nifoc_lsp_formatter_enabled 1) true (= b.nifoc_lsp_formatter_enabled 1) true
(has-formatter-config? ft) true (has-formatter-config? ft) true
false))) false)))
@ -56,14 +58,15 @@
(set-bufvar bufnr :nifoc_lsp_formatter_enabled 1))) (set-bufvar bufnr :nifoc_lsp_formatter_enabled 1)))
(fn mod.maybe-format-buffer-pre [] (fn mod.maybe-format-buffer-pre []
(if (= b.nifoc_formatter_disabled 1) nil (let [ft vim.bo.filetype]
(= treefmt-exists 1) nil (if (= b.nifoc_formatter_disabled 1) nil
(= b.nifoc_lsp_formatter_enabled 1) (run-lsp-format))) (has-treefmt-config? ft) nil
(= b.nifoc_lsp_formatter_enabled 1) (run-lsp-format))))
(fn mod.maybe-format-buffer-post [] (fn mod.maybe-format-buffer-post []
(let [ft vim.bo.filetype] (let [ft vim.bo.filetype]
(if (= b.nifoc_formatter_disabled 1) nil (if (= b.nifoc_formatter_disabled 1) nil
(= treefmt-exists 1) (run-formatter-exe) (has-treefmt-config? ft) (run-formatter-exe)
(= b.nifoc_lsp_formatter_enabled 1) nil (= b.nifoc_lsp_formatter_enabled 1) nil
(has-formatter-config? ft) (run-formatter-exe)))) (has-formatter-config? ft) (run-formatter-exe))))

12
home/config/nvim/plugins/formatter.fnl
View file

@ -17,8 +17,16 @@
(formatter.setup {:logging true (formatter.setup {:logging true
:log_level vim.log.levels.WARN :log_level vim.log.levels.WARN
:filetype {:fennel [#{:exe :fnlfmt :args ["-"] :stdin true}] :filetype {:css [(prefer-treefmt :css :prettier)]
:fennel [#{:exe :fnlfmt :args ["-"] :stdin true}]
:fish [(builtin-formatter :fish :fishindent)] :fish [(builtin-formatter :fish :fishindent)]
:html [(prefer-treefmt :html :prettier)]
:javascript [(prefer-treefmt :javascript
:prettier)]
:json [(prefer-treefmt :json :prettier)]
:nix [(prefer-treefmt :nix :nixpkgs_fmt)]
:sh [(prefer-treefmt :sh :shfmt)] :sh [(prefer-treefmt :sh :shfmt)]
:typescript [treefmt-formatter]}})) :toml [(prefer-treefmt :toml :taplo)]
:typescript [(prefer-treefmt :typescript
:prettier)]}}))

42
home/programs/nvim/plugins.nix
View file

@ -85,12 +85,12 @@ in
}; };
leap-nvim = buildVimPluginFrom2Nix { leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim"; pname = "leap.nvim";
version = "2023-07-04"; version = "2023-07-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "leap.nvim"; repo = "leap.nvim";
rev = "8facf2eb6a378fd7691dce8c8a7b2726823e2408"; rev = "059cc61437ae8479768025ba837f3caee16a65e6";
sha256 = "185zil8r41dz981qjmj241zri5iswfafqsx9racvsg87gcvysggn"; sha256 = "1kr3agfhz8mplycnnlqwav2s0rylbrn0iz762hr9hdmraj18rjr2";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -107,23 +107,23 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-07-12"; version = "2023-07-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "575f5a4b1fcb60c1ac4f560c46a5171454d674ca"; rev = "a51236f068547487ed34c3a32d9a0b3bf793afa7";
sha256 = "0i9rn6gz09rk49gpq305p740xza4mgpb3nwmi2zm4rg9psxamcsr"; sha256 = "0b43qsaan9ggvf54fv1zlhar69pb6icj8lcy7lpdrqql5pkld95b";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-ts-rainbow2 = buildVimPluginFrom2Nix { nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2"; pname = "nvim-ts-rainbow2";
version = "2023-07-09"; version = "2023-07-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "HiPhish"; owner = "HiPhish";
repo = "nvim-ts-rainbow2"; repo = "nvim-ts-rainbow2";
rev = "d2ea7b31b805cf4b7a05d032d0ec9d356345d3df"; rev = "b3120cd5ae9ca524af9cb602f41e12e301fa985f";
sha256 = "1xa6khjjq6l9269dnhsgkiq18hjf52f4dp0n622x8bmmxifql9ja"; sha256 = "0mjg0pkd8wv8cfar30lkyywdrd3g5lz36bbsfb7lrqi7kbksyzxv";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -220,12 +220,12 @@ in
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-07-08"; version = "2023-07-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "deade69789089c3da15237697156334fb3e943f0"; rev = "b88b227cf8d61d6e43dd23d8a39b8b2897bc17e5";
sha256 = "09m1ix3wv3n7r5i5sakh3c7gh3zlvsnckjy4gkxhhpx5sdckw1h6"; sha256 = "0cc7prxqvynf7n7sn571qxfwv2dglmqak6d56fnq910g5b81azdp";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -275,12 +275,12 @@ in
}; };
nvim-lint = buildVimPluginFrom2Nix { nvim-lint = buildVimPluginFrom2Nix {
pname = "nvim-lint"; pname = "nvim-lint";
version = "2023-06-22"; version = "2023-07-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-lint"; repo = "nvim-lint";
rev = "0b99416769e87231ce37aec64b4ed91feb43a98e"; rev = "eecf96bf2fbd12042933bb1e6193c358749e2b9b";
sha256 = "0skmm7j2js0idqprns1jhknqnfvm88xxx3k0z3il0n2fibnd7kf3"; sha256 = "0mlhmrlxbhgzy1dfff2v9rbl8abxfsdxwjbdw4fwmc246crxdld1";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -308,12 +308,12 @@ in
}; };
friendly-snippets = buildVimPluginFrom2Nix { friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2023-07-12"; version = "2023-07-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "ca668b7a4a2913ad1109b5e4aaf0013651956b13"; rev = "6153166d5a3dcc7e2809ea4f17f9edb34d026026";
sha256 = "0cmy9khkrq8jwv2mpl40lyv6amkr11ij2asd433s3lz4sccp4ync"; sha256 = "0alfv539gbzimjnx0iqajyci7mwhdgl3hww1i4v2w0pb7prxyma4";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -539,12 +539,12 @@ in
}; };
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-07-10"; version = "2023-07-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220"; rev = "5a04466685008f29c71fa5ec25d421deb1c83fea";
sha256 = "0v0il2wwgca58gv4jl70gwimnh0qy8swmlxqaw0yl0yj68pgv6ba"; sha256 = "0nzvrkv4db2iwjdfv7dfb8hvsy0nd1afmv5v04xmnj8ycf16v2b7";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

4
system/flakes/Styx.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs, home-manager, darwin, inputs, ... }: { nixpkgs, home-manager, nix-darwin, inputs, ... }:
let let
default-system = "aarch64-darwin"; default-system = "aarch64-darwin";
@ -25,7 +25,7 @@ let
}; };
in in
{ {
system = darwin.lib.darwinSystem { system = nix-darwin.lib.darwinSystem {
system = default-system; system = default-system;
modules = [ modules = [
../hosts/Styx.nix ../hosts/Styx.nix