packages: x86_64-linux -> ${system}

home/sway: set full command path for exec calls

common/packages.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   nix-xilinx,
+  system,
   ...
 }: {
   environment.systemPackages = with pkgs;
@@ -74,5 +75,5 @@
       zip
       z-lua
     ]
-    ++ (with nix-xilinx.packages.x86_64-linux; [vivado vitis vitis_hls model_composer xilinx-shell]);
+    ++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
 }

flake.nix

@@ -72,10 +72,11 @@
     pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
   in {
     nixosConfigurations = rec {
-      nixy = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
+          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./common/packages.nix
           ./common/suspend.nix
@@ -87,7 +88,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs;};
+            home-manager.extraSpecialArgs = {inherit inputs system;};
           }
           peerix.nixosModules.peerix
           {
@@ -104,10 +105,11 @@
         ];
       };
 
-      mediabox = nixpkgs.lib.nixosSystem {
+      mediabox = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
+          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./common/packages.nix
           ./common/suspend.nix
@@ -120,7 +122,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs;};
+            home-manager.extraSpecialArgs = {inherit inputs system;};
           }
           peerix.nixosModules.peerix
           {
@@ -137,10 +139,11 @@
         ];
       };
 
-      blue = nixpkgs.lib.nixosSystem {
+      blue = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
+          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./blue/configuration.nix
           ./blue/hardware-configuration.nix
@@ -150,17 +153,19 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
+            home-manager.extraSpecialArgs = {inherit inputs system;};
           }
         ];
       };
-      magpie = nixpkgs.lib.nixosSystem {
+      magpie = nixpkgs.lib.nixosSystem rec {
         system = "arm64-linux";
         modules = [
           {_module.args = inputs;}
+          {_module.args.system = system;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./magpie/configuration.nix
           ./magpie/hardware-configuration.nix
-	  goatcounter.nixosModules.goatcounter
+          goatcounter.nixosModules.goatcounter
           simple-nixos-mailserver.nixosModule
           sops-nix.nixosModules.sops
           (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")

home/home_packages.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   inputs,
+  system,
   ...
 }: {
   home.packages = with pkgs;
@@ -17,7 +18,6 @@
       caddy
       cargo
       ccls
-      cemu
       cmake
       compsize
       cura
@@ -55,7 +55,7 @@
       openocd
       openscad
       pandoc
-      pass
+      pass-wayland
       patchelf
       pavucontrol
       pirate-get
@@ -111,8 +111,8 @@
       zls
     ]
     ++ [
-      inputs.swaysw.packages.x86_64-linux.swaysw
+      inputs.swaysw.packages.${system}.swaysw
-      inputs.nvim.packages.x86_64-linux.nvim
+      inputs.nvim.packages.${system}.nvim
       (pkgs.callPackage ../packages/zapzap/default.nix {})
       (pkgs.callPackage ../packages/viber/default.nix {})
       (pkgs.callPackage ../packages/bubblewrap/default.nix {})

home/sway.nix

@@ -2,8 +2,21 @@
   config,
   lib,
   pkgs,
+  inputs,
+  system,
   ...
-}: {
+}: let
+  cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
+    ${pkgs.cliphist}/bin/cliphist list | \
+    ${pkgs.wofi}/bin/wofi --dmenu --insensitive | \
+    ${pkgs.cliphist}/bin/cliphist decode | \
+    ${pkgs.wl-clipboard}/bin/wl-copy
+  '';
+  swaysw = inputs.swaysw.packages.${system}.swaysw;
+  zapzap = pkgs.callPackage ../packages/zapzap/default.nix {};
+  viber = pkgs.callPackage ../packages/viber/default.nix {};
+  term = "${pkgs.foot}/bin/footclient";
+in {
   wayland.windowManager.sway = {
     enable = true;
     extraSessionCommands = "";
@@ -58,14 +71,15 @@
             style = "Bold Semi-Condensed";
             size = 12.0;
           };
-          statusCommand = "i3status-rs ~/.config/i3status-rust/config-top.toml";
+          statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml";
         }
       ];
 
       keybindings = {
         "Alt+Shift+q" = "kill";
-        "Alt+Shift+Return" = "exec ${pkgs.foot}/bin/footclient";
+        "Alt+Shift+Return" = "exec ${term}";
         "Alt+p" = "exec ${pkgs.dmenu-wayland}/bin/dmenu-wl_run -fn \"mono 14\"";
+        "Alt+c" = "exec ${pkgs.moreutils}/bin/lckdo cliphist_sway ${cliphist_sway}/bin/cliphist_sway";
 
         "Alt+Shift+space" = "floating toggle";
         "Alt+space" = "focus mode_toggle";
@@ -100,21 +114,16 @@
         "Alt+j" = "focus down";
         "Alt+k" = "focus up";
         "Alt+l" = "focus right";
-        "Alt+slash" = "exec swaysw";
+        "Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw";
         "Alt+Escape" = "workspace back_and_forth";
         "Alt+f" = "fullscreen enable";
 
         "Mod4+l" = ''
-          exec swaymsg [app_id="python3"] scratchpad show || exec foot -a python3 python3'';
+          exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
-        "Mod4+h" = "exec swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec zapzap";
+        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${zapzap}/bin/zapzap";
-        "Mod4+j" = "exec swaymsg [app_id=com.viber] scratchpad show || exec viber";
+        "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
         "Mod4+y" = ''
-          exec swaymsg [app_id="pulsemixer"] scratchpad show || exec foot -a pulsemixer pulsemixer'';
+          exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';
-
-        "XF86AudioRaiseVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') +5%";
-        "XF86AudioLowerVolume" = "exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') -5%";
-        "XF86AudioMute" = "exec pactl set-sink-mute $(pacmd list-sinks |awk '/* index:/{print $3}') toggle";
-        "XF86AudioMicMute" = "exec pactl set-source-mute $(pacmd list-sources |awk '/* index:/{print $3}') toggle";
       };
     };
   };

mediabox/configuration.nix

@@ -7,6 +7,7 @@
   lib,
   sops-nix,
   zremap,
+  system,
   ...
 }: {
   imports = [];
@@ -134,7 +135,7 @@
         serviceConfig.Nice = -20;
         script = ''
           sleep 1
-          ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
+          ${zremap.defaultPackage.${system}}/bin/zremap \
           /dev/input/by-path/platform-i8042-serio-0-event-kbd
         '';
       };

nixy/configuration.nix

@@ -4,6 +4,7 @@
   lib,
   nix-xilinx,
   sops-nix,
+  system,
   zremap,
   ...
 }: {
@@ -144,7 +145,7 @@
         serviceConfig.Nice = -20;
         script = ''
           sleep 1
-          ${zremap.defaultPackage.x86_64-linux}/bin/zremap \
+          ${zremap.defaultPackage.${system}}/bin/zremap \
           /dev/input/by-path/platform-i8042-serio-0-event-kbd
         '';
       };