This commit is contained in:
Daniel Flanagan 2023-10-08 02:46:37 -05:00
parent 7b40f8745a
commit 6338112a9d
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
10 changed files with 169 additions and 11 deletions

View file

@ -223,6 +223,40 @@
"type": "github" "type": "github"
} }
}, },
"lowdown-src": {
"flake": false,
"locked": {
"lastModified": 1598695561,
"narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"repo": "lowdown",
"type": "github"
}
},
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1609520816,
"narHash": "sha256-IGO7tfJXsv9u2wpW76VCzOsHYapRZqH9pHGVsoffPrI=",
"owner": "NixOS",
"repo": "nix",
"rev": "8a2ce0f455da32bc20978e68c0aad9efb4560abc",
"type": "github"
},
"original": {
"id": "nix",
"type": "indirect"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1690026219, "lastModified": 1690026219,
@ -367,6 +401,37 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1602702596,
"narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad0d20345219790533ebe06571f82ed6b034db31",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-20.09-small",
"type": "indirect"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1692447944,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"api-lyte-dev": "api-lyte-dev", "api-lyte-dev": "api-lyte-dev",
@ -377,7 +442,8 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix",
"ssbm": "ssbm"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -405,6 +471,22 @@
"type": "github" "type": "github"
} }
}, },
"slippi-desktop": {
"flake": false,
"locked": {
"lastModified": 1607036060,
"narHash": "sha256-TUYsiVvKAws3N3roZYDwkLB0obyl6zwvh8CAk2RwHrY=",
"owner": "project-slippi",
"repo": "slippi-desktop-app",
"rev": "3ca39ba6bbd02157515b12a79aa01e5d669ad1b1",
"type": "github"
},
"original": {
"owner": "project-slippi",
"repo": "slippi-desktop-app",
"type": "github"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
@ -424,6 +506,26 @@
"type": "github" "type": "github"
} }
}, },
"ssbm": {
"inputs": {
"nix": "nix",
"nixpkgs": "nixpkgs_8",
"slippi-desktop": "slippi-desktop"
},
"locked": {
"lastModified": 1696638790,
"narHash": "sha256-fmpFkchuAyQfaSOWqEMnw4wRxWFkD7LqBwjKcVog8xQ=",
"owner": "djanatyn",
"repo": "ssbm-nix",
"rev": "cfeb1874b437e5883272c522234d1d15cb3d3ebd",
"type": "github"
},
"original": {
"owner": "djanatyn",
"repo": "ssbm-nix",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View file

@ -11,7 +11,7 @@
api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"; api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git";
# TODO: ssbm.url = "github:djanatyn/ssbm-nix"; ssbm.url = "github:djanatyn/ssbm-nix";
# need to bump ishiiruka upstream I think # need to bump ishiiruka upstream I think
# slippi-desktop.url = "github:project-slippi/slippi-desktop-app"; # slippi-desktop.url = "github:project-slippi/slippi-desktop-app";

View file

@ -4,6 +4,7 @@
# List your module files here # List your module files here
# my-module = import ./my-module.nix; # my-module = import ./my-module.nix;
common = import ./common.nix; common = import ./common.nix;
melee = import ./melee.nix;
linux = import ./linux.nix; linux = import ./linux.nix;
macos = import ./macos.nix; macos = import ./macos.nix;
iex = import ./iex.nix; iex = import ./iex.nix;

View file

@ -1,9 +1,11 @@
{ {
config,
lib, lib,
outputs, outputs,
... ...
}: { }: {
imports = with outputs.homeManagerModules; [ imports = with outputs.homeManagerModules; [
melee
sway sway
]; ];
@ -41,4 +43,10 @@
); );
}; };
}; };
ssbm = {
slippi-launcher = {
isoPath = "${config.home.homeDirectory}/../games/roms/dolphin/melee.iso";
};
};
} }

View file

@ -0,0 +1,24 @@
{
# flake,
inputs,
# outputs,
# lib,
# config,
# pkgs,
# system,
# modulesPath,
...
}: {
imports = [
{
nixpkgs.overlays = [inputs.ssbm.overlay];
}
inputs.ssbm.homeManagerModule
];
ssbm = {
slippi-launcher = {
enable = true;
};
};
}

View file

@ -180,6 +180,18 @@
"h.lyte.dev:HeVWtne31ZG8iMf+c15VY3/Mky/4ufXlfTpT8+4Xbs0=" "h.lyte.dev:HeVWtne31ZG8iMf+c15VY3/Mky/4ufXlfTpT8+4Xbs0="
]; ];
}; };
registry = {
self.flake = inputs.self;
nixpkgs = {
from = {
id = "nixpkgs";
type = "indirect";
};
flake = inputs.nixpkgs-unstable;
};
};
}; };
nixpkgs = { nixpkgs = {

View file

@ -6,6 +6,7 @@
desktop-usage = import ./desktop-usage.nix; desktop-usage = import ./desktop-usage.nix;
intel = import ./intel.nix; intel = import ./intel.nix;
pipewire = import ./pipewire.nix; pipewire = import ./pipewire.nix;
pipewire-low-latency = import ./pipewire-low-latency.nix;
podman = import ./podman.nix; podman = import ./podman.nix;
postgres = import ./postgres.nix; postgres = import ./postgres.nix;
sway = import ./sway.nix; sway = import ./sway.nix;

View file

@ -5,19 +5,12 @@
# lib, # lib,
# config, # config,
# pkgs, # pkgs,
system, # system,
# modulesPath, # modulesPath,
... ...
}: { }: {
imports = [inputs.ssbm.nixosModule]; imports = [inputs.ssbm.nixosModule];
environment = {
systemPackages = with inputs.ssbm.packages.${system}; [
slippi-netplay
slippi-playback
];
};
ssbm = { ssbm = {
cache.enable = true; cache.enable = true;

View file

@ -0,0 +1,16 @@
{...}: {
environment.etc = {
"pipewire/pipewire.conf.d/92-low-latency.conf".text = ''
context.properties = {
default.clock.rate = 48000
default.clock.quantum = 128
default.clock.min-quantum = 128
default.clock.max-quantum = 128
}
jack.properties = {
node.latency = 128/48000
}
'';
};
}

View file

@ -17,10 +17,11 @@
flake.diskoConfigurations.standard flake.diskoConfigurations.standard
inputs.hardware.nixosModules.common-cpu-amd inputs.hardware.nixosModules.common-cpu-amd
inputs.hardware.nixosModules.common-pc-ssd inputs.hardware.nixosModules.common-pc-ssd
outputs.nixosModules.pipewire-low-latency
] ]
++ (with outputs.nixosModules; [ ++ (with outputs.nixosModules; [
# If you want to use modules your own flake exports (from modules/nixos): # If you want to use modules your own flake exports (from modules/nixos):
# melee melee
desktop-usage desktop-usage
podman podman
postgres postgres