PC-Fixe: update config

This commit is contained in:
nyanloutre 2020-05-07 12:13:35 +02:00
parent 52e48282b0
commit 9a0b1f679c
4 changed files with 16 additions and 54 deletions

View File

@ -1,18 +0,0 @@
self: super:
{
ledger-udev-rules = super.writeTextFile {
name = "ledger-udev-rules";
text = ''
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="1b7c", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="2b7c", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="3b7c", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="4b7c", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="1807", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="1808", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0000", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0001", MODE="0660", TAG+="uaccess", TAG+="udev-acl", GROUP="users"
'';
destination = "/etc/udev/rules.d/99-ledger.rules";
};
}

View File

@ -23,6 +23,15 @@
boot.tmpOnTmpfs = true; boot.tmpOnTmpfs = true;
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
boot.kernelPatches = [
{ name = "dirt_rally_2_ffb_fix";
patch = pkgs.fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/patch/?id=09264098ff153f60866039d60b31d39b66f55a31";
sha256 = "17g7zvn46b9252qk4sqd3j73989lr0hkd86zz4bq1c4dhziy219w";
};
}
];
services.zfs = { services.zfs = {
trim.enable = true; trim.enable = true;
autoSnapshot = { autoSnapshot = {
@ -41,9 +50,7 @@
usb-modeswitch-data # Logitech G920 usb-modeswitch-data # Logitech G920
]; ];
# Corsair K70
services.udev.extraRules = '' services.udev.extraRules = ''
SUBSYSTEM=="usb", ATTR{bInterfaceNumber}=="00", ATTRS{idVendor}=="1b1c", ATTRS{idProduct}=="1b09", RUN+="${pkgs.bash}/bin/sh -c '${pkgs.coreutils}/bin/echo -n %k > /sys''${DEVPATH}/driver/unbind'"
ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE="0664", GROUP="dialout" ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE="0664", GROUP="dialout"
''; '';
@ -54,7 +61,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
usb_modeswitch usb_modeswitch
virtmanager
]; ];
programs.wireshark.enable = true; programs.wireshark.enable = true;
@ -83,28 +89,10 @@
services.netdata.enable = true; services.netdata.enable = true;
services.tor.enable = true;
services.tor.client.enable = true;
virtualisation.libvirtd.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.passwordAuthentication = false; services.openssh.passwordAuthentication = false;
services.openssh.forwardX11 = true;
systemd.services.iscsid = {
description = "iscsid daemon";
wantedBy = [ "network-online.target" ];
preStart = "${pkgs.kmod}/bin/modprobe iscsi_tcp";
postStart = ''
${pkgs.openiscsi}/bin/iscsiadm -m discovery -t st -p 10.30.0.1
${pkgs.openiscsi}/bin/iscsiadm -m node -T iqn.2019-11.nyanlout.re:steam -l
'';
serviceConfig = {
ExecStart = "${pkgs.openiscsi}/bin/iscsid -f -c ${pkgs.openiscsi}/etc/iscsi/iscsid.conf -i ${pkgs.openiscsi}/etc/iscsi/initiatorname.iscsi";
KillMode = "process";
Restart = "on-success";
};
};
system.stateVersion = "20.03"; system.stateVersion = "20.03";
} }

View File

@ -61,12 +61,6 @@
options = [ "bind" ]; options = [ "bind" ];
}; };
fileSystems."/mnt/steam-lun" =
{ device = "/dev/disk/by-path/ip-10.30.0.1:3260-iscsi-iqn.2019-11.nyanlout.re:steam-lun-1";
fsType = "ext4";
options = ["x-systemd.automount" "noauto"];
};
fileSystems."/mnt/medias" = fileSystems."/mnt/medias" =
{ device = "10.30.0.1:/mnt/medias"; { device = "10.30.0.1:/mnt/medias";
fsType = "nfs"; fsType = "nfs";

View File

@ -1,10 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
nixpkgs.overlays = [
(import ../overlays/ledger-udev-rules.nix)
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -21,6 +17,7 @@
steam-run steam-run
minecraft minecraft
multimc multimc
lutris
betaflight-configurator betaflight-configurator
@ -59,17 +56,17 @@
}) })
gnome-breeze gnome-breeze
arc-theme
materia-theme
libreoffice libreoffice
gimp gimp
inkscape
imagemagick imagemagick
obs-studio obs-studio
vlc vlc
kodiPlain
mpv mpv
jftui
calibre
glxinfo glxinfo
i7z i7z
@ -77,10 +74,11 @@
]; ];
i18n = { i18n = {
consoleKeyMap = "fr";
defaultLocale = "fr_FR.UTF-8"; defaultLocale = "fr_FR.UTF-8";
}; };
console.keyMap = "fr";
hardware = { hardware = {
opengl.driSupport32Bit = true; opengl.driSupport32Bit = true;
pulseaudio.support32Bit = true; pulseaudio.support32Bit = true;