diff --git a/flake.lock b/flake.lock index 190a569..44bd183 100644 --- a/flake.lock +++ b/flake.lock @@ -839,22 +839,6 @@ "type": "github" } }, - "nixpkgs-gimp3": { - "locked": { - "lastModified": 1744704223, - "narHash": "sha256-kAk1Oq6XGwm8Ato+Yda2oyOakej7S9xtD3YPVW/Iswk=", - "owner": "jtojnar", - "repo": "nixpkgs", - "rev": "bc17b33471454e8bce6edf92de8030a121c15dbd", - "type": "github" - }, - "original": { - "owner": "jtojnar", - "ref": "gimp-meson", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1744463964, @@ -871,22 +855,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -912,7 +880,9 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs-unstable" + ], "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1009,7 +979,6 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-gimp3": "nixpkgs-gimp3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nur": "nur", diff --git a/flake.nix b/flake.nix index 11c5d85..0423456 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,10 @@ flake-utils.url = "github:numtide/flake-utils"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # nix user repository - nur = { url = "github:nix-community/NUR"; }; + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; ## stable nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; home-manager = { @@ -23,7 +26,6 @@ }; ## unstable nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-gimp3.url = "github:jtojnar/nixpkgs/gimp-meson"; home-manager-unstable = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/home-manager/code.nix b/home-manager/code.nix index 6fd8b24..560a748 100644 --- a/home-manager/code.nix +++ b/home-manager/code.nix @@ -23,23 +23,25 @@ enable = true; package = pkgs.vscodium; #userSettings = { typst-lsp.exportPdf = "onType"; }; - userSettings = { - "Lua.workspace.library" = [ - "/home/kopatz/.vscode-oss/extensions/evaisa.vscode-noita-api-1.4.2/out/NoitaLua" + profiles.default = { + userSettings = { + "Lua.workspace.library" = [ + "/home/kopatz/.vscode-oss/extensions/evaisa.vscode-noita-api-1.4.2/out/NoitaLua" + ]; + "editor.mouseWheelZoom" = true; + "files.autoSave" = "afterDelay"; + "clangd.path" = "/run/current-system/sw/bin/clangd"; + }; + extensions = with pkgs.vscode-extensions; [ + jnoortheen.nix-ide + #rust-lang.rust-analyzer broken on unstable + myriad-dreamin.tinymist + #tomoki1207.pdf latex-workshop is faster to preview pdf + james-yu.latex-workshop + twxs.cmake + llvm-vs-code-extensions.vscode-clangd ]; - "editor.mouseWheelZoom" = true; - "files.autoSave" = "afterDelay"; - "clangd.path" = "/run/current-system/sw/bin/clangd"; }; - extensions = with pkgs.vscode-extensions; [ - jnoortheen.nix-ide - #rust-lang.rust-analyzer broken on unstable - myriad-dreamin.tinymist - #tomoki1207.pdf latex-workshop is faster to preview pdf - james-yu.latex-workshop - twxs.cmake - llvm-vs-code-extensions.vscode-clangd - ]; }; }; }