Compare commits
2 Commits
f7e5044189
...
ee4ff53921
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee4ff53921 | ||
|
|
956165c4e3 |
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@ -0,0 +1 @@
|
||||
*.deb filter=lfs diff=lfs merge=lfs -text
|
||||
@ -40,6 +40,7 @@
|
||||
inconsolata
|
||||
jq
|
||||
keyutils # for keyctl, used by some bitwarden scripts like qute-bitwarden
|
||||
krita
|
||||
libreoffice
|
||||
logseq
|
||||
mupdf
|
||||
@ -61,6 +62,7 @@
|
||||
tree
|
||||
unzip
|
||||
xclip
|
||||
xournal
|
||||
xpra
|
||||
zathura
|
||||
zoom-us
|
||||
@ -357,5 +359,9 @@
|
||||
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
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,11 @@
|
||||
inputs,
|
||||
sops,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
let
|
||||
xp_pen_pentablet = pkgs.callPackage ./xp_pen_pentablet.nix {};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
@ -53,9 +57,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
networking.hostName = "buck"; # Define your hostname.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
networking.wireless = {
|
||||
networking = {
|
||||
hostName = "buck"; # Define your hostname.
|
||||
enableIPv6 = true;
|
||||
wireless = {
|
||||
enable = true;
|
||||
userControlled.enable = true;
|
||||
environmentFile = "/run/secrets/wifi/env";
|
||||
@ -65,6 +70,7 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
@ -85,8 +91,11 @@
|
||||
# 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
|
||||
@ -97,6 +106,8 @@
|
||||
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:
|
||||
@ -108,16 +119,26 @@
|
||||
# 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.users.jacob = {
|
||||
users = {
|
||||
groups.plugdev = {};
|
||||
users.jacob = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "video" "wheel" ]; # Enable ‘sudo’ for the user.
|
||||
extraGroups = [ "audio" "jackaudio" "plugdev" "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]
|
||||
@ -134,12 +155,10 @@
|
||||
openssh.enable = true;
|
||||
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
enable = false;
|
||||
alsa.enable = false;
|
||||
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)
|
||||
@ -154,12 +173,22 @@
|
||||
|
||||
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 = {
|
||||
@ -178,6 +207,7 @@
|
||||
disableWhileTyping = true;
|
||||
};
|
||||
};
|
||||
#wacom.enable = true;
|
||||
windowManager.i3 = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
|
||||
@ -42,8 +42,14 @@
|
||||
# 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;
|
||||
#};
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
, lib
|
||||
, fetchurl
|
||||
, glib
|
||||
, dbus_libs
|
||||
, dbus
|
||||
, dpkg
|
||||
, autoPatchelfHook
|
||||
, writeShellScript
|
||||
@ -44,7 +44,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xp_pen_driver";
|
||||
version = "3.2.0.210804-1";
|
||||
version = "3.3.9.230222-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_libs
|
||||
dbus
|
||||
fontconfig
|
||||
glib
|
||||
freetype
|
||||
@ -81,6 +81,7 @@ 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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user