Flatten home cli tools

README.md

@@ -45,9 +45,9 @@ nh home switch -c nix@firefly .
 # nix build installer iso
 nix build .#nixosConfigurations.vinox.config.system.build.isoImage
 
-# nh remote switch
-nh os switch --hostname kubex . -d always --target-host kubex
-nh os switch --hostname nixberry . -d always --target-host <IP>
+# nh remote switch / update
+nh os boot --hostname kubex . -d always --target-host kubex
+nh os boot --hostname nixberry . -d always --target-host <IP>
 
 # nix remote switch
 nixos-rebuild switch --flake .#kubex --target-host 192.168.55.10 --sudo

hosts/kubex/default.nix

@@ -21,8 +21,8 @@
       name = "kubex";
       initialHashedPassword = "$y$j9T$8uQSJbY6w9kjXnj74JKjA1$pWYgNf.gb497suX//oIw6aggEPoD2Xv1kvMKZfDTOU/";
       keys = [
-        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKX8MmA9KdHCny6rKCGZlyd/J5qCXh+YDM0/3ZGDmfyaAAAABHNzaDo= yubi@rapsn.me"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGqKYXW07z0llbDKRIakLD1PjHe3HxK9iu6czXs+ZU7v techkey@rapsn"
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB1twcfSmy7xyUA5iWl51kfBHS1Dxpmmog0x55Z6HRNlAAAABHNzaDo= swiss"
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKX8MmA9KdHCny6rKCGZlyd/J5qCXh+YDM0/3ZGDmfyaAAAABHNzaDo= yubi"
       ];
       extraOptions = { };
       extraGroups = [ ];

hosts/nixberry/default.nix

@@ -14,7 +14,8 @@
       name = "rap";
       initialHashedPassword = "$y$j9T$8uQSJbY6w9kjXnj74JKjA1$pWYgNf.gb497suX//oIw6aggEPoD2Xv1kvMKZfDTOU/";
       keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGqKYXW07z0llbDKRIakLD1PjHe3HxK9iu6czXs+ZU7v techkey@rapsn"
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB1twcfSmy7xyUA5iWl51kfBHS1Dxpmmog0x55Z6HRNlAAAABHNzaDo= swiss"
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKX8MmA9KdHCny6rKCGZlyd/J5qCXh+YDM0/3ZGDmfyaAAAABHNzaDo= yubi"
       ];
       extraOptions = { };
       extraGroups = [ ];

hosts/vinox/default.nix

@@ -24,7 +24,10 @@
       initialHashedPassword = "";
       extraOptions = { };
       extraGroups = [ ];
-      keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGqKYXW07z0llbDKRIakLD1PjHe3HxK9iu6czXs+ZU7v" ];
+      keys = [
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB1twcfSmy7xyUA5iWl51kfBHS1Dxpmmog0x55Z6HRNlAAAABHNzaDo= swiss"
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKX8MmA9KdHCny6rKCGZlyd/J5qCXh+YDM0/3ZGDmfyaAAAABHNzaDo= yubi"
+      ];
     };
   };
 

modules/home/browsers/firefox/default.nix

@@ -40,6 +40,8 @@ in
 
         "widget.use-xdg-desktop-portal.file-picker" = 0; # Use new gtk file picker instead of legacy one
 
+        "widget.wayland.fractional-scale.enabled" = false; # Disable buggy scaling
+
         "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
         "layers.acceleration.force-enabled" = true;
         "gfx.webrender.all" = true;

modules/home/cli/tools/core/packages.nix → modules/home/cli/core/default.nix

@@ -55,4 +55,14 @@
       ddcutil
       ;
   };
+
+  programs = {
+    bat.enable = true;
+    fzf.enable = true;
+    btop.enable = true;
+
+    zoxide.enable = true;
+    neonix.enable = true;
+    eza.enable = true;
+  };
 }

modules/home/cli/tools/langs/go.nix → modules/home/cli/langs/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   config,
+  lib,
   ...
 }:
 {
@@ -15,4 +16,11 @@
       ];
     };
   };
+
+  config = lib.mkIf (!config.roles.work) {
+    home.packages = builtins.attrValues {
+      inherit (pkgs) clang rustup;
+    };
+    home.sessionPath = [ "$HOME/.cargo/bin" ];
+  };
 }

modules/home/programs/default.nix

@@ -1,5 +1,27 @@
+{ pkgs, ... }:
 {
-  imports = [
-    ./guis
-  ];
+  home.packages = builtins.attrValues {
+    # Audio
+    inherit (pkgs)
+      pavucontrol
+      spek
+      vlc
+
+      # Screenshot / Recording
+      grimblast
+      wf-recorder
+
+      # Tools
+      nwg-displays
+      nwg-look
+      gparted
+      gnome-disk-utility
+
+      # Explorer
+      thunar
+
+      # Note taking
+      obsidian
+      ;
+  };
 }