konawall-py on KDE

This commit is contained in:
Kat Inskip 2023-11-12 14:45:15 -08:00
parent 3403022403
commit 091ddb5b91
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
11 changed files with 46 additions and 94 deletions

View file

@ -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;
};
};

67
flake.lock generated
View file

@ -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": [

View file

@ -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";

17
kat/kde/konawall.nix Normal file
View file

@ -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;
}

View file

@ -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"
];
};
}

View file

@ -142,10 +142,6 @@ in {
modifier = super;
startup = [
{
command = "systemctl --user restart konawall.service";
always = true;
}
];
window = {

View file

@ -10,7 +10,7 @@ in {
services.resolved = {
enable = true;
domains = ["~."];
dnssec = "true";
dnssec = "false";
extraConfig = ''
DNSOverTLS=yes
'';

View file

@ -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
];
}

View file

@ -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;})
]

View file

@ -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)

View file

@ -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; [