Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

nixos/common/desktop/default.nix

@@ -1,9 +1,9 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, inputs, ... }: {
   # Bootloader.
   boot = {
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot.enable = lib.mkDefault true;
       efi.canTouchEfiVariables = true;
       efi.efiSysMountPoint = "/boot/efi";
     };
@@ -15,6 +15,12 @@
   };
 
   hardware.keyboard.qmk.enable = true;
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.victor = import ./home.nix;
+    extraSpecialArgs = { inherit inputs; };
+  };
 
   # Enable my config for the gnome desktop environment
   services.v.gnome.enable = true;
@@ -40,7 +46,9 @@
   services.printing.enable = true;
 
   # Global Packages
-  environment.systemPackages = with pkgs; [ wireguard-tools ];
+  environment = {
+    systemPackages = with pkgs; [ wireguard-tools sbctl ];
+  };
 
   # Enable sound with pipewire.
   sound.enable = true;
@@ -85,6 +93,7 @@
     remotePlay.openFirewall = true;
   };
 
+  programs.adb.enable = true;
   # Networking
   networking.networkmanager.enable = true;
   networking.firewall.checkReversePath = false;

nixos/common/desktop/home.nix

@@ -7,6 +7,7 @@ let
   my-python-packages = ps: with ps; [ pandas requests numpy ];
 in {
   home.packages = with pkgs; [
+    (python3.withPackages my-python-packages)
     btop
     calibre
     celluloid
@@ -17,13 +18,11 @@ in {
     gimp
     inputs.comma.packages.${pkgs.system}.default
     inputs.webcord.packages.${pkgs.system}.default
-    # jetbrains.clion
     kdenlive
     mullvad-vpn
     neofetch
     nixfmt
     nixpkgs-review
-    (python3.withPackages my-python-packages)
     plex-media-player
     rustup
     solo2-cli
@@ -35,7 +34,6 @@ in {
 
   # Enable my own hm modules
   themes.v.catppuccin.enable = true;
-  programs.v.nvim.enable = true;
   programs.v.vscode.enable = true;
 
   programs.riff = {
@@ -56,22 +54,21 @@ in {
     userName = "Victor";
     userEmail = "victor@xirion.net";
     lfs.enable = true;
-    # delta.enable = true;
     extraConfig = {
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
     };
-  };
 
-  programs.tmux = {
-    enable = true;
-    shortcut = "b";
-    terminal = "screen-256color";
-    clock24 = true;
+    difftastic.enable = true;
   };
 
   programs.firefox.enable = true;
 
+  programs.chromium = {
+    enable = true;
+    package = pkgs.ungoogled-chromium;
+  };
+
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;