Commit dd1dee64c765

Vincent Demeester <vincent@sbr.pm>
2022-03-10 16:01:15
systems/modules: fix some changed package names
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 3f8e1de
Changed files (6)
systems
modules
profiles
desktop.nix
scanning.nix
wireguard.server.nix
services
wireguard.client.nix
users
vincent
desktop
xsession.nix
dev
go.nix
systems/modules/profiles/desktop.nix
@@ -104,7 +104,7 @@ in
 
     environment.systemPackages = with pkgs; [
       cryptsetup
-      xlibs.xmodmap
+      xorg.xmodmap
       # xorg.xbacklight
       xorg.xdpyinfo
       xorg.xhost
systems/modules/profiles/scanning.nix
@@ -12,8 +12,8 @@ in
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      saneFrontends
-      saneBackends
+      sane-frontends
+      sane-backends
       simple-scan
     ];
     hardware.sane = {
systems/modules/profiles/wireguard.server.nix
@@ -18,7 +18,7 @@ in
   };
   config = mkIf cfg.enable {
     # boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
-    environment.systemPackages = [ pkgs.wireguard ];
+    environment.systemPackages = [ pkgs.wireguard-tools ];
     boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
     networking.firewall.extraCommands = ''
       iptables -t nat -A POSTROUTING -s10.100.0.0/24 -j MASQUERADE
systems/modules/services/wireguard.client.nix
@@ -44,7 +44,7 @@ in
   };
   config = mkIf cfg.enable {
     # boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
-    environment.systemPackages = [ pkgs.wireguard ];
+    environment.systemPackages = [ pkgs.wireguard-tools ];
     networking.firewall.trustedInterfaces = [ "wg0" ];
     networking.wireguard.enable = true;
     networking.wireguard.interfaces = {
users/vincent/desktop/xsession.nix
@@ -4,7 +4,7 @@
   xsession = {
     enable = true;
     initExtra = ''
-      ${pkgs.xlibs.xmodmap}/bin/xmodmap ${config.home.homeDirectory}.Xmodmap &
+      ${pkgs.xorg.xmodmap}/bin/xmodmap ${config.home.homeDirectory}.Xmodmap &
     '';
     pointerCursor = {
       package = pkgs.vanilla-dmz;
users/vincent/dev/go.nix
@@ -14,7 +14,7 @@
     go-outline
     go-symbols
     delve
-    goimports
+    gotools
     gotestsum
     # misc
     protobuf