Massive sweeping changes

nixos/home-manager/low-power-laptop.nix

@@ -1,6 +1,12 @@
 { config, pkgs, ... }:
 
 {
+
+  mports = [
+    ./packages/common-cli.nix
+    ./packages/common-desktop.nix
+  ];
+
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "aria";
@@ -68,7 +74,7 @@
   #  /etc/profiles/per-user/aria/etc/profile.d/hm-session-vars.sh
   #
   home.sessionVariables = {
-    # EDITOR = "emacs";
+    EDITOR = "nvim";
   };
 
   # Let Home Manager install and manage itself.

nixos/home-manager/nixos.nix

@@ -12,6 +12,8 @@
     ./nixos/packages.nix
     ./nixos/services.nix
 
+    ./packages/gamedev.nix
+
     ./packages/common-cli.nix
     ./packages/common-desktop.nix
   ];
@@ -62,7 +64,7 @@
   #  /etc/profiles/per-user/buymymojo/etc/profile.d/hm-session-vars.sh
   #
   home.sessionVariables = {
-    EDITOR = "code";
+    EDITOR = "nvim";
     NIXPKGS_ALLOW_UNFREE = "1";
   };
 
@@ -70,6 +72,10 @@
     "/home/buymymojo/bin/"
   ];
 
+  programs.git = {
+    signing.key = "E7B7B8D20C8753C077F9B17119AB7AA462B8AB3B";
+  };
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }

nixos/home-manager/nixos/packages.nix

@@ -13,13 +13,6 @@
   home.file."jdks/zulujdk17".source = pkgs.zulu17;
   home.file."jdks/zulujdk23".source = pkgs.zulu23;
 
-  home.file."Godot/current".source = unstable.godot;
-  home.file."Godot/current-mono".source = unstable.godot-mono;
-  home.file."Godot/export-templates/current".source = unstable.godot-export-templates;
-  home.file."Godot/4.3".source = unstable.godot_4_3;
-  home.file."Godot/4.3-mono".source = unstable.godot_4_3-mono;
-  home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates;
-
   home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
 
   # The home.packages option allows you to install Nix packages into your
@@ -54,16 +47,9 @@
       # === Minecraft ===
 
       # === CLI ===
-      pkgs.bat
-      pkgs.btop
       pkgs.rrsync
-      pkgs.ripgrep
-      pkgs.wl-clipboard
       pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface
       pkgs.age
-      pkgs.stow
-      unstable.yt-dlp
-      pkgs.aria2
       pkgs.jujutsu
       pkgs.lazyjj
       pkgs.biome
@@ -94,14 +80,6 @@
       pkgs.distrobox
       pkgs.boxbuddy
 
-      unstable.godot-mono
-      unstable.godot-export-templates
-      unstable.blender-hip
-      unstable.freecad-wayland
-      pkgs.unityhub
-      pkgs.material-maker
-      unstable.blockbench
-
       unstable.gpu-screen-recorder-gtk
       gsr-ui.gpu-screen-recorder-ui
 

nixos/home-manager/packages/common-cli.nix

@@ -23,10 +23,21 @@ in
   ];
 
   home.packages =
+    with pkgs;
     with unstable;
     with inputs;
     [
+      stow
+      unstable.yt-dlp
+      aria2
+      ripgrep
+      wl-clipboard
+      bat
+      btop
 
+      fzf
+      unstable.dwarfs
+      unrar
     ];
 
   programs.neovim = {
@@ -45,7 +56,6 @@ in
     userName = "BuyMyMojo";
     userEmail = "hello+git@buymymojo.net";
     lfs.enable = true;
-    signing.key = "E7B7B8D20C8753C077F9B17119AB7AA462B8AB3B";
     signing.signByDefault = true;
     extraConfig = {
       init = {
@@ -55,10 +65,10 @@ in
     };
   };
 
-  programs.bellado = {
-    enable = true;
-    enableAliases = true;
-  };
+  # programs.bellado = {
+  #   enable = true;
+  #   enableAliases = true;
+  # };
 
   programs.ssh.enable = true;
   programs.ssh.addKeysToAgent = "yes";

nixos/home-manager/packages/common-desktop.nix

@@ -22,15 +22,9 @@ in
     inputs.moonlight.homeModules.default
   ];
 
-  nixpkgs = {
-    overlays = [
-      inputs.moonlight.overlays.default
-    ];
-  };
-
   home.packages =
-    with unstable;
     with inputs;
+    with unstable;
     [
       pkgs.yubioath-flutter
       pkgs.qbittorrent
@@ -50,15 +44,16 @@ in
       pkgs.jetbrains.webstorm
       pkgs.jetbrains.rider
       pkgs.jetbrains.idea-community
-      # unstable.neovim
+      vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured
       # === Editors/Office ===
 
       # === Media ===
       unstable.gimp
       unstable.krita
-      # pkgs.mpv
+      unstable.mpv
       unstable.losslesscut-bin
       unstable.jellyfin-media-player
+      unstable.makemkv
       # === Media ===
 
       unstable.orca-slicer

nixos/home-manager/packages/gamedev.nix

@@ -0,0 +1,40 @@
+{
+  config,
+  pkgs,
+  unstable,
+  inputs,
+  lib,
+  ...
+}:
+
+let
+  withExtraPackages =
+    pkg: extraPackages:
+    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+      for exe in ${lib.getBin pkg}/bin/*; do
+        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
+      done
+    '';
+in
+{
+
+  home.file."Godot/current".source = unstable.godot;
+  home.file."Godot/current-mono".source = unstable.godot-mono;
+  home.file."Godot/export-templates/current".source = unstable.godot-export-templates;
+  home.file."Godot/4.3".source = unstable.godot_4_3;
+  home.file."Godot/4.3-mono".source = unstable.godot_4_3-mono;
+  home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates;
+
+  home.packages =
+    with unstable;
+    with inputs;
+    [
+      unstable.godot-mono
+      unstable.godot-export-templates
+      unstable.blender-hip
+      unstable.freecad-wayland
+      pkgs.unityhub
+      pkgs.material-maker
+      unstable.blockbench
+    ];
+}