From 15f40761fb2477cdd410527b0712a9d6858d490b Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sun, 10 Mar 2024 12:28:14 -0700
Subject: [PATCH] feat: consistent konawall on hyprland

---
 flake.lock                                    |   6 ++---
 home/environments/gnome/dconf.nix             |   2 +-
 home/environments/hyprland/hyprland.nix       |  13 +++------
 home/environments/hyprland/konawall.nix       |  25 +++++++++++-------
 home/environments/hyprland/waybar.nix         |  23 ++++++++++++----
 home/environments/hyprland/waybar.sass        |   4 +--
 home/environments/kde/gtk.nix                 |  16 ++---------
 home/environments/kde/kde.nix                 |   2 +-
 home/environments/kde/konawall.nix            |   5 +++-
 nixos/environments/gnome/packages.nix         |   7 -----
 nixos/environments/hyprland/colord.nix        |   3 +++
 nixos/hardware/framework/boot.nix             |  14 ++++++++++
 nixos/hardware/framework/color.nix            |   8 ++++++
 .../fingerprint.nix}                          |  19 +------------
 nixos/hardware/framework/framework-icc.icm    | Bin 0 -> 9932 bytes
 nixos/hardware/framework/imports.nix          |  15 +++++++++++
 systems/koishi.nix                            |   2 +-
 17 files changed, 92 insertions(+), 72 deletions(-)
 create mode 100644 nixos/environments/hyprland/colord.nix
 create mode 100644 nixos/hardware/framework/boot.nix
 create mode 100644 nixos/hardware/framework/color.nix
 rename nixos/hardware/{framework.nix => framework/fingerprint.nix} (56%)
 create mode 100644 nixos/hardware/framework/framework-icc.icm
 create mode 100644 nixos/hardware/framework/imports.nix

diff --git a/flake.lock b/flake.lock
index 760b6242..cfbf99d8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -411,11 +411,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708208882,
-        "narHash": "sha256-Th5ybDsLfWJWDLGeLKLvrYYBQWLarZxWQyWWNNpZg+c=",
+        "lastModified": 1710095677,
+        "narHash": "sha256-M1FyL+mCy0dyVfBi2qft3rcqU5NJh2BOQMwJdP2SDek=",
         "owner": "kittywitch",
         "repo": "konawall-py",
-        "rev": "51fe663a47c4ad4d36dcd316495c58213e501785",
+        "rev": "e9eb56126b1c77f2799b1da2a94afc468a1aafec",
         "type": "github"
       },
       "original": {
diff --git a/home/environments/gnome/dconf.nix b/home/environments/gnome/dconf.nix
index 8d25adce..d2f2693b 100644
--- a/home/environments/gnome/dconf.nix
+++ b/home/environments/gnome/dconf.nix
@@ -4,7 +4,7 @@ _: {
     settings = {
       "org/gnome/shell" = {
         favorite-apps = [
-          "brave-browser.desktop"
+          "firefox.desktop"
           "thunderbird.desktop"
           "nheko.desktop"
           "discord.desktop"
diff --git a/home/environments/hyprland/hyprland.nix b/home/environments/hyprland/hyprland.nix
index 7b45c5b9..087073db 100644
--- a/home/environments/hyprland/hyprland.nix
+++ b/home/environments/hyprland/hyprland.nix
@@ -28,16 +28,11 @@ in {
     SDL_VIDEODRIVER = "wayland";
     XDG_SESSION_TYPE = "wayland";
   };
-  systemd.user.services.swayidle.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
   wayland.windowManager.hyprland = {
     enable = true;
     systemd = {
       enable = true;
       variables = ["--all"];
-      extraCommands = [
-        "systemctl --user stop graphical-session.target"
-        "systemctl --user start hyprland-session.target"
-      ];
     };
     xwayland.enable = true;
     settings = {
@@ -73,16 +68,16 @@ in {
         "eDP-1, 2256x1504, 0x0, 1"
       ];
       exec-once = [
+        "${pkgs.swww}/bin/swww init"
         "${pkgs.hypridle}/bin/hypridle"
-        "${pkgs.udiskie}/bin/udiskie &"
         "${pkgs.dbus}/bin/dbus-update-activation-environment --all"
         "${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-agent"
         "${pkgs.networkmanagerapplet}/bin/nm-applet"
         "${pkgs.mako}/bin/mako"
-        "${pkgs.swww}/bin/swww init"
-        "${pkgs.systemd}/bin/systemctl --user restart waybar.service"
+        "${pkgs.udiskie}/bin/udiskie &"
         "${pkgs.pasystray}/bin/pasystray"
-        "${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall"
+      ];
+      exec = [
       ];
       xwayland = {
         force_zero_scaling = true;
diff --git a/home/environments/hyprland/konawall.nix b/home/environments/hyprland/konawall.nix
index 024ec803..f9189ef7 100644
--- a/home/environments/hyprland/konawall.nix
+++ b/home/environments/hyprland/konawall.nix
@@ -1,19 +1,24 @@
 {
   inputs,
   pkgs,
+  config,
   ...
 }: let
-  desktop_entry = ''
-    [Desktop Entry]
-    Exec=${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall
-    Icon=
-    Name=konawall
-    Path=
-    Terminal=False
-    Type=Application
-  '';
+  systemd.user.services.konawall-py = {
+    Unit = {
+      Description = "konawall-py";
+      X-Restart-Triggers = [(toString config.xdg.configFile."konawall/config.toml".source)];
+      After = ["hyprland-session.target"];
+    };
+    Service = {
+      ExecStart = "${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall";
+      Restart = "always";
+    };
+    Install = {WantedBy = ["hyprland-session.target"];};
+  };
+
   konawallConfig = {
-    interval = 30 * 60;
+    interval = 60 * 5;
     rotate = true;
     source = "konachan";
     tags = [
diff --git a/home/environments/hyprland/waybar.nix b/home/environments/hyprland/waybar.nix
index 080e5584..78eb4ef6 100644
--- a/home/environments/hyprland/waybar.nix
+++ b/home/environments/hyprland/waybar.nix
@@ -2,13 +2,27 @@
   kittywitch,
   pkgs,
   config,
+  lib,
   ...
-}: {
-  systemd.user.services.waybar.Unit.X-Restart-Triggers = [
-    (builtins.hashString "md5" (builtins.toJSON config.programs.waybar.settings))
-  ];
+}: let
+  inherit (lib.modules) mkForce;
+in {
+  systemd.user.services.waybar = {
+    Install.WantedBy = lib.mkForce ["hyprland-session.target"];
+    Service = {
+      RestartSec = "1s";
+    };
+    Unit = {
+      After = ["hyprland-session.target"];
+      X-Restart-Triggers = [
+        (builtins.hashString "md5" (builtins.toJSON config.programs.waybar.settings))
+      ];
+    };
+  };
+
   programs.waybar = {
     enable = true;
+    systemd.enable = true;
     style = let
       template = kittywitch.sassTemplate {
         name = "waybar-style";
@@ -16,7 +30,6 @@
       };
     in
       template.source;
-    systemd.enable = true;
     settings.main = {
       layer = "top";
       position = "top";
diff --git a/home/environments/hyprland/waybar.sass b/home/environments/hyprland/waybar.sass
index c74b4dc0..ae37fe3a 100644
--- a/home/environments/hyprland/waybar.sass
+++ b/home/environments/hyprland/waybar.sass
@@ -11,7 +11,7 @@
 
 %widget_unpadded
   transition: none
-  background: $base01
+  background: rgba($base01, 0.5)
   color: $base07
   margin: 0 4px
 
@@ -21,7 +21,7 @@
   padding-top: 2px
 
 window#waybar
-  background: rgba($base00, 0.9)
+  background: rgba($base00, 0.1)
   border-bottom: 2px solid transparent
 
 // sway/workspaces
diff --git a/home/environments/kde/gtk.nix b/home/environments/kde/gtk.nix
index bc6a4aa4..0a64cc40 100644
--- a/home/environments/kde/gtk.nix
+++ b/home/environments/kde/gtk.nix
@@ -2,8 +2,8 @@
   gtk = {
     enable = true;
     iconTheme = {
-      name = "Papirus";
-      package = pkgs.papirus-icon-theme;
+      name = "Numix-Square-Light";
+      package = pkgs.numix-icon-theme-square;
     };
 
     theme = {
@@ -15,18 +15,6 @@
       name = "Numix-Cursor";
       package = pkgs.numix-cursor-theme;
     };
-
-    gtk3.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=1
-      '';
-    };
-
-    gtk4.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=1
-      '';
-    };
   };
 
   home.sessionVariables.GTK_THEME = "Arc";
diff --git a/home/environments/kde/kde.nix b/home/environments/kde/kde.nix
index 72088cea..2aa4c557 100644
--- a/home/environments/kde/kde.nix
+++ b/home/environments/kde/kde.nix
@@ -11,9 +11,9 @@ _: {
       "kdeglobals"."General"."BrowserApplication" = "firefox.desktop";
       "kdeglobals"."General"."TerminalApplication" = "wezterm start --cwd .";
       "kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop";
-      "kxkbrc"."Layout"."Options" = "terminate:ctrl_alt_bksp,ctrl:nocaps";
       "kxkbrc"."Layout"."ResetOldOptions" = true;
       "plasmarc"."Theme"."name" = "Arc";
+      "kxkbrc"."Layout"."Options" = "terminate:ctrl_alt_bksp,ctrl:hyper_capscontrol";
     };
   };
 }
diff --git a/home/environments/kde/konawall.nix b/home/environments/kde/konawall.nix
index 09b9d36d..e6c05fd6 100644
--- a/home/environments/kde/konawall.nix
+++ b/home/environments/kde/konawall.nix
@@ -3,9 +3,12 @@
   pkgs,
   ...
 }: let
+  konawallWithDelay = pkgs.writeShellScriptBin "konawall" ''
+  sleep 5 && ${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall
+  '';
   desktop_entry = ''
     [Desktop Entry]
-    Exec=${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall
+    Exec=${konawallWithDelay}/bin/konawall
     Icon=
     Name=konawall
     Path=
diff --git a/nixos/environments/gnome/packages.nix b/nixos/environments/gnome/packages.nix
index a985de30..bfdfd338 100644
--- a/nixos/environments/gnome/packages.nix
+++ b/nixos/environments/gnome/packages.nix
@@ -6,16 +6,9 @@
     ])
     ++ (with pkgs.gnome; [
       cheese # webcam tool
-      gnome-music
-      gedit # text editor
       epiphany # web browser
       geary # email reader
       gnome-characters
-      tali # poker game
-      iagno # go game
-      hitori # sudoku game
-      atomix # puzzle game
-      yelp # Help view
       gnome-contacts
       gnome-initial-setup
     ]);
diff --git a/nixos/environments/hyprland/colord.nix b/nixos/environments/hyprland/colord.nix
new file mode 100644
index 00000000..82411e7a
--- /dev/null
+++ b/nixos/environments/hyprland/colord.nix
@@ -0,0 +1,3 @@
+_: {
+  services.colord.enable = true;
+}
diff --git a/nixos/hardware/framework/boot.nix b/nixos/hardware/framework/boot.nix
new file mode 100644
index 00000000..921fbab5
--- /dev/null
+++ b/nixos/hardware/framework/boot.nix
@@ -0,0 +1,14 @@
+_: {
+  boot = {
+    plymouth = {
+      enable = true;
+    };
+    consoleLogLevel = 0;
+    kernelParams = [ "quiet" ];
+    initrd = {
+      verbose = false;
+      systemd.enable = true;
+      availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
+    };
+  };
+}
diff --git a/nixos/hardware/framework/color.nix b/nixos/hardware/framework/color.nix
new file mode 100644
index 00000000..b6cd57a1
--- /dev/null
+++ b/nixos/hardware/framework/color.nix
@@ -0,0 +1,8 @@
+{
+  pkgs,
+  ...
+}: {
+  home-manager.users.kat.wayland.windowManager.hyprland.settings.exec-once = [
+    "${pkgs.colord}/bin/colormgr import-profile ${./framework-icc.icm}"
+  ];
+}
diff --git a/nixos/hardware/framework.nix b/nixos/hardware/framework/fingerprint.nix
similarity index 56%
rename from nixos/hardware/framework.nix
rename to nixos/hardware/framework/fingerprint.nix
index d4224a05..57731bdc 100644
--- a/nixos/hardware/framework.nix
+++ b/nixos/hardware/framework/fingerprint.nix
@@ -1,21 +1,4 @@
-{
-  inputs,
-  tree,
-  pkgs,
-  ...
-}: {
-  imports =
-    (with tree.nixos.hardware; [
-      amd_cpu
-      amd_gpu
-      uefi
-    ])
-    ++ [
-      inputs.nixos-hardware.outputs.nixosModules.framework-13-7040-amd
-    ];
-  boot.initrd = {
-    availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
-  };
+{ pkgs, ... }: {
   services = {
     fwupd = {
       enable = true;
diff --git a/nixos/hardware/framework/framework-icc.icm b/nixos/hardware/framework/framework-icc.icm
new file mode 100644
index 0000000000000000000000000000000000000000..e067230fb68346d9d9c9cdfc6575d97067e9e589
GIT binary patch
literal 9932
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

literal 0
HcmV?d00001

diff --git a/nixos/hardware/framework/imports.nix b/nixos/hardware/framework/imports.nix
new file mode 100644
index 00000000..37f10952
--- /dev/null
+++ b/nixos/hardware/framework/imports.nix
@@ -0,0 +1,15 @@
+{
+  inputs,
+  tree,
+  ...
+}: {
+  imports =
+    (with tree.nixos.hardware; [
+      amd_cpu
+      amd_gpu
+      uefi
+    ])
+    ++ [
+      inputs.nixos-hardware.outputs.nixosModules.framework-13-7040-amd
+    ];
+}
diff --git a/systems/koishi.nix b/systems/koishi.nix
index fb943791..bf4c4d09 100644
--- a/systems/koishi.nix
+++ b/systems/koishi.nix
@@ -35,7 +35,7 @@ _: let
 
       fileSystems = {
         "/" = {
-          device = "UUID=861e8815-9327-4e49-915b-73a3b0bdfa25";
+          device = "/dev/disk/by-uuid/861e8815-9327-4e49-915b-73a3b0bdfa25";
           fsType = "bcachefs";
         };
         "/boot" = {