general cleaning

esselius · esselius · commit aefa651ac68c · 2025-04-27T00:27:34.000+02:00
diff --git a/README.md b/README.md
@@ -5,9 +5,15 @@
 Install nix with the [DeterminateSystems nix-installer](https://github.com/DeterminateSystems/nix-installer)
 
 ```shell
-nix-installer plan macos --case-sensitive --extra-conf "use-case-hack = false" --encrypt true > plan.json
-nix-installer install plan.json
+curl -sL -o nix-installer https://install.determinate.systems/nix/nix-installer-aarch64-darwin
+chmod +x nix-installer
+./nix-installer plan macos --case-sensitive --extra-conf "use-case-hack = false" --encrypt true > plan.json
+./nix-installer install plan.json
+```
+
+For macos defaults to work, you need to [grant full disk access to the terminal](https://www.alfredapp.com/help/troubleshooting/indexing/terminal-full-disk-access/).
 
+```shell
 sudo mv /etc/nix/nix.conf{,.before-nix-darwin}
 nix  --extra-experimental-features 'flakes nix-command' run nix-darwin -- switch --flake .
 ```
diff --git a/darwin-modules/homebrew-packages/common.nix b/darwin-modules/homebrew-packages/common.nix
@@ -13,9 +13,7 @@
       "telegram"
       "visual-studio-code"
       "vlc"
-      "vmware-fusion"
       "wezterm"
-      "logseq"
     ];
   };
 }
diff --git a/darwin-modules/homebrew-packages/work.nix b/darwin-modules/homebrew-packages/work.nix
@@ -6,15 +6,11 @@
       "cyberduck"
       "datagrip"
       "docker"
-      "goland"
       "google-cloud-sdk"
       "intellij-idea"
-      "intune-company-portal"
       "microsoft-teams"
-      "tunnelblick"
+      "microsoft-office"
       "postman"
-      "dbvisualizer"
-      "activitywatch"
       "wireshark"
     ];
 
diff --git a/darwin-modules/nix.nix b/darwin-modules/nix.nix
@@ -4,7 +4,6 @@
   nixpkgs.config.allowUnfree = true;
 
   nix = {
-    # package = pkgs.nixVersions.nix_2_23;
     extraOptions = ''
       extra-experimental-features = nix-command flakes
       use-case-hack = false
diff --git a/darwin-modules/security.nix b/darwin-modules/security.nix
@@ -1,3 +1,7 @@
 {
-  security.pam.enableSudoTouchIdAuth = true;
+  security.pam.services.sudo_local = {
+    enable = true;
+    touchIdAuth = true;
+    watchIdAuth = true;
+  };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -30,6 +30,8 @@
       inputs.nix-darwin.follows = "nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs-darwin";
     };
+    krewfile.url = "github:brumhard/krewfile";
+    krewfile.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
     ez-configs = {
@@ -76,7 +78,6 @@
           starbuck.userHomeModules = [ "peteresselius" ];
         };
       };
-
       dev.enable = true;
     };
 }
diff --git a/home-modules/profiles/tools/work.nix b/home-modules/profiles/tools/work.nix
@@ -1,10 +1,11 @@
-{ lib, pkgs, config, ... }:
+{ inputs, lib, pkgs, config, ... }:
 
 let
   cfg = config.profiles.tools;
   inherit (lib) mkMerge mkIf;
 in
 {
+  imports = [ inputs.krewfile.homeManagerModules.krewfile ];
   options.profiles.tools = {
     asdf = lib.mkEnableOption "Install asdf";
     k8s = lib.mkEnableOption "Install k8s packages & set shell config";
@@ -47,16 +48,16 @@ in
 
       home.packages = with pkgs; [
         k9s
-        krew
         minio-client
         sqlfluff
         stern
         kubectl
       ];
 
-      home.sessionPath = [
-        "$HOME/.krew/bin"
-      ];
+      programs.krewfile = {
+        enable = true;
+        plugins = [ "oidc-login" ];
+      };
     })
 
     (mkIf cfg.minio {
diff --git a/home-modules/terminal.nix b/home-modules/terminal.nix
@@ -13,6 +13,8 @@
 
       config.window_decorations = 'RESIZE'
 
+      config.font = wezterm.font("JetBrains Mono")
+
       return config
     '';
   };
diff --git a/nixos-modules/hardware-vm.nix b/nixos-modules/hardware-vm.nix
@@ -31,7 +31,6 @@
       fsType = "fuse./run/current-system/sw/bin/vmhgfs-fuse";
       device = ".host:/";
       options = [
-        #      "umask=27"
         "uid=1000"
         "gid=1000"
         "allow_other"
diff --git a/nixos-modules/profiles/monitoring.nix b/nixos-modules/profiles/monitoring.nix
@@ -5,9 +5,6 @@ let
   inherit (lib) types mkOption mkIf mkEnableOption;
 in
 {
-  # imports = [
-  #   "${inputs.nixpkgs-unstable.outPath}/nixos/modules/services/monitoring/alloy.nix"
-  # ];
   options.profiles.monitoring = {
     enable = mkEnableOption "Enable monitoring";
     domain = mkOption {
@@ -216,38 +213,5 @@ in
         };
       };
     };
-
-    # services.alloy = {
-    #   enable = true;
-    # };
-
-    # environment.etc = {
-    #   "alloy/config.alloy" = {
-    #     text = ''
-    #       loki.relabel "journal" {
-    #         forward_to = []
-    #
-    #         rule {
-    #           source_labels = ["__journal__systemd_unit"]
-    #           target_label  = "unit"
-    #         }
-    #       }
-    #
-    #       loki.source.journal "read"  {
-    #         forward_to    = [loki.write.endpoint.receiver]
-    #         relabel_rules = loki.relabel.journal.rules
-    #         labels        = {component = "loki.source.journal"}
-    #       }
-    #
-    #       loki.write "endpoint" {
-    #         endpoint {
-    #           url = "http://127.0.0.1:3030/loki/api/v1/push"
-    #         }
-    #       }
-    #     '';
-    #     user = "alloy";
-    #     group = "alloy";
-    #   };
-    # };
   };
 }
diff --git a/overlays.nix b/overlays.nix
@@ -16,7 +16,6 @@ in
 
       inherit (unstable-pkgs) home-assistant;
       inherit (unstable-pkgs) zigbee2mqtt;
-      # inherit (unstable-pkgs) grafana-alloy;
     })
   ];
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
`1`	`1`	`{`
`2`		`- security.pam.enableSudoTouchIdAuth = true;`
	`2`	`+ security.pam.services.sudo_local = {`
	`3`	`+ enable = true;`
	`4`	`+ touchIdAuth = true;`
	`5`	`+ watchIdAuth = true;`
	`6`	`+ };`
`3`	`7`	`}`