diff --git a/modules/home/gui/apps/tools/espanso/default.nix b/modules/home/gui/apps/tools/espanso/default.nix index 86cc192..5c91049 100755 --- a/modules/home/gui/apps/tools/espanso/default.nix +++ b/modules/home/gui/apps/tools/espanso/default.nix @@ -1,7 +1,12 @@ { + flake, pkgs, ... }: +let + inherit (flake.config.people) user0; + inherit (flake.config.people.users.${user0}) email; +in { services.espanso = { enable = true; @@ -68,7 +73,7 @@ replace = "Δ"; } { - trigger = ":em"; + trigger = ":emdash"; replace = "—"; } { @@ -119,6 +124,30 @@ trigger = ":ss0"; replace = "⁰"; } + { + trigger = ":ntt"; + replace = '' + World A) Animals farmed for food. + World B) Humans farmed for food. + + All else equal, what is true of world A that is untrue of world B, that if made true of world B, would make world B permissible?''; + } + { + trigger = ":dotfiles"; + replace = "https://gitlab.com/upRootNutrition/dotfiles"; + } + { + trigger = ":website"; + replace = "https://uprootnutrition.com"; + } + { + trigger = ":mail0"; + replace = email.address0; + } + { + trigger = ":mail1"; + replace = email.address2; + } ]; }; global_vars = { diff --git a/modules/nixos/services/glance/config/branding.nix b/modules/nixos/services/glance/config/branding.nix old mode 100644 new mode 100755 index f18db52..ba2ed69 --- a/modules/nixos/services/glance/config/branding.nix +++ b/modules/nixos/services/glance/config/branding.nix @@ -1,8 +1,7 @@ { hide-footer = true; - # logo-url = /assets/logo.png; - # favicon-url = /assets/logo.png; + # logo-url = "/assets/logo.png"; # app-name = "My Dashboard"; - # app-icon-url = "/assets/app-icon.png"; - # app-background-color = "#151519"; + # favicon-url = "/assets/logo.png"; + # app-icon-url = "/assets/logo.png"; } diff --git a/modules/nixos/services/glance/config/pages.nix b/modules/nixos/services/glance/config/pages.nix old mode 100644 new mode 100755 index 0756854..171b77e --- a/modules/nixos/services/glance/config/pages.nix +++ b/modules/nixos/services/glance/config/pages.nix @@ -8,6 +8,8 @@ let calendar = import (widgetsPath + /calendar.nix); clock = import (widgetsPath + /clock.nix); weather = import (widgetsPath + /weather.nix); + reddit = import (widgetsPath + /reddit.nix); + videos = import (widgetsPath + /videos.nix); }; in [ @@ -16,13 +18,20 @@ in { size = "full"; widgets = [ - widgets.podcasts + { + type = "group"; + widgets = [ + widgets.podcasts + widgets.videos + ]; + } + widgets.reddit ]; } { size = "small"; widgets = [ - widgets.jellyfin + # widgets.jellyfin widgets.steam ]; } diff --git a/modules/nixos/services/glance/config/server.nix b/modules/nixos/services/glance/config/server.nix old mode 100644 new mode 100755 index 28c7f53..cefc788 --- a/modules/nixos/services/glance/config/server.nix +++ b/modules/nixos/services/glance/config/server.nix @@ -1,6 +1,9 @@ -{ service, ... }: +{ flake, service, ... }: +let + inherit (flake.config.people) user0; +in { - # assets-path = "/home/${user0}/Files/Projects/dotfiles/modules/nixos/services/glance/assets"; + assets-path = "/home/${user0}/Files/Projects/dotfiles/modules/nixos/services/glance/assets"; port = service.ports.port0; # auth = { # secret-key = config.sops.secrets."${service.name}-key".path; diff --git a/modules/nixos/services/glance/config/theme.nix b/modules/nixos/services/glance/config/theme.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/calendar.nix b/modules/nixos/services/glance/config/widgets/calendar.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/clock.nix b/modules/nixos/services/glance/config/widgets/clock.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/jellyfin/config/default.nix b/modules/nixos/services/glance/config/widgets/jellyfin/config/default.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/jellyfin/default.nix b/modules/nixos/services/glance/config/widgets/jellyfin/default.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/monitor.nix b/modules/nixos/services/glance/config/widgets/monitor.nix new file mode 100644 index 0000000..8509cc4 --- /dev/null +++ b/modules/nixos/services/glance/config/widgets/monitor.nix @@ -0,0 +1,6 @@ +{ + type = "monitor"; + cache = "1m"; + title = "Services"; + +} diff --git a/modules/nixos/services/glance/config/widgets/podcasts.nix b/modules/nixos/services/glance/config/widgets/podcasts.nix old mode 100644 new mode 100755 index 3ebedce..b659abf --- a/modules/nixos/services/glance/config/widgets/podcasts.nix +++ b/modules/nixos/services/glance/config/widgets/podcasts.nix @@ -1,9 +1,5 @@ -{ - type = "rss"; - title = "Podcasts"; - style = "detailed-list"; - collapse-after = 6; - feeds = [ +let + podcastData = [ { url = "https://sigmanutrition.libsyn.com/rss/"; title = "Sigma Nutrition Radio"; @@ -17,4 +13,19 @@ title = "Docs Who Lift"; } ]; + podcastEntries = builtins.map ( + podcast: + podcast + // { + hide-description = true; + hide-categories = true; + } + ) podcastData; +in +{ + type = "rss"; + title = "Podcasts"; + style = "detailed-list"; + collapse-after = 3; + feeds = podcastEntries; } diff --git a/modules/nixos/services/glance/config/widgets/reddit.nix b/modules/nixos/services/glance/config/widgets/reddit.nix new file mode 100644 index 0000000..07d7360 --- /dev/null +++ b/modules/nixos/services/glance/config/widgets/reddit.nix @@ -0,0 +1,21 @@ +let + subList = [ + "privacy" + "selfhosted" + "vegan" + ]; + + subredditEntries = builtins.map (sub: { + type = "reddit"; + subreddit = sub; + collapse-after = 4; + show-thumbnails = true; + sort-by = "top"; + top-period = "day"; + }) subList; + +in +{ + type = "group"; + widgets = subredditEntries; +} diff --git a/modules/nixos/services/glance/config/widgets/steam/config/default.nix b/modules/nixos/services/glance/config/widgets/steam/config/default.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/steam/default.nix b/modules/nixos/services/glance/config/widgets/steam/default.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/videos.nix b/modules/nixos/services/glance/config/widgets/videos.nix new file mode 100644 index 0000000..c3c373b --- /dev/null +++ b/modules/nixos/services/glance/config/widgets/videos.nix @@ -0,0 +1,14 @@ +{ + type = "videos"; + style = "vertical-list"; + collapse-after = 6; + channels = [ + "UCfQgsKhHjSyRLOp9mnffqVg" + "UCld68syR8Wi-GY_n4CaoJGA" + "UChIs72whgZI9w6d6FhwGGHA" + "UCes5DW7sk9WU8oqE9HGJdpg" + "UCOksmJqNzaYLhplfs7Sl8cA" + "UCQNmHyGAKqzOT_JsVEs4eag" + "UCd8rTrNRM6DYR4TXgSqNw8g" + ]; +} diff --git a/modules/nixos/services/glance/config/widgets/weather.nix b/modules/nixos/services/glance/config/widgets/weather.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/default.nix b/modules/nixos/services/glance/default.nix index ca0b63e..18511e9 100755 --- a/modules/nixos/services/glance/default.nix +++ b/modules/nixos/services/glance/default.nix @@ -6,7 +6,7 @@ let service = glance; configPath = ./config; configImports = { - server = import (configPath + /server.nix) { inherit service; }; + server = import (configPath + /server.nix) { inherit flake service; }; branding = import (configPath + /branding.nix); theme = import (configPath + /theme.nix); pages = import (configPath + /pages.nix) { inherit config flake; }; @@ -22,9 +22,10 @@ in sops = let sopsPath = secret: { - path = "${service.sops.path0}/${service.name}-${secret}"; + path = "/run/secrets/${service.name}-${secret}"; owner = "root"; - mode = "600"; + group = "root"; + mode = "644"; }; in { diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index ebc1267..72f872c 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -34,7 +34,7 @@ wireguard-CA363: ENC[AES256_GCM,data:iGiAjP5Dbw0kXR3iM50YTS8jBXODNr//W/0OPMAiu1G wireguard-CA220: ENC[AES256_GCM,data:rNy/IMKqAOsgMUu5r8BZsjTCu0L5fDDDV3/g+pkhW1y44Y2rqhhsZgcXG5M=,iv:onyHBn4npqiwC/v37SOMJLLhdfcrtvPmKbMVTgxaSQg=,tag:OmXDL3oYCDPwH1yBsKAYKQ==,type:str] wireguard-CA358: ENC[AES256_GCM,data:/VewmiNfRc9/wSE7TT+z1F9LLIvr/5wPsQZ/zBwAh3dEi9yswOGyde2b/XQ=,iv:7U5dmqFiwhCoL1moGSfHprv85o5TdMr6T2sNk5gH82I=,tag:T1hqh8CiO2iBa+ksaiKCtA==,type:str] wireguard-CA627: ENC[AES256_GCM,data:chmDsH2nE0nagjFRZWuxX08/Ykt+rIgCHYkMHd+7nIqihK5SebF7MJlrp84=,iv:NVOlGE7W70nQ0UM/i5WixJvDULO3Y4cLf8h+OAGHhQQ=,tag:L123ShCnr9+kIg1itIoqBA==,type:str] -glance-jellyfin: ENC[AES256_GCM,data:3ZR8OOgysWNqkJGqKjdDg/0UUgMBbrrgdHbuRQcM+po=,iv:EDG4DEBWmwu//qf+K+V0HqTYc8q78fF9dDb+37zHQIk=,tag:fSok//JeM635gWZ37+cItw==,type:str] +glance-jellyfin: ENC[AES256_GCM,data:ozdDKgAWkA88J2j8RtiOP/aQPAt/neUOSlAZF20g510=,iv:x+VhYlnA9F/VPrzVcma4/oPelCc8kjWoTZvOs4L9Uqo=,tag:crdSDjr8Y5GH/JAF6t8Yeg==,type:str] sops: age: - recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0 @@ -46,7 +46,7 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-05-25T21:49:29Z" - mac: ENC[AES256_GCM,data:7JD1leZhMyHg7twZXf/0chy2PbGVS6IE4wayXwzHemFccS0j64JY7/T1IWnL5bCj1V2aszocUWvwZrLhPnYinF6rjDRzLnRCtZ5Nb88S0WyTpDOBAj6GDEgs+e08e+RjCwfWdIr068HD4b/B+9M8S8qJtEZ++Uib7awzIsQphgQ=,iv:TY2wisEJiv2TODvaLl4qjILuSclzKyGVRMjrbrLCvms=,tag:+C9DW8443OOOo7a1Cbl9fQ==,type:str] + lastmodified: "2025-05-26T17:10:37Z" + mac: ENC[AES256_GCM,data:h4jgFynRh4zercRoj1N38Anh4PIb9dspx22qDrndjxJ57oGAOh8p6JyFBlN6YbKYOc+dvdcVHMJUgG4swP7N7SR9ZTNipMgoLOpVQ4NpuWZrNOa7YHs+kRyXu+Y1r4agV890tmogrbyRNKXFtGwLigMtqKeG81VOVFNm9Po1Wgg=,iv:FLO5cwSdasoFKLFtpSxa9FT/Kav5R4qfxXFV8cS8QJk=,tag:G+p8MuM3qLht/m48wDmCVA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/systems/mars/config/networking.nix b/systems/mars/config/networking.nix index 4373d9c..d621e04 100755 --- a/systems/mars/config/networking.nix +++ b/systems/mars/config/networking.nix @@ -23,7 +23,7 @@ in 3131 # Deskreen 1234 # Elm-land server 5037 # ADB Server - 39724 + 43120 ]; }; };