diff --git a/.rgignore b/.rgignore index 13ba0e2..d9795db 100644 --- a/.rgignore +++ b/.rgignore @@ -1,2 +1,3 @@ lib/words.txt +lib/emotes.txt flake.lock diff --git a/flake.lock b/flake.lock index 928b313..c4745fc 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1734279981, - "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", + "lastModified": 1734425854, + "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", + "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1734808199, + "narHash": "sha256-MxlUcLjE8xLbrI1SJ2B2jftlg4wdutEILa3fgqwA98I=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "f342df3ad938f205a913973b832f52c12546aac6", "type": "github" }, "original": { @@ -365,11 +365,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1734404414, - "narHash": "sha256-c/7bsbMcVMb8c4wiLA142ZQfL08U8qYJROGf9NCkfQE=", + "lastModified": 1734745015, + "narHash": "sha256-HGl0yR/qfGTO99NfiB5bqTe2nPKmD57opzB/TwhJSW0=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "a364e6a5e9eb93253daf93c747b150e31e09b13c", + "rev": "1c922245aec471610533c7a225bf9c20e7002ff2", "type": "github" }, "original": { @@ -505,11 +505,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { @@ -521,11 +521,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1734202038, - "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", + "lastModified": 1734529975, + "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", + "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", "type": "github" }, "original": { @@ -568,11 +568,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -629,11 +629,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734412481, - "narHash": "sha256-U2CM2IisVgI+iKjkBw0KglyP7DwCIUwTBaz2bhMcTak=", + "lastModified": 1734798432, + "narHash": "sha256-JVU+WjrRZUJnUKQ/iXP9O8eQ0L3YkqV1DpFMS4kLZog=", "owner": "nix-community", "repo": "nixvim", - "rev": "30895485c3a31bb16ace513def4f3a36bfeb68c6", + "rev": "6a4b4221c4ebf1140f73f8df769e97f1828d90fa", "type": "github" }, "original": { @@ -689,11 +689,11 @@ ] }, "locked": { - "lastModified": 1734316514, - "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=", + "lastModified": 1734661750, + "narHash": "sha256-BI58NBdimxu1lnpOrG9XxBz7Cwqy+qIf99zunWofX5w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "83ee8ff74d6294a7657320f16814754c4594127b", + "rev": "7d3d910d5fd575e6e8c5600d83d54e5c47273bfe", "type": "github" }, "original": { @@ -707,11 +707,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110168, - "narHash": "sha256-Q0eeLYn45ErXlqGQyXmLLHGe1mqnUiK0Y9wZRa1SNFI=", + "lastModified": 1734531336, + "narHash": "sha256-BWwJTAiWmZudUdUbyets7e3zQfjvZYtkU51blBnUBjw=", "owner": "danth", "repo": "stylix", - "rev": "a9e3779949925ef22f5a215c5f49cf520dea30b1", + "rev": "a2d66f25478103ac9b4adc6d6713794f7005221e", "type": "github" }, "original": { @@ -838,11 +838,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 3b7f364..df36e65 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -282,5 +282,5 @@ in { systemd.target = "hyprland-session.target"; }; - systemd.user.services.hypridle.Install.WantedBy = ["hyprland-session.target"]; + systemd.user.services.hypridle.Install.WantedBy = lib.mkForce ["hyprland-session.target"]; } diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix index 461dc40..74d0e60 100644 --- a/home/programs/gamer.nix +++ b/home/programs/gamer.nix @@ -12,15 +12,10 @@ gamescope gamemode mangohud - BeatSaberModManager + # BeatSaberModManager - out of date: https://github.com/NixOS/nixpkgs/pull/339370 protontricks protonup-qt oversteer xboxdrv - - # VR - # monado -- build is borked /: - openxr-loader - opencomposite ]; } diff --git a/home/programs/personal/default.nix b/home/programs/personal/default.nix index 703a94b..e1ec3a1 100644 --- a/home/programs/personal/default.nix +++ b/home/programs/personal/default.nix @@ -32,9 +32,7 @@ home.packages = with pkgs; [ godot_4 - ardour blender - musescore monero-gui transmission-remote-gtk krita diff --git a/home/programs/xr.nix b/home/programs/xr.nix index d86e6b3..89dd23d 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -1,30 +1,34 @@ { pkgs, - # config, + config, ... }: { + home.packages = with pkgs; [ + openxr-loader + opencomposite + ]; + services.monado.enable = true; + systemd.user.services.monado.environment = { + STEAMVR_LH_ENABLE = "true"; + XRT_COMPOSITOR_SCALE_PERCENTAGE = "200"; + }; home.file.".config/openxr/1/openxr_monado.json" = { source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; }; - # home.file.".config/openvr/openvrpaths.vrpath" = { - # text = '' - # { - # "config" : - # [ - # "${config.home.homeDirectory}/.local/share/Steam/config" - # ], - # "external_drivers" : null, - # "jsonid" : "vrpathreg", - # "log" : - # [ - # "${config.home.homeDirectory}/.local/share/Steam/logs" - # ], - # "runtime" : - # [ - # "${pkgs.opencomposite}/lib/opencomposite" - # ], - # "version" : 1 - # } - # ''; - # }; + home.file.".config/openvr/openvrpaths.vrpath" = { + text = builtins.toJSON { + "config" = [ + "${config.home.homeDirectory}/.local/share/Steam/config" + ]; + "external_drivers" = null; + "jsonid" = "vrpathreg"; + "log" = [ + "${config.home.homeDirectory}/.local/share/Steam/logs" + ]; + "runtime" = [ + "${pkgs.opencomposite}/lib/opencomposite" + ]; + "version" = 1; + }; + }; } diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix index 245761f..96e3a16 100644 --- a/nixos/programs/gamer.nix +++ b/nixos/programs/gamer.nix @@ -13,10 +13,6 @@ ]; programs.steam = { enable = true; - extest.enable = true; - extraCompatPackages = with pkgs; [ - proton-ge-bin - ]; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; gamescopeSession = { @@ -29,9 +25,4 @@ capSysNice = true; }; programs.gamemode.enable = true; - services.monado.enable = true; - systemd.user.services.monado.environment = { - STEAMVR_LH_ENABLE = "true"; - XRT_COMPOSITOR_SCALE_PERCENTAGE = "200"; - }; } diff --git a/nixos/services/musnix.nix b/nixos/services/musnix.nix index ce62cd6..9bbd89d 100644 --- a/nixos/services/musnix.nix +++ b/nixos/services/musnix.nix @@ -1,5 +1,24 @@ -{ inputs, user, ... }: { +{ inputs, user, pkgs, lib, ... }: { imports = [inputs.musnix.nixosModules.musnix]; users.users.${user}.extraGroups = ["audio"]; - musnix.enable = true; + musnix = { + enable = true; + rtcqs.enable = true; + kernel.realtime = true; + }; + environment.systemPackages = with pkgs; [ + ardour + musescore + muse + helm + calf + qjackctl + sfizz + tap-plugins + x42-plugins + x42-gmsynth + carla + drumgizmo + distrho-ports + ]; }