diff --git a/flake.lock b/flake.lock index 919a4499..93432a94 100644 --- a/flake.lock +++ b/flake.lock @@ -186,6 +186,30 @@ "type": "github" } }, + "konawall-rs": { + "inputs": { + "flake-utils": [ + "utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "rust": "rust" + }, + "locked": { + "lastModified": 1690746910, + "narHash": "sha256-ouCKyuyjs9+oSrOpIBlVi6R5LLAu+kBORdEaCuDQxwM=", + "owner": "kittywitch", + "repo": "konawall-rs", + "rev": "17fc3098ffd993e4d1820da72b0866390484161b", + "type": "github" + }, + "original": { + "owner": "kittywitch", + "repo": "konawall-rs", + "type": "github" + } + }, "mach-nix": { "inputs": { "flake-utils": [ @@ -271,18 +295,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689679375, - "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", - "owner": "nixos", + "lastModified": 1683185507, + "narHash": "sha256-Wcj09pigMFgj+0borXeoJvVMwH2Rc4gkSq4BwNq3k7s=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", + "rev": "63464b8c2837ec56e1d610f5bd2a9b8e1f532c07", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-stable": { @@ -301,6 +323,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1689679375, + "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils", @@ -349,10 +387,11 @@ "empty": "empty", "flake-compat": "flake-compat", "home-manager": "home-manager", + "konawall-rs": "konawall-rs", "mach-nix": "mach-nix", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pypi-deps-db": "pypi-deps-db", "scalpel": "scalpel", "sops-nix": "sops-nix", @@ -363,6 +402,24 @@ "wsl": "wsl" } }, + "rust": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1689281833, + "narHash": "sha256-+VQV7vtmrFNl5MEKASZ3Kc/y9J2ljEljbw500g5rb/E=", + "owner": "arcnmx", + "repo": "nixexprs-rust", + "rev": "ec3881a307d3b586b2942af40e7053c8b264300e", + "type": "github" + }, + "original": { + "owner": "arcnmx", + "repo": "nixexprs-rust", + "type": "github" + } + }, "scalpel": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index e18a222e..df749d74 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,14 @@ inputs.std.follows = "std"; inputs.nixpkgs.follows = "nixpkgs"; }; + # konawall-rs + konawall-rs = { + url = "github:kittywitch/konawall-rs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "utils"; + }; + }; # hardware quirks nixos-hardware.url = "github:NixOS/nixos-hardware"; # secrets diff --git a/modules/home/base16.nix b/modules/home/base16.nix index 4ca22da2..3e4a6b88 100644 --- a/modules/home/base16.nix +++ b/modules/home/base16.nix @@ -5,7 +5,7 @@ std, ... }: let - inherit (lib.option) mkOption; + inherit (lib.options) mkOption; inherit (lib.types) attrsOf str enum; inherit (lib.modules) mkIf; inherit (std) string set tuple list; @@ -48,7 +48,7 @@ in { src, }: let variables = pkgs.writeText "base-variables.sass" '' - ${(string.concatSep "\n" (mapToValues (var: con: "\$${var}: ${con}") cfg.sass.variables))} + ${(string.concatSep "\n" (set.mapToValues (var: con: "\$${var}: ${con}") cfg.sass.variables))} ''; source = pkgs.callPackage diff --git a/overlays.nix b/overlays.nix index f11d4f6c..a6e1e653 100644 --- a/overlays.nix +++ b/overlays.nix @@ -3,10 +3,11 @@ tree, ... }: -[ - inputs.deploy-rs.overlay - (import tree.packages.default {inherit inputs tree;}) -] -++ map (path: import "${path}/overlay.nix") [ +map (path: import "${path}/overlay.nix") [ inputs.arcexprs ] +++ [ + inputs.deploy-rs.overlay + inputs.konawall-rs.overlays.default + (import tree.packages.default {inherit inputs tree;}) +] diff --git a/systems/sumireko.nix b/systems/sumireko.nix index c5df004c..1def27e6 100644 --- a/systems/sumireko.nix +++ b/systems/sumireko.nix @@ -64,6 +64,17 @@ _: let ]; home-manager.users.kat = { + services.konawall = { + enable = true; + interval_macos = 3600; + mode = "shuffle"; + commonTags = ["width:>=1600"]; + tagList = [ + "score:>=50" + #"no_humans" + "rating:s" + ]; + }; home.file.".orbstack/ssh/authorized_keys".text = (string.concatSep "\n" tree.kat.user.data.keys) + '' diff --git a/tree.nix b/tree.nix index 049cba74..ff37d064 100644 --- a/tree.nix +++ b/tree.nix @@ -74,6 +74,7 @@ enable = true; external = with inputs; [ home-manager.darwinModules.home-manager + #konawall-rs.darwinModules.konawall ]; }; }; @@ -83,11 +84,11 @@ external = with inputs; [ nix-index-database.hmModules.nix-index + konawall-rs.hmModules.konawall ] ++ (with (import (inputs.arcexprs + "/modules")).home-manager; [ base16 i3gopher - konawall ]); }; };