diff --git a/flake.lock b/flake.lock index aacb416..83bc0a8 100644 --- a/flake.lock +++ b/flake.lock @@ -22,40 +22,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_2" - }, - "locked": { - "lastModified": 1609520816, - "narHash": "sha256-IGO7tfJXsv9u2wpW76VCzOsHYapRZqH9pHGVsoffPrI=", - "owner": "NixOS", - "repo": "nix", - "rev": "8a2ce0f455da32bc20978e68c0aad9efb4560abc", - "type": "github" - }, - "original": { - "id": "nix", - "type": "indirect" - } - }, "nixpkgs": { "locked": { "lastModified": 1671722432, @@ -72,37 +38,6 @@ "type": "github" } }, - "nixpkgs_2": { - "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_3": { - "locked": { - "lastModified": 1665259268, - "narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c5924154f000e6306030300592f4282949b2db6c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1671918258, @@ -122,44 +57,7 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nur": "nur", - "ssbm-nix": "ssbm-nix" - } - }, - "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" - } - }, - "ssbm-nix": { - "inputs": { - "nix": "nix", - "nixpkgs": "nixpkgs_3", - "slippi-desktop": "slippi-desktop" - }, - "locked": { - "lastModified": 1671326282, - "narHash": "sha256-opKJWZPTXujtQnjtrkJjnOlp6wv1tJh5N7VIQ+1enNA=", - "owner": "djanatyn", - "repo": "ssbm-nix", - "rev": "99ed772ebd300d7545868f27f39666f2c26d77a0", - "type": "github" - }, - "original": { - "owner": "djanatyn", - "repo": "ssbm-nix", - "type": "github" + "nur": "nur" } }, "utils": { diff --git a/flake.nix b/flake.nix index 2f4044e..cbfe272 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,12 @@ home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = github:nix-community/NUR; - ssbm-nix.url = github:djanatyn/ssbm-nix; }; outputs = { nixpkgs, home-manager, nur, - ssbm-nix, ... }: let system = "x86_64-linux"; @@ -74,7 +72,6 @@ inherit system; modules = [ - ssbm-nix.nixosModule nur.nixosModules.nur ./system/gospel/configuration.nix ./common/yubikey.nix diff --git a/system/gospel/configuration.nix b/system/gospel/configuration.nix index 980589d..cbbd7ff 100644 --- a/system/gospel/configuration.nix +++ b/system/gospel/configuration.nix @@ -72,15 +72,6 @@ shell = pkgs.zsh; }; - ssbm = { - overlay.enable = true; - cache.enable = true; - gcc = { - oc-kmod.enable = true; - rules.enable = true; - }; - }; - programs.sway = { enable = true; wrapperFeatures.gtk = true; # so that gtk works properly @@ -100,9 +91,6 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - slippi-netplay - slippi-playback - vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. wget git