feat(home/packages): add new dev packages

hosts/gampo/configuration.nix

@@ -34,9 +34,11 @@
     };
     hardware = {
       bluetooth.enable = true;
-      corne.allowHidAccess = true;
-      ibmTrackpoint.disable = true;
-      opentablet.enable = true;
+      input = {
+        corne.allowHidAccess = true;
+        ibmTrackpoint.disable = true;
+        opentablet.enable = true;
+      };
       sound.enable = true;
     };
     misc.keymap = "fr-bepo";

hosts/marpa/configuration.nix

@@ -38,8 +38,10 @@
     hardware = {
       amdgpu.enable = true;
       bluetooth.enable = true;
-      corne.allowHidAccess = true;
-      opentablet.enable = true;
+      input = {
+        corne.allowHidAccess = true;
+        opentablet.enable = true;
+      };
       sound = {
         enable = true;
         jack = true;
@@ -90,6 +92,11 @@
     mode = "0440";
   };
 
+  services.udev.extraHwdb = ''
+    mouse:usb:047d:80a6:*
+     LIBINPUT_MIDDLE_EMULATION_ENABLED=1
+  '';
+
   security = {
     polkit.enable = true;
     rtkit.enable = true;

system/dev/docker.nix

@@ -14,11 +14,16 @@ in {
     autoprune.enable = mkEnableOption "Enable autoprune";
   };
 
-  config = {
-    environment.systemPackages = mkIf cfg.podman.enable [
-      pkgs.podman-desktop
-      pkgs.podman-compose
-    ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs;
+      [
+        dive # A tool for exploring each layer in a docker image
+        grype # Vulnerability scanner for container images and filesystems
+      ]
+      ++ lists.optionals cfg.podman.enable [
+        podman-compose
+        podman-desktop
+      ];
     virtualisation = mkIf cfg.enable {
       docker = mkIf (!cfg.podman.enable) {
         enable = true;

system/hardware/default.nix

@@ -2,9 +2,7 @@
   imports = [
     ./amdgpu.nix
     ./bluetooth.nix
-    ./corne.nix
-    ./ibm-trackpoint.nix
-    ./opentablet.nix
     ./sound.nix
+    ./input
   ];
 }

system/hardware/input/corne.nix

@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.mySystem.hardware.corne;
+  cfg = config.mySystem.hardware.input.corne;
 in {
-  options.mySystem.hardware.corne.allowHidAccess = mkEnableOption "Enable HID access to the corne keyboard";
+  options.mySystem.hardware.input.corne.allowHidAccess = mkEnableOption "Enable HID access to the corne keyboard";
   config.services.udev = mkIf cfg.allowHidAccess {
     extraRules = ''
       KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"

system/hardware/input/default.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./corne.nix
+    ./ibm-trackpoint.nix
+    ./opentablet.nix
+    ./trackball.nix
+  ];
+}

system/hardware/input/ibm-trackpoint.nix

@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.mySystem.hardware.ibmTrackpoint;
+  cfg = config.mySystem.hardware.input.ibmTrackpoint;
 in {
-  options.mySystem.hardware.ibmTrackpoint.disable = mkEnableOption "Disable IBM’s trackpoint on ThinkPad";
+  options.mySystem.hardware.input.ibmTrackpoint.disable = mkEnableOption "Disable IBM’s trackpoint on ThinkPad";
   config.services.udev = mkIf cfg.disable {
     extraRules = ''
       ATTRS{name}=="*TPPS/2 IBM TrackPoint", ENV{ID_INPUT}="", ENV{ID_INPUT_MOUSE}="", ENV{ID_INPUT_POINTINGSTICK}=""

system/hardware/input/opentablet.nix

@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.mySystem.hardware.opentablet;
+  cfg = config.mySystem.hardware.input.opentablet;
 in {
-  options.mySystem.hardware.opentablet.enable = mkEnableOption "Enables OpenTablet drivers";
+  options.mySystem.hardware.input.opentablet.enable = mkEnableOption "Enables OpenTablet drivers";
   config.hardware.opentabletdriver = mkIf cfg.enable {
     inherit (cfg) enable;
     daemon.enable = true;

system/hardware/input/trackball.nix

@@ -0,0 +1,3 @@
+{
+  services.libinput.mouse.middleEmulation = true;
+}

users/modules/desktop/hyprland.nix

@@ -82,7 +82,7 @@ in {
           new_status = "inherit";
         };
         workspace = [
-          "4, layoutopt:orientation:bottom"
+          "10, layoutopt:orientation:bottom"
           "1, layoutopt:orientation:bottom"
         ];
         decoration = {

users/modules/desktop/hyprpaper.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 with lib; let
@@ -43,7 +44,7 @@ in {
         };
         Service = {
           Type = "oneshot";
-          ExecCondition = "pidof Hyprland";
+          ExecCondition = "${pkgs.procps}/bin/pidof Hyprland";
           ExecStart = "${config.home.homeDirectory}/.config/hypr/hyprpaper-rotate.sh";
         };
       };
@@ -79,7 +80,7 @@ in {
         echo "Setting wallpaper to: $WP"
 
         # Load and set the wallpaper
-        hyprctl hyprpaper preload "$WP" && hyprctl hyprpaper wallpaper ",$WP"
+        ${pkgs.hyprland}/bin/hyprctl hyprpaper preload "$WP" && ${pkgs.hyprland}/bin/hyprctl hyprpaper wallpaper ",$WP"
       '';
       executable = true;
     };

users/modules/shell/default.nix

@@ -40,6 +40,16 @@ with lib; let
     dcud = "docker compose up -d";
     dcudp = "docker compose up -d --pull=always";
     dcr = "docker compose restart";
+    pc = "podman compose";
+    pcd = "podman compose down";
+    pcl = "podman compose logs";
+    pclf = "podman compose logs -f";
+    pcp = "podman compose pull";
+    pcu = "podman compose up";
+    pcud = "podman compose up -d";
+    pcudp = "podman compose up -d --pull=always";
+    pcr = "podman compose restart";
+
     enw = "emacsclient -nw";
     e = "emacsclient -n -c";
 

users/phundrak/packages.nix

@@ -68,18 +68,22 @@ with lib; {
     gimpPlugins.gmic
 
     # Dev
+    dbeaver-bin
     devenv
-    dive # A tool for exploring each layer in a docker image
-    grype # Vulnerability scanner for container images and filesystems
+    nodejs
+    sqlite
     tectonic # better LaTeX engine
+    wakatime-cli
     zeal
 
     ## LSP servers
     bash-language-server
     docker-language-server
     kdePackages.qtdeclarative # For QML LSP
-    nil # Nix
+    nixd
+    marksman
     python3 # for Emacs and LSP
+    vscode-json-languageserver
     yaml-language-server # Yaml (Docker, GitHub Actions, ...)
   ];
 }

users/phundrak/wlr-which-key/center-window.nix

@@ -1,4 +1,4 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "center-window" ''
-  pidof -x Hyprland && hyprctl dispatch centerwindow
+  ${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch centerwindow
 ''

users/phundrak/wlr-which-key/close-window.nix

@@ -1,4 +1,4 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "close-window" ''
-  pidof -x Hyprland && hyprctl dispatch killactive
+  ${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch killactive
 ''

users/phundrak/wlr-which-key/default.nix

@@ -74,6 +74,11 @@
                 desc = "Bluetooth";
                 cmd = "${pkgs.rofi-bluetooth}/bin/rofi-bluetooth";
               }
+              {
+                key = "c";
+                desc = "calc";
+                cmd = "rofi -show calc";
+              }
               {
                 key = "e";
                 desc = "Emoji";
@@ -82,7 +87,7 @@
               {
                 key = "r";
                 desc = "App Menu";
-                cmd = "rofi -combi-modi drun,calc -show combi";
+                cmd = "rofi -show drun";
               }
               {
                 key = "s";

users/phundrak/wlr-which-key/float-window.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "float" ''
-  pidof -x Hyprland && hyprctl dispatch togglefloating
-  echo test
+  ${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating
 ''

users/phundrak/wlr-which-key/focus-urgent.nix

@@ -1,4 +1,4 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "focus-urgent" ''
-  pidof -x Hyprland && hyprctl dispatch focusurgentorlast
+  ${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch focusurgentorlast
 ''

users/phundrak/wlr-which-key/fullscreen.nix

@@ -1,4 +1,4 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "fullscreen" ''
-  pidof -x Hyprland && hyprctl dispatch fullscreen
+  ${pkgs.procps}/bin/pidof -x Hyprland && ${pkgs.hyprland}/bin/hyprctl dispatch fullscreen
 ''