mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-21 17:31:34 +01:00
Install VSCode from unstable for extension compatibility
This commit is contained in:
parent
bb0e5ea9de
commit
58886e54b5
6 changed files with 48 additions and 17 deletions
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -261,6 +261,22 @@
|
|||
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1738021509,
|
||||
"narHash": "sha256-JNUiceGsr7cVBUQxLBF1ILCe99E0qLxsVuet6GsZUuw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9db269672dbdbb519e0bd3ea24f01506c135e46f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"betterfox": "betterfox",
|
||||
|
|
@ -273,6 +289,7 @@
|
|||
"nextcloud-twofactor-totp": "nextcloud-twofactor-totp",
|
||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"sops-nix": "sops-nix",
|
||||
"treefmt-nix": "treefmt-nix",
|
||||
"wrapper-manager": "wrapper-manager"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
||||
deploy-rs = {
|
||||
|
|
|
|||
|
|
@ -5,14 +5,9 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
stable = inputs.nixpkgs;
|
||||
# unstable = inputs.nixpkgs-unstable;
|
||||
|
||||
mkHost = hostname: nixpkgs: {
|
||||
${hostname} = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs self;
|
||||
};
|
||||
mkHost = hostname: {
|
||||
${hostname} = inputs.nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs self; };
|
||||
modules =
|
||||
[
|
||||
{ networking.hostName = hostname; }
|
||||
|
|
@ -29,10 +24,10 @@ in
|
|||
{
|
||||
flake = {
|
||||
nixosConfigurations = lib.mkMerge [
|
||||
(mkHost "north" stable)
|
||||
(mkHost "inspiron" stable)
|
||||
(mkHost "stratus" stable)
|
||||
(mkHost "installer" stable)
|
||||
(mkHost "north")
|
||||
(mkHost "inspiron")
|
||||
(mkHost "stratus")
|
||||
(mkHost "installer")
|
||||
];
|
||||
|
||||
deploy.nodes.stratus = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ self, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
self,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
self.nixosModules.default
|
||||
|
|
@ -68,4 +74,9 @@
|
|||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
_module.args.pkgs-unstable = import inputs.nixpkgs-unstable {
|
||||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
inherit (config.nixpkgs) config;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
pkgs-unstable,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
|
@ -11,8 +12,8 @@
|
|||
config = lib.mkIf config.myConfig.vscode.enable {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscode-with-extensions.override {
|
||||
vscode = pkgs.vscodium;
|
||||
package = pkgs-unstable.vscode-with-extensions.override {
|
||||
vscode = pkgs-unstable.vscodium;
|
||||
vscodeExtensions =
|
||||
let
|
||||
inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ inputs, self, ... }:
|
||||
{
|
||||
inputs,
|
||||
self,
|
||||
pkgs-unstable,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
|
||||
|
|
@ -6,7 +11,7 @@
|
|||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs self;
|
||||
inherit inputs self pkgs-unstable;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue