ctucx.git: nixfiles

machines/blechbuechse: fix gpg

diff --git a/configurations/yubikey.nix b/configurations/yubikey.nix
@@ -36,12 +36,6 @@
     programs = {
       gpg = {
         enable   = true;
-        homedir  = (
-          if pkgs.stdenv.isLinux then
-            "/home/leah/.gnupg"
-          else
-            "/Users/leah/.gnupg"
-        );
 
         settings = {
           keyserver = "hkps://keyserver.ubuntu.com:443";

diff --git a/machines/blechbuechse/darwin-configuration.nix b/machines/blechbuechse/darwin-configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   bgiparser = pkgs.callPackage ../../pkgs/bgiparser.nix {};

@@ -48,7 +48,8 @@ in {
   home-manager = {
     useUserPackages = true;
 
-    users.leah.home.packages = [ bgiparser asitop ];
+    users.leah.home.packages      = [ bgiparser asitop ];
+    users.leah.home.homeDirectory = lib.mkForce "/Users/leah/";
   };
 
   fonts = {

@@ -107,7 +108,7 @@ in {
     defaults write ~/Library/Preferences/ByHost/com.apple.controlcenter.plist BatteryShowPercentage -bool true
 
     # Show sound-applet always in menubar
-    defaults write /Users/leah/Library/Preferences/ByHost/com.apple.controlcenter.plist Sound -int 16
+    defaults write ~/Library/Preferences/ByHost/com.apple.controlcenter.plist Sound -int 16
 
     # Set menubar clock format
     defaults write com.apple.menuextra.clock "DateFormat" -string "\"d MMM HH:mm:ss\""