always pull before updating; commit lock file if changed; add inputs to gaming dev; change vscode repo names
This commit is contained in:
@@ -169,7 +169,11 @@ with lib;
|
||||
})
|
||||
(mkIf (flakeUpdateLocation != null) {
|
||||
pre_commands = {
|
||||
nix-flake-update = "sudo nix flake update --flake ${flakeUpdateLocation}";
|
||||
nix-flake-update = "${(pkgs.writeShellScriptBin "nix-flake-update" ''
|
||||
git -C ${flakeUpdateLocation} pull --quiet
|
||||
sudo nix flake update --flake ${flakeUpdateLocation}
|
||||
git -C ${flakeUpdateLocation} diff-index --quiet HEAD flake.lock || git -C ${flakeUpdateLocation} commit --quiet flake.lock -m "update flake.lock"
|
||||
'')}/bin/nix-flake-update";
|
||||
};
|
||||
})];
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs;[
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
|
||||
let
|
||||
openvsx-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
|
||||
vscode-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
|
||||
openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
|
||||
vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs;[
|
||||
@@ -16,7 +16,7 @@ in
|
||||
mutableExtensionsDir = false;
|
||||
enableUpdateCheck = false;
|
||||
enableExtensionUpdateCheck = false;
|
||||
extensions = with vscode-extensions;[
|
||||
extensions = with openvsx;[
|
||||
biomejs.biome
|
||||
mkhl.direnv
|
||||
dracula-theme.theme-dracula
|
||||
@@ -34,7 +34,7 @@ in
|
||||
rust-lang.rust-analyzer
|
||||
tamasfe.even-better-toml
|
||||
mikestead.dotenv
|
||||
] ++ [ vscode-extensions.bradlc.vscode-tailwindcss ];
|
||||
] ++ [ vscode-marketplace.bradlc.vscode-tailwindcss ];
|
||||
userSettings = with pkgs;{
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"window.titleBarStyle" = "custom";
|
||||
|
||||
Reference in New Issue
Block a user