diff --git a/flake.lock b/flake.lock index 5c91699..7b10a51 100644 --- a/flake.lock +++ b/flake.lock @@ -643,6 +643,21 @@ "type": "indirect" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1663491030, + "narHash": "sha256-MVsfBhE9US5DvLtBAaTRjwYdv1tLO8xjahM8qLXTgTo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "767542707d394ff15ac1981e903e005ba69528b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, "poetry2nix": { "flake": false, "locked": { @@ -887,9 +902,7 @@ "webcord": { "inputs": { "dream2nix": "dream2nix", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_6", "webcord": "webcord_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 8f539a0..f6f9a31 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,6 @@ riff.inputs.nixpkgs.follows = "nixpkgs"; webcord.url = "github:fufexan/webcord-flake"; - webcord.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = diff --git a/nixos/common/default.nix b/nixos/common/default.nix index 4b4bbf7..65343dc 100644 --- a/nixos/common/default.nix +++ b/nixos/common/default.nix @@ -28,6 +28,7 @@ "https://colmena.cachix.org" "https://hyprland.cachix.org" "https://0x76-infra.cachix.org" + "https://webcord.cachix.org" ]; trusted-public-keys = [ "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" @@ -36,6 +37,7 @@ "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "0x76-infra.cachix.org-1:dC1qp+VEN3jj5pdK4URlXR9hf3atT+MnpKGu6PZjMc8=" + "webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs=" ]; # Also use zsh for root; }; diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index c108ec0..ed488f7 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -87,13 +87,17 @@ package = pkgs.vscode; extensions = with pkgs.vscode-extensions; [ catppuccin.catppuccin-vsc + codezombiech.gitignore + editorconfig.editorconfig james-yu.latex-workshop jnoortheen.nix-ide matklad.rust-analyzer mkhl.direnv + ms-vscode.cpptools tamasfe.even-better-toml valentjn.vscode-ltex vscodevim.vim + xaver.clang-format ]; };