From 091ddb5b9115409fc9246324fee16da5df3618be Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sun, 12 Nov 2023 14:45:15 -0800 Subject: [PATCH] konawall-py on KDE --- common/home.nix | 3 +- flake.lock | 67 ++++++++---------------------- flake.nix | 6 +-- kat/kde/konawall.nix | 17 ++++++++ kat/sway/konashow.nix | 17 -------- kat/sway/sway.nix | 4 -- nixos/roles/graphical/dns.nix | 2 +- nixos/roles/graphical/packages.nix | 7 +++- overlays.nix | 1 - systems/sumireko.nix | 14 ------- tree.nix | 2 - 11 files changed, 46 insertions(+), 94 deletions(-) create mode 100644 kat/kde/konawall.nix delete mode 100644 kat/sway/konashow.nix diff --git a/common/home.nix b/common/home.nix index a6ea21b8..c1d40955 100644 --- a/common/home.nix +++ b/common/home.nix @@ -4,6 +4,7 @@ machine, systemType, std, + inputs, ... }: let inherit (std) list; @@ -21,7 +22,7 @@ in { common ]; extraSpecialArgs = { - inherit tree machine std; + inherit tree machine std inputs; parent = config; }; }; diff --git a/flake.lock b/flake.lock index 54ec1823..dc5eab95 100644 --- a/flake.lock +++ b/flake.lock @@ -208,27 +208,26 @@ "type": "github" } }, - "konawall-rs": { + "konawall-py": { "inputs": { "flake-utils": [ "utils" ], "nixpkgs": [ "nixpkgs" - ], - "rust": "rust" + ] }, "locked": { - "lastModified": 1693499891, - "narHash": "sha256-Lt2RoY7k2BdAUji7qv7Y36+FVRiNhksVRbAjcTgA8e0=", + "lastModified": 1699822607, + "narHash": "sha256-sr1Dm+A5vc54zWLehp1IQujP8oL3y0kMWyiYCFBAe/Q=", "owner": "kittywitch", - "repo": "konawall-rs", - "rev": "a63a8f3297cbf47d7d3a0c0b5a27d61d39bcfc1c", + "repo": "konawall-py", + "rev": "4a18fa633718d243da65fbf8d4bd4a5227b55d44", "type": "github" }, "original": { "owner": "kittywitch", - "repo": "konawall-rs", + "repo": "konawall-py", "type": "github" } }, @@ -365,16 +364,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683185507, - "narHash": "sha256-Wcj09pigMFgj+0borXeoJvVMwH2Rc4gkSq4BwNq3k7s=", - "owner": "NixOS", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "63464b8c2837ec56e1d610f5bd2a9b8e1f532c07", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -393,22 +394,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -504,12 +489,12 @@ "empty": "empty", "flake-compat": "flake-compat", "home-manager": "home-manager", - "konawall-rs": "konawall-rs", + "konawall-py": "konawall-py", "mach-nix": "mach-nix", "minecraft": "minecraft", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "plasma-manager": "plasma-manager", "pypi-deps-db": "pypi-deps-db", "scalpel": "scalpel", @@ -521,24 +506,6 @@ "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 3374224e..a2bbcfd3 100644 --- a/flake.nix +++ b/flake.nix @@ -63,9 +63,9 @@ inputs.std.follows = "std"; inputs.nixpkgs.follows = "nixpkgs"; }; - # konawall-rs - konawall-rs = { - url = "github:kittywitch/konawall-rs"; + # konawall-py + konawall-py = { + url = "github:kittywitch/konawall-py"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "utils"; diff --git a/kat/kde/konawall.nix b/kat/kde/konawall.nix new file mode 100644 index 00000000..93d3e9cb --- /dev/null +++ b/kat/kde/konawall.nix @@ -0,0 +1,17 @@ +{ + inputs, + pkgs, + ... +}: let + desktop_entry = '' + [Desktop Entry] + Exec=${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall + Icon= + Name=konawall + Path= + Terminal=False + Type=Application + ''; +in { + xdg.configFile."autostart/konawall.desktop".text = desktop_entry; +} diff --git a/kat/sway/konashow.nix b/kat/sway/konashow.nix deleted file mode 100644 index b839df07..00000000 --- a/kat/sway/konashow.nix +++ /dev/null @@ -1,17 +0,0 @@ -{config, ...}: { - home.packages = [ - config.services.konawall.konashow - ]; - - services.konawall = { - enable = true; - interval = "30m"; - mode = "shuffle"; - commonTags = ["width:>=1600"]; - tagList = [ - "score:>=50" - #"no_humans" - "rating:s" - ]; - }; -} diff --git a/kat/sway/sway.nix b/kat/sway/sway.nix index 0097b0c7..90532067 100644 --- a/kat/sway/sway.nix +++ b/kat/sway/sway.nix @@ -142,10 +142,6 @@ in { modifier = super; startup = [ - { - command = "systemctl --user restart konawall.service"; - always = true; - } ]; window = { diff --git a/nixos/roles/graphical/dns.nix b/nixos/roles/graphical/dns.nix index 9f0ba260..bd3743eb 100644 --- a/nixos/roles/graphical/dns.nix +++ b/nixos/roles/graphical/dns.nix @@ -10,7 +10,7 @@ in { services.resolved = { enable = true; domains = ["~."]; - dnssec = "true"; + dnssec = "false"; extraConfig = '' DNSOverTLS=yes ''; diff --git a/nixos/roles/graphical/packages.nix b/nixos/roles/graphical/packages.nix index 2c18ecfa..eb48e680 100644 --- a/nixos/roles/graphical/packages.nix +++ b/nixos/roles/graphical/packages.nix @@ -1,9 +1,14 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { environment.systemPackages = with pkgs; [ android-udev-rules jmtpfs dnsutils firefox usbutils + inputs.konawall-py.packages.${pkgs.system}.konawall-py ]; } diff --git a/overlays.nix b/overlays.nix index 86cb1efb..43bb8ae9 100644 --- a/overlays.nix +++ b/overlays.nix @@ -9,6 +9,5 @@ map (path: import "${path}/overlay.nix") [ ++ [ inputs.darwin.overlays.default 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 e757e6d0..85248f98 100644 --- a/systems/sumireko.nix +++ b/systems/sumireko.nix @@ -66,20 +66,6 @@ _: let home.sessionVariables = { ARTEMISCLI_CONFIG_PATH = "/Users/kat/.artemisconfig"; }; - services.konawall = { - enable = true; - interval_macos = 3600; - mode = "shuffle"; - commonTags = ["width:>=1600"]; - tagList = [ - [ - "score:>=50" - #"no_humans" - "touhou" - "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 b6aafca1..04d1de0f 100644 --- a/tree.nix +++ b/tree.nix @@ -75,7 +75,6 @@ enable = true; external = with inputs; [ home-manager.darwinModules.home-manager - #konawall-rs.darwinModules.konawall ]; }; }; @@ -85,7 +84,6 @@ external = with inputs; [ nix-index-database.hmModules.nix-index - konawall-rs.hmModules.konawall plasma-manager.homeManagerModules.plasma-manager ] ++ (with (import (inputs.arcexprs + "/modules")).home-manager; [