Merge remote-tracking branch 'origin/main'

This commit is contained in:
Daniel Flanagan 2023-10-20 16:26:15 -05:00
commit 4ba81018a0
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
8 changed files with 36 additions and 62 deletions

View file

@ -223,40 +223,6 @@
"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_8"
},
"locked": {
"lastModified": 1609520816,
"narHash": "sha256-IGO7tfJXsv9u2wpW76VCzOsHYapRZqH9pHGVsoffPrI=",
"owner": "NixOS",
"repo": "nix",
"rev": "8a2ce0f455da32bc20978e68c0aad9efb4560abc",
"type": "github"
},
"original": {
"id": "nix",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1697456312,
@ -386,21 +352,6 @@
}
},
"nixpkgs_8": {
"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_9": {
"locked": {
"lastModified": 1692447944,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
@ -491,20 +442,19 @@
},
"ssbm": {
"inputs": {
"nix": "nix",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_8",
"slippi-desktop": "slippi-desktop"
},
"locked": {
"lastModified": 1696638790,
"narHash": "sha256-fmpFkchuAyQfaSOWqEMnw4wRxWFkD7LqBwjKcVog8xQ=",
"owner": "djanatyn",
"lastModified": 1697581527,
"narHash": "sha256-sw4K8A9Wy6V4y54TlNjpsY4l11fxrEFHXrYq3NXoZcc=",
"owner": "lytedev",
"repo": "ssbm-nix",
"rev": "cfeb1874b437e5883272c522234d1d15cb3d3ebd",
"rev": "abc984d77bb41b6358f84a78b29694445d77d1d2",
"type": "github"
},
"original": {
"owner": "djanatyn",
"owner": "lytedev",
"repo": "ssbm-nix",
"type": "github"
}

View file

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

View file

@ -0,0 +1,6 @@
{
services.kdeconnect = {
enable = true;
indicator = true;
};
}

View file

@ -21,9 +21,4 @@
};
};
};
services.kdeconnect = {
enable = true;
indicator = true;
};
}

View file

@ -19,6 +19,7 @@
ssbm = {
slippi-launcher = {
enable = true;
launchMeleeOnPlay = false;
};
};
}

View file

@ -12,4 +12,5 @@
sway = import ./sway.nix;
user-installed-applications = import ./user-installed-applications.nix;
wifi = import ./wifi.nix;
kde-connect = import ./kde-connect.nix;
}

View file

@ -11,6 +11,7 @@
# ./plasma.nix
# ./gnome.nix
./user-installed-applications.nix
./kde-connect.nix
];
nixpkgs.overlays = [outputs.overlays.modifications];

View file

@ -0,0 +1,20 @@
{
programs.kdeconnect = {
enable = true;
};
networking.firewall = {
allowedTCPPortRanges = [
{
from = 1714;
to = 1764;
}
];
allowedUDPPortRanges = [
{
from = 1714;
to = 1764;
}
];
};
}