From 5eacd2aa4596972e8096c3983525f86b2eed9190 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Mon, 23 Jun 2025 23:57:38 -0700 Subject: [PATCH] fix scaling --- home/environments/hyprland/catppuccin.nix | 10 ++ home/environments/hyprland/cursor.nix | 8 ++ .../{hypridle.nix => hypridle.nix.old} | 0 home/environments/hyprland/konawall.nix | 63 ++++++++++ home/environments/hyprland/konawall.yaml | 114 ++++++++++++++++++ systems/goliath.nix | 1 - systems/koishi.nix | 8 +- 7 files changed, 200 insertions(+), 4 deletions(-) create mode 100644 home/environments/hyprland/catppuccin.nix create mode 100644 home/environments/hyprland/cursor.nix rename home/environments/hyprland/{hypridle.nix => hypridle.nix.old} (100%) create mode 100644 home/environments/hyprland/konawall.nix create mode 100644 home/environments/hyprland/konawall.yaml diff --git a/home/environments/hyprland/catppuccin.nix b/home/environments/hyprland/catppuccin.nix new file mode 100644 index 00000000..eb16d8b9 --- /dev/null +++ b/home/environments/hyprland/catppuccin.nix @@ -0,0 +1,10 @@ +{ config, lib, ... }: let + inherit (config.catppuccin) sources; + inherit (lib) mkBefore; + cfg = config.catppuccin.sway; + theme = "${sources.sway}/catppuccin-${cfg.flavor}"; +in { + xsession.windowManager.i3.extraConfigEarly = '' + ${builtins.readFile theme} + ''; +} diff --git a/home/environments/hyprland/cursor.nix b/home/environments/hyprland/cursor.nix new file mode 100644 index 00000000..dba5daaa --- /dev/null +++ b/home/environments/hyprland/cursor.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + home.pointerCursor = { + enable = true; + package = pkgs.graphite-cursors; + size = 16; + name = "graphite-dark"; + }; +} diff --git a/home/environments/hyprland/hypridle.nix b/home/environments/hyprland/hypridle.nix.old similarity index 100% rename from home/environments/hyprland/hypridle.nix rename to home/environments/hyprland/hypridle.nix.old diff --git a/home/environments/hyprland/konawall.nix b/home/environments/hyprland/konawall.nix new file mode 100644 index 00000000..69b8204c --- /dev/null +++ b/home/environments/hyprland/konawall.nix @@ -0,0 +1,63 @@ +{ + inputs, + pkgs, + config, + ... +}: let + konawallConfig = { + interval = 30 * 60; + rotate = true; + source = "e621"; + tags = [ + "rating:s" + "-five_nights_at_freddy's" + #"touhou" + "-large_breasts" + "-scalie" + #"-my_little_pony" + "-sonic_the_hedgehog" + "-amputee" + "-inflation" + "-pool_toy" + "-cuckold" + "-gore" + "-human" + "-animated" + "-hyper" + "-death" + "ratio:>=1.3" + "-muscular_male" + "-model_sheet" + "score:>=100" + "width:>=1500" + ]; + logging = { + file = "INFO"; + console = "DEBUG"; + }; + }; +in { + sops.secrets.konawall-py-env = { + sopsFile = ./konawall.yaml; + }; + home.packages = [ + inputs.konawall-py.packages.${pkgs.system}.konawall-py + ]; + xdg.configFile = { + "konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig; + }; + systemd.user.services.konawall-py = { + Unit = { + Description = "konawall-py"; + X-Restart-Triggers = [(toString config.xdg.configFile."konawall/config.toml".source)]; + After = ["graphical-session.target" "network-online.target"]; + }; + Service = { + ExecStart = "${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall"; + Restart = "on-failure"; + RestartSec = "1s"; + EnvironmentFile = config.sops.secrets.konawall-py-env.path; + }; + Install = {WantedBy = ["graphical-session.target"];}; + }; +} diff --git a/home/environments/hyprland/konawall.yaml b/home/environments/hyprland/konawall.yaml new file mode 100644 index 00000000..b78565ad --- /dev/null +++ b/home/environments/hyprland/konawall.yaml @@ -0,0 +1,114 @@ +konawall-py-env: ENC[AES256_GCM,data:8SWQgZkKXffy+GfhbIkZAB3ZJ9a+q5yPmMdt3lgrzezguX23p7vqgRac9AHq1x8=,iv:K5Pj9FuLWbpah8WaD5TZwmomZUgJnuaCdzFlu7K4n/w=,tag:qTlbMlsTeTnXSm+lyDe1iw==,type:str] +sops: + shamir_threshold: 1 + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2MlhnTkE3Z3UrSElkZHJh + ZUt4dTMxL3IxaWJlZzB5TFk1NEJiTXJ2ZGhZClNoNDJ1OURLVk0yVS90aWVRUE9y + bjU0WFROQ2o3bVBHb1JIUkVVSkdQU00KLS0tIGN4UXFvakRkTGJFNEw4R0pObTBG + Sml0UThGcTVQRWNzYnNmWGdjTmlhamsK48cpqQc+2/A9k9Mzv9mruYT7abchdpLd + Qy7igZJmtomOLrN8/P7m4+Mve+Xp37N/xo1lWJQzcCGfuPGV+99kEw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByem4zelR5NFM0dUtCWDJH + VDJ6cG1QRWpIdHA3OURBUzBCbjltaWdlQ0M0CnVPR2haKy9SUXJEc2lRK3NYdjM3 + TVNCbnRabGtNRVM2RUlUcVZaMHNZQ28KLS0tIHB5U3RQdTdGWWw5Nzd0SSsvWS8r + dTk3a3JOVGNpWGJKR0FxQW1qVmpNVFEKDFZT6Yi1xcSmc93o+eW80DkfV3OrDu04 + IwrKQ/8Whda9qQL0PgHuTmFCkOA9SsQXCU4tYbPGy3kTqpSKTUya8g== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nr0qds8w3gldmdvhwu0p6w2ys8f4sd0h3xy94h9dsafjzttaypxquzmswc + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzTG5qcW81MDljL1AwRGpU + N3p6amN4OGd3NjBnM2w5YlhvdlArRFFHUVNzCmFwSXNlR082b1NiRlE2bUNOaTlH + c1Z0WDF1MTJIZXo0VlZMRkFHRE9DNm8KLS0tIE95SFhqUDRlYnBjN2FkUENUa1RO + U0hYczdZSjNSS0toaGl0QkM0V2VKeWMK4Z8KswSqS9uVMc2i5Oo2NJnClB62THtl + QQeY0bxnRZGbr4edXU9m2Xdr72Fp08HfON3rQ4YATDn+jMEPHvaeUg== + -----END AGE ENCRYPTED FILE----- + - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQSEFXN2YxOEE1V0Z0aVlB + UmJaVCswcndyaEM4VG9nYVY4VmdQeHBsalZFCnRtTGk1TVJLdG5tZzlkcHJ2WDMy + NGNOVmZhRnRQRndiN1MvZnhqa3dLOU0KLS0tIGpVQXNJZ2ViUUJoelJEeTZLaHBP + OWluMUVEaU9KT3EzeWJodGZzTXJValUKUMPNmxUjyGSlWXWJLhoxH+t3cK5q3aTB + QMgmKJPWwIwzpIlENsk/ItI0wUW4eoZNByqo4boV/oKYXw+9me5OzQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0amY0UGR3cDFnZTBBVEkx + UlZCUERNTlRrYklUdVNTY0xxMmJkMFNTUzBnClF4eEVVQjBKUzU5bkxnV1h5S0d6 + N1FXZzEzcEhxY1p5c3dMc1RGMHg2c00KLS0tIFNIWGNzTjk0c3dWTlp4UFc4dUVl + aXh0Zyt0enBGZnFOdnI1b2lwNE1ETnMKEiJf46LtKsV3YQMF/phhLgGhVBUYGL8t + RF+f7GfOcri4iQyfqgrajO+b2FMg6teK7GkDTjPpV7DVRThI/Ekedg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQeW5oWHovS2NkSThJdzZV + bTN5WlNOMkpibzR0NGNQN2hyOWhGMXJrRTNZCk9VUGtyb2RYYW42Rlgwd0FRQzdF + QUNSbEJiczRYWWdPaEpGdzVsMTJLMEkKLS0tIGdyMjZPcjZnTWJDdVdSZmxHWm1y + by9XaWx0N1VuUHA3QnR1T3I2RnBKOFEKce+lkpeTKbSwkw3s64/MIgFnzX7QShrW + tQBAaVi/iF2GpuxtR5D1cR5tLJWshF4hkQJmXVrGLhel6Ss7MeHoyg== + -----END AGE ENCRYPTED FILE----- + - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTaitxNWRQZHA0MkVmL3dR + eXFITVZZNUFteHNxTDhxQ0ZRS2lkSlR3MWkwCnVGeVN6VEE4QWN3ZWg1VldhclVU + UC82blluMnhSQnpDbHorVjRvOGNKaXcKLS0tIHV1UUpQc3IxWExqQjVjSU9GRjlI + dUduV3hkRVdhTWluazQ2RUNkU3lDWVUKmU24Jjc/d7YrBIyMbFAo53bw0megt14K + BQrPXnQpr1QoSERIBcwqhRp7Pp0RTEYSojRIGFJ0Ovn9FIYFdPsESw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuNDR5eXRUd2RzVU85Z2VW + dmNaaVoyZENibU5KQ1MwVXZYcTZaR3dsSVVjCnFmaW1ZQ1ZkdTBBdlEzQkpTWWY5 + OFF1eDFUU0JWcFpKZTVBOEsyQ0FCOFkKLS0tIERhdEZHTkt5SHNuakgxUmh4L2Y1 + Wk5RN2tHcjF1aFNUTEdJYkdLM3FXSGcKJT1xD9J0+sl6EZl7eQYS3inqiLH9DVE1 + S5dLK0MJw7lJn7+EsnWlt0EVrPcGN8w0BiCY/qFJSj+HvP8s+PHh+A== + -----END AGE ENCRYPTED FILE----- + - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5a3VTbFVUaElnZXFVd044 + MS9Ha1dkamVHVHRXNjllT3EydkZ3Sm5rd0JjCmFJTGtMbjVXMkpJZ3hDRHpickRE + VzlZN3FMR01RSDdhMkNCSGhzOWtDK2MKLS0tIHV1VmcxWlY0eVdEbi9leXllamV2 + cnlhdC9iSVN4SmxJWFlXL3N6SUpqOUkKnhnfOTfBc7r/B5uSrGddaZOK9IKQ3AG8 + 2YJ5PLj1HED8SOaflxAgYzHSwvCFbb6GX13O+zbOrl5Ki/1eWH6xBw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-02-28T21:15:38Z" + mac: ENC[AES256_GCM,data:2QggqmZhRgx+kpvDZOBU/KBLruwxbD4F3NHTiNK2N8Ux133pgLDjP88HDmBy8ZRXmGFdkUK0IqOSx1Axy3qpy14DlSdOw9L/WQhOCybEX21ib+ANb90275FtD+7J8luIvOPbCtus9c9gpqYQIirlQMqwkMZ1QADv62ewmVUJD6w=,iv:4V9KA9oq1TR5+cFtZdEop7haPOavRaRd6wwgJDyJeXQ=,tag:MXwB98KN5kit4Oyl+qQFLw==,type:str] + pgp: + - created_at: "2025-03-17T00:23:44Z" + enc: |- + -----BEGIN PGP MESSAGE----- + + hQIMA82M54yws73UAQ/+Nq5oA5kzaq0qgEN1imppTvELUi/sY1bGfXsCREeOn1e+ + hVK/Qgk3kDXpj0Iug5h1n6MGWcvDY+hDHiFVejzX1ixTupYjKA8Or0P/eaWCcgTA + BNiJkkz91jgMMqnzOUKE/rBNRU5/a3rK3OzbEurqBGixWwSJ1s/3ux3roaj+zsqX + phBeS/mCDiUjpPYY6SVvT+Er1/WOq1Ali1ONOXgq68svGWSgJxIZ/OaHRj5qnjj4 + 0cFRb/mdGZYZkVRtivG9xzbcItQgv+2GW2RrPzdiNTvIEwiFqWUUUvN3L5xLAF7x + PNDD2I1Ei2F4GSLT+bTV2IUCIHyBQDfuJJ8a8fQ30uGGdzRX1HZHczPAl8YNlnSy + tea1w7cfPfoYVHtWnN5OnCbrbahbTqvq+4j2Dbj1hXc5NBfX38CPRWQyUyrAPdsL + ghsg9uuZJtEtL6Z73gDbf+xCSb6hJ8WH7QYj8juFMs06Vi9m03Wa650ksIsOAE2y + YE9LqqnVU6AXFwdrC62n4FGFVP2wyMH1XNoD1bHLILEcMbJpfsOcM12fpQxo3A55 + 6hRBof6sHMY+TrRzhLhdFy4WCahBvkKwvy9PtJqILo5zAjz2XN6GjzVynobauDyp + jox7Cu+2VntceJQ2H3INJ+ALe9DQWIgevFmkk3frhPPSdtEFf7s/gUG/kiYYip/S + XgE2iObZ16neZNqe3XkDRtcVRERnJ1xt0CFx2NTMzma4qB3AddNvX7tAwZuAs6Fn + V8cCXbLofER/KjwKTGcmYOC6SaYn+R3ybdTsRBGox2XTl3qJvCWB/GdtZWihWj0= + =cZR3 + -----END PGP MESSAGE----- + fp: CD8CE78CB0B3BDD4 + unencrypted_suffix: _unencrypted + version: 3.9.4 diff --git a/systems/goliath.nix b/systems/goliath.nix index a6dd3e0a..6a2f653f 100644 --- a/systems/goliath.nix +++ b/systems/goliath.nix @@ -53,7 +53,6 @@ _: let graphical ]) ++ (with tree.home.environments; [ - i3 hyprland ]); diff --git a/systems/koishi.nix b/systems/koishi.nix index 84d92484..a774ba61 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -22,7 +22,7 @@ _: let #sway #xfce #openbox - kde + hyprland #gnome ]); config = { @@ -33,7 +33,7 @@ _: let ++ (with tree.home.environments; [ #xfce #sway - kde + hyprland #gnome ]); @@ -51,7 +51,9 @@ _: let swapDevices = [ {device = "/dev/disk/by-uuid/7486e618-214b-47ff-87a7-0d53099a05b4";} ]; - + home-manager.users.kat.wayland.windowManager.hyprland.settings.monitor = [ + "eDP-1, preferred, 0x0, 1" + ]; boot = { initrd.luks.devices."cryptmapper".device = "/dev/disk/by-uuid/16296ac6-b8b2-4c4e-94f6-c06ea84d6fbb"; loader.grub.useOSProber = true;