.gitattributes

@@ -1 +0,0 @@
-*.deb filter=lfs diff=lfs merge=lfs -text

home/jacob.nix

@@ -40,7 +40,6 @@
       inconsolata
       jq
       keyutils  # for keyctl, used by some bitwarden scripts like qute-bitwarden
-      krita
       libreoffice
       logseq
       mupdf
@@ -62,7 +61,6 @@
       tree
       unzip
       xclip
-      xournal
       xpra
       zathura
       zoom-us
@@ -359,9 +357,5 @@
         config = ./xmonad.hs;
       };
     };
-    initExtra = ''
-      xinput --map-to-output 'HANVON UGEE Artist 16(2nd Gen) Mouse' DP-1
-      xinput --map-to-output 'HANVON UGEE Artist 16(2nd Gen)' DP-1
-      '';
   };
 }

machines/buck/configuration.nix

@@ -8,11 +8,7 @@
   inputs,
   sops,
   ...
-}:
-let
-  xp_pen_pentablet = pkgs.callPackage ./xp_pen_pentablet.nix {};
-in
-{
+}: {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -57,17 +53,15 @@ in
     };
   };
 
-  networking = {
-    hostName = "buck"; # Define your hostname.
-    enableIPv6 = true;
-    wireless = {
-      enable = true;
-      userControlled.enable = true;
-      environmentFile = "/run/secrets/wifi/env";
-      networks = {
-        "@SSID_HOME@" = {
-          pskRaw = "@PSKRAW_HOME@";
-        };
+  networking.hostName = "buck"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.wireless = {
+    enable = true;
+    userControlled.enable = true;
+    environmentFile = "/run/secrets/wifi/env";
+    networks = {
+      "@SSID_HOME@" = {
+        pskRaw = "@PSKRAW_HOME@";
       };
     };
   };
@@ -91,11 +85,8 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    networkmanager
-    networkmanagerapplet
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
-    xp_pen_pentablet
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -106,8 +97,6 @@ in
       enable = true;
       enableSSHSupport = true;
     };
-    # This is needed in case users set zsh as their default shell
-    zsh.enable = true;
   };
 
   # List services that you want to enable:
@@ -119,26 +108,16 @@ in
   # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users = {
-    groups.plugdev = {};
-    users.jacob = {
-      isNormalUser = true;
-      extraGroups = [ "audio" "jackaudio" "plugdev" "video" "wheel" ]; # Enable ‘sudo’ for the user.
-      shell = pkgs.zsh;
-    };
+  users.users.jacob = {
+    isNormalUser = true;
+    extraGroups = [ "video" "wheel" ]; # Enable ‘sudo’ for the user.
+    shell = pkgs.zsh;
   };
 
   security.rtkit.enable = true; # recommended for pipewire
 
   # List services that you want to enable:
   services = {
-    # If you want to use JACK applications, uncomment this
-    jack = {
-      alsa.enable = false;
-      jackd.enable = true;
-      loopback.enable = true;
-    };
-
     logind = {
       extraConfig = ''
       [Login]
@@ -155,10 +134,12 @@ in
     openssh.enable = true;
 
     pipewire = {
-      enable = false;
-      alsa.enable = false;
+      enable = true;
+      alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
+      # If you want to use JACK applications, uncomment this
+      #jack.enable = true;
 
       # use the example session manager (no others are packaged yet so this is enabled by default,
       # no need to redefine it in your config for now)
@@ -173,22 +154,12 @@ in
 
     udev.extraRules = ''
     ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="intel_backlight", MODE="0666", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/backlight/%k/brightness"
-    KERNEL=="hidraw", SUBSYSTEM=="hidraw", MODE="0664", GROUP="plugdev"
-
-    # For XP-PEN tablet
-    # From the official driver
-    KERNEL=="uinput",MODE:="0666",OPTIONS+="static_node=uinput"
-    SUBSYSTEMS=="usb",ATTRS{idVendor}=="28bd",MODE:="0666"
-j
-    #KERNEL=="event[0-9]*", SUBSYSTEM=="input", SUBSYSTEMS=="usb", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="094c", MODE="0664", GROUP="plugdev"
-    #KERNEL=="mouse[0-9]*", SUBSYSTEM=="input", SUBSYSTEMS=="usb", ATTRS{idVendor}=="28bd", ATTRS{idProduct}=="094c", MODE="0664", GROUP="plugdev"
   '';
 
     # Enable the X11 windowing system. services.xserver.enable = true;
     xserver = {
       enable = true;
       dpi = 112;  # t470 has a 14" 16:9 monitor at native res 1366x768
-      digimend.enable = true;
       displayManager = {
         defaultSession = "none+i3";
         autoLogin = {
@@ -207,7 +178,6 @@ j
           disableWhileTyping = true;
         };
       };
-      #wacom.enable = true;
       windowManager.i3 = {
         enable = true;
         extraPackages = with pkgs; [

machines/buck/hardware-configuration.nix

@@ -42,14 +42,8 @@
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
-  #hardware.video.hidpi.enable = true;
+  hardware.video.hidpi.enable = true;
 
   powerManagement.cpuFreqGovernor = "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  # for XP-Pen tablet
-  #hardware.opentabletdriver = {
-    #enable = true;
-    #package = patchedOTD;
-  #};
 }

machines/buck/xp_pen_pentablet.nix

@@ -25,7 +25,7 @@
 , lib
 , fetchurl
 , glib
-, dbus
+, dbus_libs
 , dpkg
 , autoPatchelfHook
 , writeShellScript
@@ -44,7 +44,7 @@
 
 stdenv.mkDerivation rec {
   pname = "xp_pen_driver";
-  version = "3.3.9.230222-1";
+  version = "3.2.0.210804-1";
   
   src = fetchurl {
     #url = "https://github.com/peterwilli/XP-Pen-Pentablet-Driver-for-Nixos/releases/download/3.2.0.210804-1/XP-PEN-pentablet-3.2.0.210804-1.x86_64.deb";
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     zlib
     libGL
     libusb
-    dbus
+    dbus_libs
     fontconfig
     glib
     freetype
@@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
     chmod 755 "$out"
 
     chmod a+x $out/usr/lib/pentablet/pentablet.sh
-    chmod a+x $out/usr/lib/pentablet/pentablet
     runHook postInstall
     mkdir -p $out/bin
     makeWrapper $out/usr/lib/pentablet/pentablet.sh $out/bin/pentablet