diff --git a/flake.lock b/flake.lock index 112856b..e138481 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1676892629, - "narHash": "sha256-rlvsqoSBO5dCwfnn7xvImYREidIPJaiFS3b54TZF4pU=", + "lastModified": 1677509389, + "narHash": "sha256-ry4dkSjIO0WuEbIDpTFV0W2iq2S26kWCv7EX2vKOWEI=", "owner": "nix-community", "repo": "home-manager", - "rev": "72ce74d3eae78a6b31538ea7ebe0c1fcf4a10f7a", + "rev": "ab7c8f4a8427bfcaf01a46bab974298cc27bc1f5", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1677232326, - "narHash": "sha256-rAk2/80kLvA3yIMmSV86T1B4kNvwCFMSQ1FxXndaUB0=", + "lastModified": 1677440795, + "narHash": "sha256-Kmjr95L42iioTItuA6nKCaObAXQvgRTPmj+62dx5OZg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2d44015779cced4eec9df5b8dab238b9f6312cb2", + "rev": "2a483ad9cd2d931ab52cd5f897c447beb8328bed", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676817468, - "narHash": "sha256-ovuJ1jQOC2/EEibufBkXmSN/O9mLx80Wh7aDmHmHAhA=", + "lastModified": 1677341534, + "narHash": "sha256-zqaJuOTnKzg5AubC4rzzJ/IS5kU5n4U7vxosv1Fv8Ug=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0cf4274b5d06325bd16dbf879a30981bc283e58a", + "rev": "7076110064c09f0b3942f609f2134c1358ef2e50", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1676771332, - "narHash": "sha256-YYn2K0AwyIyCzvP7C+xzEt64rlCRPyrllRPGNNu+50M=", + "lastModified": 1677367679, + "narHash": "sha256-pOMXi7F9tcHls06Qv+7XCPASTJeXu47Jhd0Pk9du8T4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f27a4e2f6a3a23b843ca1c736e6043fb8b99acc1", + "rev": "ea736343e4d4a052e023d54b23334cf685de479c", "type": "github" }, "original": { @@ -138,11 +138,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1676721149, - "narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=", + "lastModified": 1677407201, + "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2", + "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505", "type": "github" }, "original": { @@ -154,11 +154,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1676549890, - "narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=", + "lastModified": 1677352614, + "narHash": "sha256-VYo1cSiCHDXZrHO8pb0c9EGob7C75lCPx1jBMi9UAlU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c66bd1b68f4708c90dcc97c6f7052a5a7b33257", + "rev": "bf592ea571b11dfee17a74d022f0b481ca5f1319", "type": "github" }, "original": { @@ -168,6 +168,20 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1672441588, + "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6a0d2701705c3cf6f42c15aa92b7885f1f8a477f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -176,7 +190,8 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "vscode-server": "vscode-server" } }, "sops-nix": { @@ -185,11 +200,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1676959847, - "narHash": "sha256-KZS6sIsMXiNyN7jW45MrEo95iEXj6nMLKvxgxO181no=", + "lastModified": 1677381477, + "narHash": "sha256-NLzWgll+Q0Af8gI1ha34OHt7Y1GtOMYhCWQWV9LXE9Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c5828439d718a6cddd9a511997d9ac7626a4aff", + "rev": "83fe25c8019db8216f5c6ffc65b394707784b4f3", "type": "github" }, "original": { @@ -212,6 +227,24 @@ "repo": "flake-utils", "type": "github" } + }, + "vscode-server": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1676501444, + "narHash": "sha256-H+uQetkzd5GIga56HmCDwl5eihdQgeN2jVdNrkXzDyo=", + "owner": "msteen", + "repo": "nixos-vscode-server", + "rev": "57f1716bc625d2892579294cc207956679e3d94c", + "type": "github" + }, + "original": { + "owner": "msteen", + "repo": "nixos-vscode-server", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 06b6ddf..c8c1d40 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ sops-nix.url = github:Mic92/sops-nix; flake-utils.url = "github:numtide/flake-utils"; # nix.url = "github:NixOS/nix/2.12.0"; - # vscode-server.url = "github:msteen/nixos-vscode-server"; + vscode-server.url = "github:msteen/nixos-vscode-server"; # homeage = {url = "github:jordanisaacs/homeage"; inputs.nixpkgs.follows = "nixpkgs";}; diff --git a/home-manager/global/default.nix b/home-manager/global/default.nix index faf62e9..57754b3 100644 --- a/home-manager/global/default.nix +++ b/home-manager/global/default.nix @@ -3,8 +3,11 @@ imports = [ ./beets.nix + "${inputs.vscode-server}/modules/vscode-server/home.nix" ] ++ (builtins.attrValues outputs.homeManagerModules); + + ###dotfiles path variable options._dotfiles = lib.mkOption { type = lib.types.str; @@ -47,7 +50,10 @@ config = { }; }; - +##VSCode + services.vscode-server.enable = true; + services.vscode-server.enableFHS = true; + services.vscode-server.nodejsPackage = pkgs.nodejs-18_x; programs = { @@ -55,4 +61,4 @@ config = { git.enable = true; }; }; -} \ No newline at end of file +} diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index 5b54558..77fed87 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -19,8 +19,8 @@ secrets.mrconfig = { sopsFile = "${config._secretstore}/user_dotfiles/mrconfig"; # optionally define per-secret files format = "binary"; - # path = "${config.home.homeDirectory}/.mrconfig"; - path = "${config.home.homeDirectory}/${getEnv_name}"; + path = "${config.home.homeDirectory}/.mrconfig"; + # path = "${config.home.homeDirectory}/${getEnv_name}"; }; };