diff --git a/flake.lock b/flake.lock index c1f0b11..912c04c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1771610171, - "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=", + "lastModified": 1769428758, + "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d", + "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771866714, - "narHash": "sha256-BAOap+1I+TKM+VTY3nVwvGMHy7lDV9nWPSiWoWPor4Y=", + "lastModified": 1770136180, + "narHash": "sha256-k+5SCnjvUk8Kkl8+eTKxd/ur7ngYFwEZsdhlixOJ0kc=", "owner": "Saghen", "repo": "blink.cmp", - "rev": "b650e976a927be6b46487a0a610b75af111376c5", + "rev": "22cbfef275b6f76c6c55e9ef9ed8bb8b6f8bb894", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1772218752, - "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=", + "lastModified": 1769978395, + "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9", + "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1770511807, - "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", + "lastModified": 1769284023, + "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7c75487edd43a71b61adb01cae8326d277aab683", + "rev": "13c536659d46893596412d180449353a900a1d31", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1772215399, - "narHash": "sha256-iD/OJ5f7cyYluA0aQgTPTYuY0l12oF/mowyzcR8IQOY=", + "lastModified": 1770151481, + "narHash": "sha256-yMq5Rs6ldsMBfhunttmtfJBcIx6w2u54TiLKalVgSGU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0002f148c9a4fe421a9d33c0faa5528cdc411e62", + "rev": "cd7bdc7a43542370b5f57b97b25302a24abce126", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1771866172, - "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", + "lastModified": 1767983607, + "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", + "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1771271487, - "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1770501770, - "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1771606233, - "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", + "lastModified": 1769202094, + "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", + "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c", "type": "github" }, "original": { @@ -590,11 +590,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { @@ -630,11 +630,11 @@ ] }, "locked": { - "lastModified": 1771858127, - "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "type": "github" }, "original": { @@ -679,11 +679,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771737804, - "narHash": "sha256-7wn9qbzIQQgH8tnq4VwzuWEqEWpekuymlLyhY3vM/j8=", + "lastModified": 1769986820, + "narHash": "sha256-O9OQ44dk9TJdtRIG828DUI54XdkfZET7AlN1RgTsPis=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "6dd43010ac2458cc56a6ac5250349b9217a7a2ae", + "rev": "68de6434cfaa8983f3775b858b8b76e7c5dbd29c", "type": "github" }, "original": { diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 17e4780..d0ff488 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -60,7 +60,7 @@ in withNodeJs = true; withPython3 = true; - initLua = builtins.readFile ./init.lua; + extraLuaConfig = builtins.readFile ./init.lua; extraPackages = with pkgs; diff --git a/shared/home-manager/common.nix b/shared/home-manager/common.nix index 181e550..b9b1d88 100644 --- a/shared/home-manager/common.nix +++ b/shared/home-manager/common.nix @@ -93,7 +93,7 @@ zathura # Personal utilities - # anki # FIXME: Broken + anki ledger vesktop diff --git a/shared/home-manager/gaming.nix b/shared/home-manager/gaming.nix index 2fe4ca7..de13c6a 100644 --- a/shared/home-manager/gaming.nix +++ b/shared/home-manager/gaming.nix @@ -28,7 +28,7 @@ protontricks r2modman self.packages.${pkgs.stdenv.hostPlatform.system}.deadlock-api-ingest - wineWow64Packages.stableFull + wineWowPackages.stableFull winetricks # Games diff --git a/shared/home-manager/scripts/games/launch.sh b/shared/home-manager/scripts/games/launch.sh index f5a7af0..0754dfa 100755 --- a/shared/home-manager/scripts/games/launch.sh +++ b/shared/home-manager/scripts/games/launch.sh @@ -4,10 +4,4 @@ # but there might be useful ones in the future. # https://docs.mesa3d.org/envvars.html - -export ENABLE_LAYER_MESA_ANTI_LAG=1 -export PROTON_ENABLE_WAYLAND=1 -export PROTON_USE_NTSYNC=1 -export WAYLANDDRV_PRIMARY_MONITOR=DP-2 - obs-gamecapture mangohud gamemoderun "$@" diff --git a/shared/home-manager/scripts/games/launch_nontsync.sh b/shared/home-manager/scripts/games/launch_nontsync.sh deleted file mode 100755 index dc7c15d..0000000 --- a/shared/home-manager/scripts/games/launch_nontsync.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# This script is to disable ntsync in case -# it brings up problems. - -PROTON_NO_ESYNC=0 -PROTON_NO_FSYNC=0 -PROTON_USE_NTSYNC=0 - -~/.local/share/scripts/games/launch.sh "$@" diff --git a/shared/home-manager/scripts/games/launch_nowayland.sh b/shared/home-manager/scripts/games/launch_nowayland.sh deleted file mode 100755 index 3f98a09..0000000 --- a/shared/home-manager/scripts/games/launch_nowayland.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# This script is just to disable wayland support -# in case I need Steam Overlay or Steam Input in that game. - -PROTON_ENABLE_WAYLAND=0 - -~/.local/share/scripts/games/launch.sh "$@" diff --git a/shared/nixos/common.nix b/shared/nixos/common.nix index 703d622..f03844d 100644 --- a/shared/nixos/common.nix +++ b/shared/nixos/common.nix @@ -7,15 +7,6 @@ "flakes" ]; - nixpkgs.overlays = [ - # HACK: lager needs updating https://github.com/NixOS/nixpkgs/issues/493431 - (final: prev: { - lager = prev.lager.override { - boost = final.boost188; - }; - }) - ]; - # Optimize storage nix.optimise.automatic = true; nix.settings.auto-optimise-store = true; diff --git a/shared/nixos/system.nix b/shared/nixos/system.nix index 9d3897d..8f22fe5 100644 --- a/shared/nixos/system.nix +++ b/shared/nixos/system.nix @@ -2,10 +2,9 @@ { # Kernel - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_zen; - boot.kernelModules = [ - "ntsync" + boot.initrd.kernelModules = [ "v4l2loopback" "zenergy" ];