diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 0f45292..82cc7bf 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -184,6 +184,7 @@ programs.steam = { enable = true; localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + extraCompatPackages = with pkgs; [ proton-ge-bin ]; }; #System packages diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 31d757f..e547165 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1729092978, - "narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=", + "lastModified": 1729348269, + "narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e", + "rev": "528723447ef037a1c081add43f4fd46440c9c3b1", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729251725, - "narHash": "sha256-KmIA2i7s3jcVQWgUt6wqY9/5DkIp9uxsVhcwUxSnKHY=", + "lastModified": 1729381852, + "narHash": "sha256-Tl9738VMXlVjv7EVq3znrsodyUy0w1ekD0wsouzDybg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "babe2c97edf3750d3924c1c5eaa1fe94ac94e8d8", + "rev": "75d8eea61e93c46fed1919f9ec798b7911378b22", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 8f81cab..efa9508 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -77,6 +77,15 @@ ]; }; + programs.gamescope = { + enable = true; + capSysNice = true; + }; + programs.steam = { + enable = true; + gamescopeSession.enable = true; + }; + # this is a life saver. # literally no documentation about this anywhere. # might be good to write about this... diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 49f9f6e..c964c67 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729237583, - "narHash": "sha256-DmbzRBqTP+LIzyPkle92bN83GOjO02pPxW0OAL6yTsI=", + "lastModified": 1729334880, + "narHash": "sha256-HUdIqrv4/s0bohHYtCHl44bJwyL1TMN1kzk+93oSAm8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1ca158ad24664a2608d9fe5f6627274bb7c6e939", + "rev": "28881a002ab986bd107c06cdc4b5df98bad29f7f", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729235169, - "narHash": "sha256-SPlS9YtGRWUjZZZRXlimHbSho+0hfrqGycErlI9XVXk=", + "lastModified": 1729330424, + "narHash": "sha256-fEev4uBYKTdFACj3zGmMniNV8IbzfoJ+LqZz2eWQWcw=", "owner": "YaLTeR", "repo": "niri", - "rev": "dd8b2be044c6c67a1c9bf07f287b3967e958b8aa", + "rev": "10f04fd19de3bc2951d42411c237c8b963e6c816", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1729181673, + "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729218602, - "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", + "lastModified": 1729304879, + "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", + "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "zen-browser": { "locked": { - "lastModified": 1729025440, - "narHash": "sha256-DUhI5F7bOf5x5q5dpBdLZOnFNi3My/ucqkJQ5j1FFjg=", + "lastModified": 1729379018, + "narHash": "sha256-lyGz9ul5QzJ40tUNXlHyvVowz3tbCgUPdfoi6ogq+DY=", "owner": "matthewpi", "repo": "nixpkgs", - "rev": "98eabdf0903f10fc768aebcbe356cd1621bcee8b", + "rev": "d607bf5d03a31601893680192c85eec359649ea2", "type": "github" }, "original": { diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index dc8ba6c..4149a6a 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -48,6 +48,8 @@ in gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'"; chess = "${pkgs.chess-tui}/bin/chess-tui -e ${pkgs.stockfish}/bin/stockfish"; + + run-steam = "gamescope --backend sdl -W 2256 -H 1504 -f --steam -- steam -tenfoot -pipewire-dmabuf"; }; shellInit = '' diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index f29ec41..13efc73 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -6,15 +6,6 @@ }: let models = [ - { - name = "Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf"; - context_length = "32768"; - gen_length = "8192"; - source = pkgs.fetchurl { - url = "https://huggingface.co/mradermacher/Rombos-LLM-V2.6-Qwen-14b-GGUF/resolve/main/Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf?download=true"; - sha256 = "InSndYkZx6pZux1SWn/pjQUc0tvUigjsw+JdXc3Dsdg="; - }; - } { name = "Qwen2.5-14B-Instruct-IQ4_XS.gguf"; context_length = "32768"; @@ -24,6 +15,15 @@ let sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } + { + name = "Qwen2.5-32B-Instruct-IQ4_XS.gguf"; + context_length = "32768"; + gen_length = "8192"; + source = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/Qwen2.5-32B-Instruct-GGUF/resolve/main/Qwen2.5-32B-Instruct-IQ4_XS.gguf?download=true"; + sha256 = "iY14/8GApfYc5c0fTABsDO/X5/cxBpnbUbiUTcvzJQ4="; + }; + } ]; gpt4all_package = ( diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 63aec80..15524e3 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -10,8 +10,14 @@ settings = { prefer-no-csd = true; - environment = { - DISPLAY = ":0"; + # environment = { + # DISPLAY = ":0"; + # }; + + outputs = { + "BOE 0x095F Unknown" = { + scale = 1.5; + }; }; spawn-at-startup = [ @@ -29,12 +35,13 @@ ]; } - { - command = [ - "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" - (builtins.toString config.programs.niri.settings.environment.DISPLAY) - ]; - } + # { + # command = [ + # "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" + # # (builtins.toString config.programs.niri.settings.environment.DISPLAY) + # ":0" + # ]; + # } ]; window-rules = [ diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 607261a..d7483cb 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -10,7 +10,6 @@ home.packages = with pkgs; [ protontricks beatsabermodmanager - protonup-qt ]; programs.alacritty.settings = {