clean up packages

Author: debugloop

home/default.nix

@@ -161,7 +161,6 @@
       protoc-gen-go
       protoc-gen-go-grpc
       # hardware (TODO: are those installed system-wide?)
-      simple-scan
       powertop
       pulseaudio # TODO: should be installed by services
     ];

home/wayland/default.nix

@@ -41,19 +41,25 @@
     packages = with pkgs; [
       # applications
       # cutter
-      easyeffects
-      eog
-      evince
-      filezilla
+      # eog
+      qview
+      # evince
+      zathura
+      # filezilla
       gimp
       google-chrome
       inkscape
-      libreoffice
-      nemo
+      # libreoffice
+      abiword
+      gnumeric
+      # nemo
+      xfce.thunar
+      xfce.thunar-volman
+      xfce.thunar-archive-plugin
       pavucontrol
       spotify
       teamspeak_client
-      vlc
+      # vlc
       wdisplays
       wev
       wireshark
@@ -76,10 +82,9 @@
       slurp
       xdg-utils
       # not precisely graphical, but require physical access
-      dfu-util
-      gcc-arm-embedded
-      qmk
-      jmtpfs
+      # dfu-util
+      # gcc-arm-embedded
+      # qmk
     ];
   };
 
@@ -103,14 +108,15 @@
 
   services = {
     cliphist.enable = true;
+    network-manager-applet.enable = true;
     blueman-applet.enable = true;
     gnome-keyring.enable = true;
   };
 
   programs = {
     firefox.enable = true;
     mpv.enable = true;
-    qutebrowser.enable = true;
+    qutebrowser.enable = false;
     wofi = {
       enable = true;
       settings = {

hosts/common/default.nix

@@ -15,6 +15,7 @@
   ];
 
   home-manager = {
+    backupFileExtension = "bak";
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = {

hosts/common/laptops.nix

@@ -1,7 +1,12 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   networking = {
     networkmanager = {
       enable = true;
+      plugins = lib.mkForce [];
       # logLevel = "DEBUG";
       wifi = {
         scanRandMacAddress = false;
@@ -82,7 +87,9 @@
   };
 
   environment.systemPackages = with pkgs; [
-    ddcutil # see above sudo rule
+    # brightness control
+    light # better commands
+    ddcutil # external displays
     networkmanagerapplet # required system-wide for icons
   ];
 
@@ -109,66 +116,46 @@
   xdg.portal = {
     enable = true;
     wlr.enable = true;
+    config.common = {
+      "org.freedesktop.impl.portal.FileChooser" = "gtk";
+    };
+    extraPortals = [pkgs.xdg-desktop-portal-gtk];
   };
 
   services = {
+    avahi.enable = true;
     blueman.enable = true;
     gnome.gnome-keyring = {
       enable = true;
     };
-    k3s = {
-      enable = false;
-      role = "server";
-      extraFlags = toString [];
-    };
     pipewire = {
       enable = true;
       alsa.enable = true;
       pulse.enable = true;
     };
     printing.enable = true;
     tlp.enable = true;
-    udev.extraRules = ''
-      # generic stm32 keyboard flashing
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666"
+    udev = {
+      packages = [pkgs.light];
+      extraRules = ''
+        # generic stm32 keyboard flashing
+        SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666"
 
-      # fazua ebike integration
-      SUBSYSTEM!="usb|usb_device", GOTO="ebike_rules_end"
-      ACTION!="add", GOTO="ebike_rules_end"
-      # 10c4:1000 for E-Bike Bootloader mode
-      ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="1000", MODE="0666", SYMLINK+="ebike-bootloader-%n"
-      # 10c4:100X for E-Bikes regular operation
-      ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="1001", MODE="0666", SYMLINK+="ebike-brain-%n"
-      # 10c4:100X for Lola device
-      ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="1002", MODE="0666", SYMLINK+="lola-%n"
-      LABEL="ebike_rules_end"
-    '';
-  };
-
-  systemd.services.shutdown-k3s = {
-    enable = true;
-    description = "ensure k3s shuts down correctly";
-    unitConfig = {
-      DefaultDependencies = false;
-      Before = [
-        "shutdown.target"
-        "umount.target"
-      ];
-    };
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.k3s}/bin/k3s-killall.sh";
+        # fazua ebike integration
+        SUBSYSTEM!="usb|usb_device", GOTO="ebike_rules_end"
+        ACTION!="add", GOTO="ebike_rules_end"
+        # 10c4:1000 for E-Bike Bootloader mode
+        ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="1000", MODE="0666", SYMLINK+="ebike-bootloader-%n"
+        # 10c4:100X for E-Bikes regular operation
+        ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="1001", MODE="0666", SYMLINK+="ebike-brain-%n"
+        # 10c4:100X for Lola device
+        ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="1002", MODE="0666", SYMLINK+="lola-%n"
+        LABEL="ebike_rules_end"
+      '';
     };
-    wantedBy = ["shutdown.target"];
   };
 
   programs = {
-    light.enable = true;
-    nm-applet.enable = true;
-    sway = {
-      enable = false;
-      extraPackages = [];
-    };
     niri = {
       enable = true;
       package = pkgs.niri-unstable;