diff --git a/flake.lock b/flake.lock index 7651aa9..6bfd3c0 100644 --- a/flake.lock +++ b/flake.lock @@ -71,6 +71,18 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 0, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "path": "/nix/store/nr5nl3zwzl02x3rnikjbry3s5xy7bm1d-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -89,7 +101,7 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "vscode-server": "vscode-server" + "vscode-local": "vscode-local" } }, "systems": { @@ -107,10 +119,26 @@ "type": "github" } }, + "vscode-local": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "vscode-server": "vscode-server" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-IWEQNW6HVBCztzSy/1SmMTU6R/dyLlnZrJKk9ldJG/I=", + "path": "./nixos/vscode", + "type": "path" + }, + "original": { + "path": "./nixos/vscode", + "type": "path" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index 4d7d2f2..09a7e9a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - vscode-server.url = "github:nix-community/nixos-vscode-server"; + vscode-local.url = "path:./nixos/vscode"; }; outputs = { @@ -16,7 +16,6 @@ nixpkgs, nixpkgs-stable, home-manager, - vscode-server, ... } @ inputs: let @@ -25,16 +24,14 @@ stateVersion = "24.05"; timeZone = "America/Chicago"; hostname = "loki"; + lokiPort = 3100; lokiUser = "loki"; lokiPath = "/srv/loki"; - lokiPort = 3100; in { nixosConfigurations = { - # FIXME replace with your hostname ${hostname} = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - # pkgs = import nixpkgs { system = "x86_64-linux"; }; modules = [ ./nixos/configuration.nix # > Our main nixos configuration file < "${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" @@ -43,8 +40,6 @@ system.stateVersion = "${stateVersion}"; time.timeZone = "${timeZone}"; }) - vscode-server.nixosModules.default - ({ config, pkgs, ... }: {services.vscode-server.enable = true;}) (import ./nixos/loki.nix { pkgs = nixpkgs.legacyPackages.${system}; inherit lokiPort; diff --git a/vscode.nix b/nixos/vscode/flake.nix similarity index 100% rename from vscode.nix rename to nixos/vscode/flake.nix