diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index e64e83e..a4b14cb 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -28,6 +28,12 @@ allowUnfree = true; }; }; + services.udev.extraRules = '' + KERNEL=="hidraw*", ATTRS{idVendor}=="057e", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*057e:*", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess" + ''; environment.systemPackages = with pkgs; [ @@ -39,6 +45,9 @@ # System tools aha + ttf-ms-win10 + wineWowPackages.stable + bottles #bcachefs-tools clinfo comma @@ -96,6 +105,8 @@ # Can be used to install latest version of some packages # ]) ; + + fonts.packages = [pkgs.ttf-ms-win10]; sops = { secrets."nextcloud-password" = { mode = "0600"; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b88a5e5..d1ef6b8 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -26,6 +26,14 @@ environment.systemPackages = with pkgs; [ ]; + programs.virt-manager.enable = true; + + users.groups.libvirtd.members = ["lillian"]; + + virtualisation.libvirtd.enable = true; + + virtualisation.spiceUSBRedirection.enable = true; + services.vpn-ip = { ip = "3"; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index a9ed6e9..250ef4c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -52,6 +52,11 @@ kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; plymouth.enable = true; }; + services.udev.extraRules = '' + KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess" + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2dc8", MODE="0666" + ''; zramSwap.enable = false; networking = { domain = ""; @@ -148,6 +153,8 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji qjackctl + ttf-ms-win10 + bottles # jellyfin-media-player #rustdesk @@ -224,6 +231,7 @@ enableAutoMountUdevRules = true; }; }; + fonts.packages = [pkgs.ttf-ms-win10]; programs = { steam = lib.mkForce { enable = true; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 2f18fc2..faedbcc 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -236,6 +236,7 @@ environment = { systemPackages = with pkgs; [ nix-output-monitor + usbutils ]; # Enable completion of system packages by zsh diff --git a/pkgs/default.nix b/pkgs/default.nix index 4a754ee..c979e58 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -15,4 +15,5 @@ pkgs: { auto-mount = pkgs.callPackage ./auto-mount {}; simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; freetube-0236 = pkgs.callPackage ./freetube-0.23.6 {}; + ttf-ms-win10 = pkgs.callPackage ./ttf-ms-win10 {}; } diff --git a/pkgs/ttf-ms-win10/default.nix b/pkgs/ttf-ms-win10/default.nix new file mode 100644 index 0000000..17a5407 --- /dev/null +++ b/pkgs/ttf-ms-win10/default.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: +stdenvNoCC.mkDerivation rec { + pname = "ttf-ms-win10"; + version = "1.0"; + + src = fetchzip { + url = "https://github.com/streetsamurai00mi/ttf-ms-win10/archive/refs/heads/build.zip"; + hash = "sha256-UwkHlrSRaXhfoMlimyXFETV9yq1SbvUXykrhigf+wP8="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/streetsamurai00mi/ttf-ms-win10"; + description = "Windows 10 ttf Fonts"; + license = licenses.unfree; + maintainers = []; + }; +}