tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Merge branch 'zenix/master' into nixbook/cosmic

Browse source
This commit is contained in:
tristan 2025-01-16 11:47:33 +00:00
commit 270cfdc8d7
8 changed files with 86 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.rgignore
View file

@ -1,2 +1,3 @@
lib/words.txt lib/words.txt
lib/emotes.txt
flake.lock flake.lock

72
flake.lock generated
View file

@ -226,11 +226,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734279981, "lastModified": 1734425854,
"narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -343,11 +343,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734344598, "lastModified": 1734808199,
"narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "narHash": "sha256-MxlUcLjE8xLbrI1SJ2B2jftlg4wdutEILa3fgqwA98I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "83ecd50915a09dca928971139d3a102377a8d242", "rev": "f342df3ad938f205a913973b832f52c12546aac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734093295, "lastModified": 1734622215,
"narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -474,11 +474,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1734404414, "lastModified": 1734745015,
"narHash": "sha256-c/7bsbMcVMb8c4wiLA142ZQfL08U8qYJROGf9NCkfQE=", "narHash": "sha256-HGl0yR/qfGTO99NfiB5bqTe2nPKmD57opzB/TwhJSW0=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "a364e6a5e9eb93253daf93c747b150e31e09b13c", "rev": "1c922245aec471610533c7a225bf9c20e7002ff2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -505,11 +505,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1734083684, "lastModified": 1734600368,
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +521,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1734202038, "lastModified": 1734529975,
"narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -568,11 +568,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1734119587, "lastModified": 1734424634,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -629,11 +629,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1734412481, "lastModified": 1734798432,
"narHash": "sha256-U2CM2IisVgI+iKjkBw0KglyP7DwCIUwTBaz2bhMcTak=", "narHash": "sha256-JVU+WjrRZUJnUKQ/iXP9O8eQ0L3YkqV1DpFMS4kLZog=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "30895485c3a31bb16ace513def4f3a36bfeb68c6", "rev": "6a4b4221c4ebf1140f73f8df769e97f1828d90fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -689,11 +689,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734316514, "lastModified": 1734661750,
"narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=", "narHash": "sha256-BI58NBdimxu1lnpOrG9XxBz7Cwqy+qIf99zunWofX5w=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "83ee8ff74d6294a7657320f16814754c4594127b", "rev": "7d3d910d5fd575e6e8c5600d83d54e5c47273bfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -707,11 +707,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1733965552, "lastModified": 1734546875,
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,11 +737,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1734110168, "lastModified": 1734531336,
"narHash": "sha256-Q0eeLYn45ErXlqGQyXmLLHGe1mqnUiK0Y9wZRa1SNFI=", "narHash": "sha256-BWwJTAiWmZudUdUbyets7e3zQfjvZYtkU51blBnUBjw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a9e3779949925ef22f5a215c5f49cf520dea30b1", "rev": "a2d66f25478103ac9b4adc6d6713794f7005221e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,11 +838,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733761991, "lastModified": 1734704479,
"narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/desktop/hyprland/default.nix
View file

@ -282,5 +282,5 @@ in {
systemd.target = "hyprland-session.target"; 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"];
} }

7
home/programs/gamer.nix
View file

@ -12,15 +12,10 @@
gamescope gamescope
gamemode gamemode
mangohud mangohud
BeatSaberModManager # BeatSaberModManager - out of date: https://github.com/NixOS/nixpkgs/pull/339370
protontricks protontricks
protonup-qt protonup-qt
oversteer oversteer
xboxdrv xboxdrv
# VR
# monado -- build is borked /:
openxr-loader
opencomposite
]; ];
} }

2
home/programs/personal/default.nix
View file

@ -32,9 +32,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
godot_4 godot_4
ardour
blender blender
musescore
monero-gui monero-gui
transmission-remote-gtk transmission-remote-gtk
krita krita

48
home/programs/xr.nix
View file

@ -1,30 +1,34 @@
{ {
pkgs, 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" = { home.file.".config/openxr/1/openxr_monado.json" = {
source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
}; };
# home.file.".config/openvr/openvrpaths.vrpath" = { home.file.".config/openvr/openvrpaths.vrpath" = {
# text = '' text = builtins.toJSON {
# { "config" = [
# "config" : "${config.home.homeDirectory}/.local/share/Steam/config"
# [ ];
# "${config.home.homeDirectory}/.local/share/Steam/config" "external_drivers" = null;
# ], "jsonid" = "vrpathreg";
# "external_drivers" : null, "log" = [
# "jsonid" : "vrpathreg", "${config.home.homeDirectory}/.local/share/Steam/logs"
# "log" : ];
# [ "runtime" = [
# "${config.home.homeDirectory}/.local/share/Steam/logs" "${pkgs.opencomposite}/lib/opencomposite"
# ], ];
# "runtime" : "version" = 1;
# [ };
# "${pkgs.opencomposite}/lib/opencomposite" };
# ],
# "version" : 1
# }
# '';
# };
} }

9
nixos/programs/gamer.nix
View file

@ -13,10 +13,6 @@
]; ];
programs.steam = { programs.steam = {
enable = true; enable = true;
extest.enable = true;
extraCompatPackages = with pkgs; [
proton-ge-bin
];
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
gamescopeSession = { gamescopeSession = {
@ -29,9 +25,4 @@
capSysNice = true; capSysNice = true;
}; };
programs.gamemode.enable = true; programs.gamemode.enable = true;
services.monado.enable = true;
systemd.user.services.monado.environment = {
STEAMVR_LH_ENABLE = "true";
XRT_COMPOSITOR_SCALE_PERCENTAGE = "200";
};
} }

23
nixos/services/musnix.nix
View file

@ -1,5 +1,24 @@
{ inputs, user, ... }: { { inputs, user, pkgs, lib, ... }: {
imports = [inputs.musnix.nixosModules.musnix]; imports = [inputs.musnix.nixosModules.musnix];
users.users.${user}.extraGroups = ["audio"]; 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
];
} }