From 074a3eda14a4cf2032c114e061b45166a17fcfbb Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sun, 17 Nov 2024 21:27:35 -0500 Subject: Increase NFS r/wsize, enable libvirtd --- files/nvim/init.vim | 4 +-- flake.lock | 74 ++++++++++++++++++++--------------------- hosts/iroha/scripts/mount-nfs | 2 +- hosts/sofue/configuration.nix | 2 +- hosts/soy/Scripts/mount-code.sh | 2 +- nix/audio.nix | 2 +- nix/gaming.nix | 2 +- nix/programs/sway.nix | 1 + nix/programs/zsh.nix | 1 + nix/system.nix | 3 +- nix/user.nix | 3 +- nix/utils.nix | 2 +- scripts/mount-nfs | 2 +- themes/ideas.txt | 4 +++ themes/zelda_summer/sources.txt | 4 +++ 15 files changed, 60 insertions(+), 48 deletions(-) create mode 100644 themes/ideas.txt create mode 100644 themes/zelda_summer/sources.txt diff --git a/files/nvim/init.vim b/files/nvim/init.vim index fe40153..51ddbe4 100644 --- a/files/nvim/init.vim +++ b/files/nvim/init.vim @@ -235,9 +235,9 @@ vim.keymap.set('n', 'J', '', { silent = true }) vim.keymap.set('n', 'K', '', { silent = true }) vim.keymap.set('n', 'L', '', { silent = true }) -- Normal mode tab no-op. -vim.keymap.set('n', '', [[]], { silent = true }) +vim.keymap.set('n', '', '', { silent = true }) -- Disable q: for histroy. -vim.keymap.set('n', 'q:', [[]], { silent = true }) +vim.keymap.set('n', 'q:', '', { silent = true }) -- Simplify split movement. vim.keymap.set('n', '', [[:wincmd h]], { silent = true }) vim.keymap.set('n', '', [[:wincmd j]], { silent = true }) diff --git a/flake.lock b/flake.lock index aeffb27..a7a8437 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1731455157, - "narHash": "sha256-wvJANj/uqb0faYvdll+boJ2unDEfzAT/bvg131Mw0Hw=", + "lastModified": 1731866540, + "narHash": "sha256-wAz/S5GLm+9Vp0kmUPsva3Mxp+VUnbEUZ8aBM1aEhhY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9dd4ee2b46644cc736c789bcfbf8f904ecbf3529", + "rev": "0857914b69d90ba758e614298452636c6fdc9c7c", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731887066, + "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1731240728, - "narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=", + "lastModified": 1731845570, + "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "807ab623e6d01e931269a28a07c59dcfd6474173", + "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731250407, - "narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=", + "lastModified": 1731682758, + "narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "96902c4573cd03ea7e533634cb49861148f49a7a", + "rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -318,11 +318,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1731200463, - "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=", + "lastModified": 1731805462, + "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e04234d263750db01c78a412690363dc2226e68a", + "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1731435944, - "narHash": "sha256-4pxvlMcGGjW1ZcaoOFuwPJsu3lxYZLcUaOIik5x6LeM=", + "lastModified": 1731878857, + "narHash": "sha256-5Bg6+R6PdBSakjnuqEHrTVIPZ4PjMjHmcSBBieF2kPA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "c7648f36d9ae0d5e38aa0f7417b05e317eb162ba", + "rev": "82cf2241ee012ff5157d72ac055db9cdc67c410b", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nur": { "locked": { - "lastModified": 1731509589, - "narHash": "sha256-ttUjj+kvn2xJpGHRZT2zclb+BVAFAnUZv6wGs9XoUGk=", + "lastModified": 1731891354, + "narHash": "sha256-693/EYlG9GQK4G4HmM2/vJSnjtf1FkOnAxGMpQUf7rw=", "owner": "nix-community", "repo": "NUR", - "rev": "1a1b06c26adeea38215a9955ffd5a9fb677a9b92", + "rev": "9c9b53b1e00af6fa1297e2bf3d757f2589624116", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1731482559, - "narHash": "sha256-anoaUsHmI9b8xRYPzv8XyGLTfiyErtZz2Grrl+37dMQ=", + "lastModified": 1731893168, + "narHash": "sha256-nijDZdYKT9UWF+kMgM3lq1OkbFKvDs6JXKRXI8cpprE=", "ref": "refs/heads/main", - "rev": "223cd9e2a5f62a9eede6ab6695b2e522fcf78301", - "revCount": 835, + "rev": "9f580b251ca66950bb436c09afd2b9585eed74ba", + "revCount": 840, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/hosts/iroha/scripts/mount-nfs b/hosts/iroha/scripts/mount-nfs index c794ee4..7e3b276 100755 --- a/hosts/iroha/scripts/mount-nfs +++ b/hosts/iroha/scripts/mount-nfs @@ -1,2 +1,2 @@ #! /usr/bin/env sh -sudo mount -t nfs4 -o noatime,nodiratime,rw,bg,hard,intr,rsize=16384,wsize=16384,tcp,timeo=600,retrans=2,nfsvers=4.1 moyo:$1 $2 +sudo mount -t nfs4 -o noatime,nodiratime,rw,bg,hard,intr,rsize=65536,wsize=65536,tcp,timeo=600,retrans=2,nfsvers=4.1 moyo:$1 $2 diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix index 68f5feb..b80b8ac 100644 --- a/hosts/sofue/configuration.nix +++ b/hosts/sofue/configuration.nix @@ -217,5 +217,5 @@ in rec { home.stateVersion = "${config.system.stateVersion}"; }; - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; } diff --git a/hosts/soy/Scripts/mount-code.sh b/hosts/soy/Scripts/mount-code.sh index 20a6788..9648342 100755 --- a/hosts/soy/Scripts/mount-code.sh +++ b/hosts/soy/Scripts/mount-code.sh @@ -1,2 +1,2 @@ #! /usr/bin/env sh -sudo mount -t nfs4 -o rw,bg,hard,rsize=32768,wsize=32768,tcp,timeo=600,vers=4.1 192.168.1.206:/home/andrew/c /home/andrew/c +sudo mount -t nfs4 -o rw,bg,hard,rsize=65536,wsize=65536,tcp,timeo=600,vers=4.1 192.168.1.206:/home/andrew/c /home/andrew/c 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" ]; diff --git a/scripts/mount-nfs b/scripts/mount-nfs index c794ee4..7e3b276 100755 --- a/scripts/mount-nfs +++ b/scripts/mount-nfs @@ -1,2 +1,2 @@ #! /usr/bin/env sh -sudo mount -t nfs4 -o noatime,nodiratime,rw,bg,hard,intr,rsize=16384,wsize=16384,tcp,timeo=600,retrans=2,nfsvers=4.1 moyo:$1 $2 +sudo mount -t nfs4 -o noatime,nodiratime,rw,bg,hard,intr,rsize=65536,wsize=65536,tcp,timeo=600,retrans=2,nfsvers=4.1 moyo:$1 $2 diff --git a/themes/ideas.txt b/themes/ideas.txt new file mode 100644 index 0000000..b9eac72 --- /dev/null +++ b/themes/ideas.txt @@ -0,0 +1,4 @@ += Summer 2025 + - pixiv_u_6996493/pixiv_i_68214520_media4.png + +// vim: set syntax=asciidoc: diff --git a/themes/zelda_summer/sources.txt b/themes/zelda_summer/sources.txt new file mode 100644 index 0000000..9557828 --- /dev/null +++ b/themes/zelda_summer/sources.txt @@ -0,0 +1,4 @@ +https://x.com/hatenokatasumi/status/1670230247130923008 +https://ebiebieshrimp.tumblr.com/post/657412550493913088 +https://ebiebieshrimp.fanbox.cc/posts/6921956 +https://www.pixiv.net/en/artworks/120163067 -- cgit v1.2.3-101-g0448