Compare commits

...

2 Commits

4 changed files with 13 additions and 9 deletions

6
flake.lock generated
View File

@@ -100,11 +100,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1745907084,
"narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=",
"lastModified": 1745955289,
"narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f1e52a018166e1a324f832de913e12c0e55792d0",
"rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
"type": "github"
},
"original": {

View File

@@ -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";
};
})];
};

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, inputs, ... }:
{
home.packages = with pkgs;[

View File

@@ -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";