worble/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always pull before updating; commit lock file if changed; add inputs to gaming dev; change vscode repo names

Browse Source
This commit is contained in:
worble
2025-04-29 21:57:03 +01:00
parent 632a1f13c5
commit 5e771a9c2c
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
home-manager/base/terminal.nix
View File

@@ -169,7 +169,11 @@ with lib;
}) })
(mkIf (flakeUpdateLocation != null) { (mkIf (flakeUpdateLocation != null) {
pre_commands = { 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";
}; };
})]; })];
}; };

2
home-manager/development/games.nix
View File

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

8
home-manager/development/vscode.nix
View File

@@ -1,8 +1,8 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
let let
openvsx-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx; openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
vscode-extensions = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace; vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
in in
{ {
home.packages = with pkgs;[ home.packages = with pkgs;[
@@ -16,7 +16,7 @@ in
mutableExtensionsDir = false; mutableExtensionsDir = false;
enableUpdateCheck = false; enableUpdateCheck = false;
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
extensions = with vscode-extensions;[ extensions = with openvsx;[
biomejs.biome biomejs.biome
mkhl.direnv mkhl.direnv
dracula-theme.theme-dracula dracula-theme.theme-dracula
@@ -34,7 +34,7 @@ in
rust-lang.rust-analyzer rust-lang.rust-analyzer
tamasfe.even-better-toml tamasfe.even-better-toml
mikestead.dotenv mikestead.dotenv
] ++ [ vscode-extensions.bradlc.vscode-tailwindcss ]; ] ++ [ vscode-marketplace.bradlc.vscode-tailwindcss ];
userSettings = with pkgs;{ userSettings = with pkgs;{
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";