update nixpkgs, change workarounds
This commit is contained in:
parent
dcae2c375f
commit
77d57e6cd2
70
flake.lock
70
flake.lock
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721075053,
|
"lastModified": 1721691571,
|
||||||
"narHash": "sha256-Ywa9fnalPj5WiQ7uu1pXdJ192r8OGL7LMMokDma+Kc0=",
|
"narHash": "sha256-dUFGFUPFJWWHosWz5zcMqvzR5+WIS33q7zYrTOHql+I=",
|
||||||
"ref": "refs/heads/canon",
|
"ref": "refs/heads/canon",
|
||||||
"rev": "01959e74e880876233f75658a3d763d4b46560b5",
|
"rev": "c4a85fe74dc257b0b7a392eaf3a80599096336b7",
|
||||||
"revCount": 57,
|
"revCount": 58,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.mildlyfunctional.gay/artemist/packages.git"
|
"url": "https://git.mildlyfunctional.gay/artemist/packages.git"
|
||||||
},
|
},
|
||||||
|
@ -60,11 +60,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720845312,
|
"lastModified": 1721719500,
|
||||||
"narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
|
"narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
|
"rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -240,11 +240,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720524665,
|
"lastModified": 1721042469,
|
||||||
"narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
|
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
|
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -304,11 +304,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720734513,
|
"lastModified": 1721804110,
|
||||||
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
|
"narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
|
"rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -325,11 +325,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720697445,
|
"lastModified": 1721226562,
|
||||||
"narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=",
|
"narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=",
|
||||||
"owner": "jovian-experiments",
|
"owner": "jovian-experiments",
|
||||||
"repo": "jovian-nixos",
|
"repo": "jovian-nixos",
|
||||||
"rev": "bba994424596df09228f5437bcf8ef7fde1fe56e",
|
"rev": "927eea31915468e06b94bedf678261dc7cf048c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -370,11 +370,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720976034,
|
"lastModified": 1721756973,
|
||||||
"narHash": "sha256-fueWQn/bzWcYeR01UWAhjMejgpQc2mjSPt3gb5tpoMs=",
|
"narHash": "sha256-M7Zb3UfjQ0o3qXHolhykIk+QzfhEBcEYK9QAPSiBtW4=",
|
||||||
"rev": "1eb5d22132a57487e0cb84a65ecd35814624c0e5",
|
"rev": "53f3e39815c3357c6465963359e94a6318b54af7",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1eb5d22132a57487e0cb84a65ecd35814624c0e5.tar.gz"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/53f3e39815c3357c6465963359e94a6318b54af7.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -413,11 +413,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720926593,
|
"lastModified": 1721531260,
|
||||||
"narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=",
|
"narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4",
|
"rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -428,11 +428,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720737798,
|
"lastModified": 1721839713,
|
||||||
"narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=",
|
"narHash": "sha256-apTv16L9h5ONS2VTPbKEgwAOVmWGku0MsfprjgwBFHo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751",
|
"rev": "a7432ebaefc9a400dcda399d48b949230378d784",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -443,11 +443,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720957393,
|
"lastModified": 1721562059,
|
||||||
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
|
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
|
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -491,11 +491,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721042250,
|
"lastModified": 1721832650,
|
||||||
"narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=",
|
"narHash": "sha256-naQCM5KqT+i8W/84aaXUsr/6oWR8fkjXDPdWCwLiCRQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "b9ed90003273f0a75151b32948e16b44891f403c",
|
"rev": "0ac10f6776c6650b18ebe45913e06b7ce1a2e2b1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -656,11 +656,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720818892,
|
"lastModified": 1721458737,
|
||||||
"narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=",
|
"narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f",
|
"rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
overlays = [
|
overlays = [
|
||||||
inputs.artemist.overlays.default
|
inputs.artemist.overlays.default
|
||||||
inputs.fonts.overlays.default
|
inputs.fonts.overlays.default
|
||||||
(final: prev: { kicad = prev.kicad.override { python3 = final.python311; }; })
|
|
||||||
];
|
];
|
||||||
config.allowUnfreePredicate =
|
config.allowUnfreePredicate =
|
||||||
pkg:
|
pkg:
|
||||||
|
|
|
@ -79,13 +79,7 @@ lib.setAttrByPath setPath (
|
||||||
jsonls.enable = cfg.plugins.lsp.enable;
|
jsonls.enable = cfg.plugins.lsp.enable;
|
||||||
nil-ls.enable = cfg.plugins.lsp.enable;
|
nil-ls.enable = cfg.plugins.lsp.enable;
|
||||||
omnisharp.enable = cfg.plugins.lsp.enable;
|
omnisharp.enable = cfg.plugins.lsp.enable;
|
||||||
pylsp = {
|
pylsp.enable = cfg.plugins.lsp.enable;
|
||||||
enable = cfg.plugins.lsp.enable;
|
|
||||||
settings.plugins = {
|
|
||||||
pylsp_mypy.enabled = true;
|
|
||||||
black.enabled = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
texlab.enable = cfg.plugins.lsp.enable;
|
texlab.enable = cfg.plugins.lsp.enable;
|
||||||
tsserver.enable = cfg.plugins.lsp.enable;
|
tsserver.enable = cfg.plugins.lsp.enable;
|
||||||
typst-lsp.enable = cfg.plugins.lsp.enable;
|
typst-lsp.enable = cfg.plugins.lsp.enable;
|
||||||
|
|
Loading…
Reference in a new issue