From 1ff4cc4b4a29df994586f9b20e2854eecdbbab9c Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Wed, 2 Nov 2022 01:53:51 -0400 Subject: [PATCH] Install swaytoggler script --- flake.lock | 106 +++++++++++++++++++++++++- flake.nix | 3 +- home-manager/linux/programs/games.nix | 10 ++- 3 files changed, 113 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 31944db..a05219a 100644 --- a/flake.lock +++ b/flake.lock @@ -141,6 +141,36 @@ } }, "flake-utils_4": { + "locked": { + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -455,6 +485,38 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1667292599, + "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1667085676, + "narHash": "sha256-jPHYYoSdrV3ypWG4oi9SUeI2MU6dLjxM88+9io5Rrx0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e6e6bad81b7e11f37d893ef39712ce8918ae2338", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "prismlauncher": { "inputs": { "flake-compat": "flake-compat", @@ -516,6 +578,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "prismlauncher": "prismlauncher", "quilt-server": "quilt-server", + "scripts": "scripts", "sops-nix": "sops-nix", "wsl": "wsl" } @@ -537,6 +600,27 @@ "type": "github" } }, + "scripts": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_2", + "swaywm-toggler": "swaywm-toggler" + }, + "locked": { + "lastModified": 1667367911, + "narHash": "sha256-3kwY6oJRiMFU+YSONaquiYv1QRMkpcD5NYLK5KNHkyo=", + "ref": "trunk", + "rev": "3c83d9f0876a90a561868560e68cdf5baa2dbc2b", + "revCount": 1, + "type": "git", + "url": "https://git.sr.ht/~thatonelutenist/Scripts" + }, + "original": { + "ref": "trunk", + "type": "git", + "url": "https://git.sr.ht/~thatonelutenist/Scripts" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -558,6 +642,26 @@ "type": "github" } }, + "swaywm-toggler": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1667366374, + "narHash": "sha256-bY+KMgyRChGc8qCxB0QNbMbfM+sY09m266kNDci9lZE=", + "ref": "trunk", + "rev": "2bb53d831b3c26663347a39c5f9da63932b606da", + "revCount": 7, + "type": "git", + "url": "https://git.sr.ht/~thatonelutenist/SwaywmToggler" + }, + "original": { + "ref": "trunk", + "type": "git", + "url": "https://git.sr.ht/~thatonelutenist/SwaywmToggler" + } + }, "tomlplusplus": { "flake": false, "locked": { @@ -622,7 +726,7 @@ "wsl": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index b385e99..fb6f8a3 100644 --- a/flake.nix +++ b/flake.nix @@ -64,12 +64,13 @@ url = "github:idris-lang/idris2"; inputs.nixpkgs.follows = "nixpkgs"; }; + scripts.url = "git+https://git.sr.ht/~thatonelutenist/Scripts?ref=trunk"; }; outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixos-hardware , fenix, emacs, sops-nix, home-manager, darwin, prismlauncher, java , quilt-server, nixos-generators, wsl, gamescope, nix-on-droid, idris2 - }@inputs: + , scripts }@inputs: let makeNixosSystem = { system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }: diff --git a/home-manager/linux/programs/games.nix b/home-manager/linux/programs/games.nix index 6878670..47f95d1 100644 --- a/home-manager/linux/programs/games.nix +++ b/home-manager/linux/programs/games.nix @@ -1,11 +1,13 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: with lib; { config = mkMerge [ - # eidolon game launcher + # Scripts for launching games (mkIf config.nathan.programs.games.launcher { - # Install the launcher - home.packages = with pkgs; [ eidolon ]; + # Install our scripts + + home.packages = let scripts = inputs.scripts.packages.${pkgs.system}; + in with pkgs; [ scripts.swaywm-toggler ]; }) ]; }