summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
Diffstat (limited to 'nix')
-rw-r--r--nix/audio.nix2
-rw-r--r--nix/gaming.nix2
-rw-r--r--nix/programs/sway.nix1
-rw-r--r--nix/programs/zsh.nix1
-rw-r--r--nix/system.nix3
-rw-r--r--nix/user.nix3
-rw-r--r--nix/utils.nix2
7 files changed, 9 insertions, 5 deletions
diff --git a/nix/audio.nix b/nix/audio.nix
index 8eaebe3..6e4635a 100644
--- a/nix/audio.nix
+++ b/nix/audio.nix
@@ -104,8 +104,8 @@
};
};
environment.systemPackages = with pkgs; [
- pavucontrol
pipewire.jack
+ (pavucontrol.override { withLibcanberra = false; })
];
security.rtkit.enable = true;
environment.etc = {
diff --git a/nix/gaming.nix b/nix/gaming.nix
index 2ceebd4..9d79999 100644
--- a/nix/gaming.nix
+++ b/nix/gaming.nix
@@ -14,7 +14,7 @@ in {
prismlauncher
jdk23
retroarch
- #dolphin-emu
+ dolphin-emu
#pcsx2
(ppsspp.override { enableQt = true; })
#cemu
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index 22c6873..38bc4ac 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -267,6 +267,7 @@ in {
{ command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = ".gamescope-wrapped"; }
{ command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.app_id = "osu!"; }
{ command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = "cs2"; }
+ { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = "Minecraft*"; }
#{ command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.title = "Overwatch"; }
{ command = "inhibit_idle fullscreen"; criteria.class = "Ryujinx"; }
{ command = "inhibit_idle fullscreen"; criteria.app_id = "org.yuzu_emu.yuzu"; }
diff --git a/nix/programs/zsh.nix b/nix/programs/zsh.nix
index 3ea1ee5..1e5dcd6 100644
--- a/nix/programs/zsh.nix
+++ b/nix/programs/zsh.nix
@@ -23,6 +23,7 @@ in {
pgrep = "pgrep -f";
make = "make -j6";
diff = "diff -u";
+ gdb = "gdb -q";
mail = "neomutt";
iroha = "ssh andrew@iroha";
moyo = "ssh andrew@moyo";
diff --git a/nix/system.nix b/nix/system.nix
index dca4371..b72a7db 100644
--- a/nix/system.nix
+++ b/nix/system.nix
@@ -74,7 +74,8 @@
nixpkgs.config.allowUnfree = true;
hardware.enableRedistributableFirmware = true;
- virtualisation.libvirtd.enable = false;
+ virtualisation.libvirtd.enable = true;
+ programs.virt-manager.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
hardware.graphics = {
diff --git a/nix/user.nix b/nix/user.nix
index 69d31f7..9947933 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -4,7 +4,7 @@ in {
users.users.andrew = {
isNormalUser = true;
uid = 1000;
- extraGroups = [ "wheel" "input" "audio" "video" "render" "disk" "cdrom" ];
+ extraGroups = [ "wheel" "input" "audio" "video" "render" "disk" "cdrom" "libvirtd" ];
};
nix.settings.trusted-users = [ "andrew" ];
@@ -77,6 +77,7 @@ in {
dos2unix
curl
socat
+ libuchardet
(unzip.override { enableNLS = true; })
unrar
p7zip
diff --git a/nix/utils.nix b/nix/utils.nix
index d0ed577..ff609a6 100644
--- a/nix/utils.nix
+++ b/nix/utils.nix
@@ -1,6 +1,6 @@
{
disks = {
- nfs_options = [ "rw" "bg" "hard" "rsize=32768" "wsize=32768" "tcp" "timeo=600" "nfsvers=4.1" "x-systemd.automount" "noauto" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
+ nfs_options = [ "noatime" "nodiratime" "rw" "bg" "hard" "intr" "rsize=65536" "wsize=65536" "tcp" "timeo=600" "nfsvers=4.1" "x-systemd.automount" "noauto" "x-systemd.idle-timeout=60" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
hdd_options = [ "noatime" ];
cdrom_options = [ "ro" "user" "noauto" "unhide" ];
ntfs_options = [ "uid=1000" "gid=100" "rw" "user" "exec" "umask=000" ];