diff --git a/flake.lock b/flake.lock index 091da8b..dc87ab6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cachix": { "locked": { - "lastModified": 1610961382, - "narHash": "sha256-2TH4uX3eUkvkDnhD3BhIGBkag72WqbLUkaFyARWj4iQ=", + "lastModified": 1611179033, + "narHash": "sha256-NMepSdxJt8mFfgWHUT2o7u2yKZ8l2KD+FWbNDiR8Ufk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88f00e7e12d2669583fffd3f33aae01101464386", + "rev": "da3378c4aaf2ed350ad14552558fa55bb68d96d3", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1611081391, - "narHash": "sha256-qWkBVbZ8lx9ssoLMjqjVF+LXuxoLrVmCRoPPKdLQ68s=", + "lastModified": 1611270612, + "narHash": "sha256-tLQWDaKnrRTbkqm1am5fJM/eYNJUt/Mpr+6F7h28wNw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3fe2a57b95333659e2ecdeeca3f4009bcf3b30cf", + "rev": "2c0e3f61da903613cc316cb992c8c07d92e1d186", "type": "github" }, "original": { @@ -52,6 +52,22 @@ "type": "github" } }, + "lldbpkgs": { + "locked": { + "lastModified": 1610289362, + "narHash": "sha256-vAA4Uef2b1mvnRRqONRoSfHaT7okGPi9kEataxE72zs=", + "owner": "oxalica", + "repo": "nixpkgs", + "rev": "871ca2455a75af983dafa16a01de3df09e15c497", + "type": "github" + }, + "original": { + "owner": "oxalica", + "ref": "vscode-lldb", + "repo": "nixpkgs", + "type": "github" + } + }, "mynex": { "inputs": { "nixpkgs": [ @@ -74,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1610970035, - "narHash": "sha256-RTcM4rCOdxQi99jqi+/pnyNGR7K+P7akd+lVcVirTMc=", + "lastModified": 1611238017, + "narHash": "sha256-gVKmBflbJ9ubDygUjLkzID1/vAVfCPBsjZAtnL/c7eM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01291474ea9dce1b45c88f1f72d70a32feaa710b", + "rev": "6410340ea92be069fd1ae65b1e79494416946dd8", "type": "github" }, "original": { @@ -99,11 +115,11 @@ ] }, "locked": { - "lastModified": 1611155097, - "narHash": "sha256-d7ZOiQliqPGI/fiT+1/uBnqW+VSvUhXe2w/KRpyJ/D8=", + "lastModified": 1611266753, + "narHash": "sha256-LLCiMDKavBpeCfzXSEdVW8upAmIuT2cP3eihTBPxvXo=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "ac681bdb1d1b88c0dfcc821439a8bd1456b0417a", + "rev": "09858469e7d406e8739f2dfa6adb2ef3d074a49b", "type": "github" }, "original": { @@ -116,6 +132,7 @@ "inputs": { "home": "home", "impermanence": "impermanence", + "lldbpkgs": "lldbpkgs", "mynex": "mynex", "nixpkgs": "nixpkgs", "nixpkgsWayland": "nixpkgsWayland" diff --git a/hosts/default.nix b/hosts/default.nix index 0d70e33..4565f4d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -inputs@{ home, impermanence, mynex, nixpkgs, self, pkgs, system, ... }: +inputs@{ home, impermanence, mynex, nixpkgs, self, pkgs, lldbPkgs, system, ... }: let utils = import ../lib/utils.nix { inherit lib pkgs; }; @@ -10,6 +10,7 @@ let inherit system; specialArgs = { + inherit lldbPkgs; usr = { inherit utils; }; util = utils; nixosPersistence = "${impermanence}/nixos.nix"; diff --git a/users/patriot/home.nix b/users/patriot/home.nix index 00454c7..157323d 100644 --- a/users/patriot/home.nix +++ b/users/patriot/home.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, util, ... }: +{ config, lib, pkgs, lldbPkgs, util, ... }: let inherit (lib) mapAttrs' nameValuePair; inherit (builtins) readDir; @@ -698,7 +698,7 @@ in let mkExt = n: v: p: s: { name = n; version = v; publisher = p; sha256 = s; }; in - pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + (pkgs.vscode-utils.extensionsFromVscodeMarketplace [ # Rust (mkExt "rust-analyzer" "0.2.441" "matklad" "sha256-aUX2HMMhS9bgTOmGgqZIgs0GBxmbJdr7J6loqwQTZeM=") (mkExt "even-better-toml" "0.10.0" "tamasfe" "sha256-miJ7gXYavLyJneKOSs+4GaFG4v6ocem2YOWyAUrOfs8=") @@ -721,7 +721,7 @@ in # (mkExt "dance" "0.3.2" "gregoire" "sha256-+g8EXeCkPOPvZ60JoXkGTeSXYWrXmKrcbUaEfDppdgA=") (mkExt "material-icon-theme" "4.4.0" "PKief" "sha256-yiM+jtc7UW8PQTwmHmXHSSmvYC73GLh/cLYnmYqONdU=") (mkExt "github-vscode-theme" "1.1.5" "github" "sha256-EPAJjM4CbR8MhV+3pm6mC12KzSt2Em6pT+c2HknNntI=") - ]; + ]) ++ [ lldbPkgs.vscode-extensions.vadimcn.vscode-lldb ]; userSettings = { "workbench.iconTheme" = "material-icon-theme"; "workbench.colorTheme" = "GitHub Dark";