summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-08-18 13:01:06 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2023-08-18 13:01:06 +0200
commit0366f9ba02f6123f850c9231ca40366b18d3d2b6 (patch)
treecf663e9c67787059c843ca46973ac5e4984df23d
parent86266ffc83c3541ed133fd4c0357237f1c0fdb5b (diff)
downloadnixos-0366f9ba02f6123f850c9231ca40366b18d3d2b6.tar
nixos-0366f9ba02f6123f850c9231ca40366b18d3d2b6.tar.gz
nixos-0366f9ba02f6123f850c9231ca40366b18d3d2b6.tar.bz2
nixos-0366f9ba02f6123f850c9231ca40366b18d3d2b6.tar.xz
nixos-0366f9ba02f6123f850c9231ca40366b18d3d2b6.zip
...
-rw-r--r--accounts/gkleen@sif/default.nix6
-rw-r--r--system-profiles/core/default.nix5
2 files changed, 10 insertions, 1 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index db82df29..05704606 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -418,6 +418,7 @@ in {
418 QT_AUTO_SCREEN_SCALE_FACTOR = 1; 418 QT_AUTO_SCREEN_SCALE_FACTOR = 1;
419 QT_QPA_PLATFORMTHEME = "qt5ct"; 419 QT_QPA_PLATFORMTHEME = "qt5ct";
420 LIBVIRT_DEFAULT_URI = "qemu:///system"; 420 LIBVIRT_DEFAULT_URI = "qemu:///system";
421 STACK_XDG = 1;
421 }; 422 };
422 423
423 extraProfileCommands = '' 424 extraProfileCommands = ''
@@ -440,6 +441,11 @@ in {
440 ${pkgs.systemd}/bin/systemctl --user try-restart wireplumber 441 ${pkgs.systemd}/bin/systemctl --user try-restart wireplumber
441 ''; 442 '';
442 }; 443 };
444 "stack/config.yaml" = {
445 source = (pkgs.formats.yaml {}).generate "config.yaml" {
446 recommend-stack-upgrade = false;
447 };
448 };
443 }; 449 };
444 450
445 xdg.dataFile = { 451 xdg.dataFile = {
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index b891fbd6..7325839a 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -109,7 +109,10 @@ in {
109 }; 109 };
110 }; 110 };
111 111
112 environment.systemPackages = [ pkgs.git ] ++ lib.optional hasSops pkgs.gnupg; 112 programs.git = {
113 enable = true;
114 lfs.enable = true;
115 };
113 116
114 system.activationScripts.symlink-flake = '' 117 system.activationScripts.symlink-flake = ''
115 if test -L /etc/nixos; then 118 if test -L /etc/nixos; then