lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2024-01-16 21:15:22 -06:00
commit c276247f21
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
4 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
flake.lock
View file

@ -50,11 +50,11 @@
]
},
"locked": {
"lastModified": 1704318910,
"narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=",
"lastModified": 1705075138,
"narHash": "sha256-0slYsXoR1Sd5FwTfFZLYxAsI015+J4lvgvo55u4Gw1A=",
"owner": "nix-community",
"repo": "disko",
"rev": "aef9a509db64a081186af2dc185654d78dc8e344",
"rev": "f78b6498f69e04514cb84393e5daba669198c1c1",
"type": "github"
},
"original": {
@ -120,11 +120,11 @@
},
"hardware": {
"locked": {
"lastModified": 1704458188,
"narHash": "sha256-f6BYEuIqnbrs6J/9m1/1VdkJ6d63hO9kUC09kTPuOqE=",
"lastModified": 1705187059,
"narHash": "sha256-dSj+iIYqLA+7/5rLXWfUxw9IXRm0w8Mrm39af8klUH0=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "172385318068519900a7d71c1024242fa6af75f0",
"rev": "ef811636cc847355688804593282078bac7758d4",
"type": "github"
},
"original": {
@ -143,11 +143,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1704401390,
"narHash": "sha256-01Tkq958K2O7H451x8JMEDSGh344iwvhkcYsGVii+8k=",
"lastModified": 1704986785,
"narHash": "sha256-h0/pFRsnFesY+u+0EmeOXcReN8uF6Z3ok+eByZIks8E=",
"owner": "helix-editor",
"repo": "helix",
"rev": "7e389b67c24dfe4466112c988b240c807e7e2414",
"rev": "17dd102e5cccbb2a9a0f0224af63e52f3dab846b",
"type": "github"
},
"original": {
@ -164,11 +164,11 @@
]
},
"locked": {
"lastModified": 1704383912,
"narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=",
"lastModified": 1705169127,
"narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7",
"rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8",
"type": "github"
},
"original": {
@ -189,11 +189,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1704455149,
"narHash": "sha256-9CDCJx9ls1qQ1/uOSUzXgw0smiaEfXz/wnB40r7dYKk=",
"lastModified": 1705070596,
"narHash": "sha256-Xq3JOddIH7AnACEHGaSKg71IF8CATE1zSTzdgR4pnlo=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "d8dbdc4a017e051b3dde2e93791e2495722bfa21",
"rev": "c4da4b026deefd58f532353b64e9f17130e760ca",
"type": "github"
},
"original": {
@ -285,11 +285,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1704194953,
"narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
"lastModified": 1704722960,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
"type": "github"
},
"original": {
@ -363,11 +363,11 @@
]
},
"locked": {
"lastModified": 1703991717,
"narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=",
"lastModified": 1705201153,
"narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6",
"rev": "70dd0d521f7849338e487a219c1a07c429a66d77",
"type": "github"
},
"original": {
@ -384,11 +384,11 @@
"slippi-desktop": "slippi-desktop"
},
"locked": {
"lastModified": 1698159739,
"narHash": "sha256-2oCLXsVQrrkIpp6QSq2uljJHVDkR7TJKTZLn/8uFQHU=",
"lastModified": 1704561657,
"narHash": "sha256-2IOPvEgMW9TlEi74NKRbhtZzY414t77lfHxxl2ixUlM=",
"owner": "lytedev",
"repo": "ssbm-nix",
"rev": "764ed659a34df9696fa8bf413ae66a7f4ae3d9fb",
"rev": "75c62f692154172a9fc4bc4658b7597741a5b49f",
"type": "github"
},
"original": {

2
modules/nixos/common.nix
View file

@ -26,6 +26,8 @@
services.journald.extraConfig = "SystemMaxUse=1G";
home-manager.useGlobalPkgs = true;
environment = {
variables = {
EDITOR = "hx";

3
modules/nixos/melee.nix
View file

@ -1,11 +1,12 @@
{inputs, ...}: {
imports = [
{nixpkgs.overlays = [inputs.ssbm.overlay];}
inputs.ssbm.nixosModule
];
ssbm = {
cache.enable = true;
overlay.enabled = true;
overlay.enable = true;
gcc = {
rules.enable = true;

21
nixos/dragon.nix
View file

@ -1,5 +1,5 @@
{
# config,
config,
flake,
inputs,
outputs,
@ -25,23 +25,26 @@
hyprland
printing
ewwbar
# melee
melee
];
programs.steam.enable = true;
programs.steam.remotePlay.openFirewall = true;
home-manager.users.daniel = {
imports = with outputs.homeManagerModules; [
sway
pass
# melee
melee
# sway-laptop
# hyprland
hyprland
];
# ssbm = {
# slippi-launcher = {
# isoPath = "${config.home.homeDirectory}/../games/roms/dolphin/melee.iso";
# };
# };
ssbm = {
slippi-launcher = {
isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso";
};
};
wayland.windowManager.hyprland = {
settings = {