Koishi, GNOME 3

config/hosts/koishi.nix

@@ -2,9 +2,10 @@
   imports = with meta; [
     profiles.hardware.x270
     profiles.gui
+    profiles.gnome
     profiles.light
     profiles.network
-    users.kat.guiFull
+    (users.kat.guiFlavour "gnome")
     services.nginx
     services.dnscrypt-proxy
   ];

config/profiles/gnome/gnome.nix

@@ -0,0 +1,39 @@
+{ config, pkgs, lib, ... }: {
+  services = {
+    xserver = {
+      enable = true;
+      desktopManager.gnome = {
+        enable = true;
+      };
+      displayManager.gdm = {
+        enable = true;
+      };
+    };
+    mullvad-vpn.enable = true;
+  };
+
+  hardware.pulseaudio.enable = lib.mkForce false;
+  xdg.portal.enable = lib.mkForce false;
+
+  environment.systemPackages = (with pkgs.gnomeExtensions; [
+    gsconnect
+    vitals
+    paperwm
+    timezone
+    switcher
+    espresso
+    impatience
+    noannoyance
+    arcmenu
+    tweaks-in-system-menu
+    activities-icons
+    random-wallpaper
+    mullvad-indicator
+    tray-icons-reloaded
+  ]) ++ (with pkgs; [
+    mullvad-vpn
+    ytmdesktop
+    pkgs.gnome.gnome-shell-extensions
+    pkgs.gnome.gnome-tweaks
+  ]);
+}

config/services/ha.nix

@@ -18,6 +18,7 @@
         "google_translate"
         "homekit"
         "mqtt"
+        "wake_on_lan"
         "zeroconf"
         "luci"
       ];
@@ -74,6 +75,6 @@
     cp --no-preserve=mode ${config.secrets.files.zigbee2mqtt-secret.path} "${cfg.dataDir}/secret.yaml"
   '';
 
-  network.firewall.public.tcp.ports = [ 8123 8072 ];
+  network.firewall.public.tcp.ports = [ 8123 8072 1883 ];
   network.firewall.private.tcp.ports = [ 8123 ];
 }

config/services/nextcloud.nix

@@ -46,7 +46,7 @@ in {
     };
     https = true;
     enableImagemagick = true;
-    home = "/mnt/zraw/nextcloud";
+    home = "/mnt/zenc/nextcloud";
     hostName = "cloud.kittywit.ch";
     autoUpdateApps = {
       enable = true;

config/tf

@@ -1 +1 @@
-Subproject commit 84b1742d36714279de336e2bee37848d0b3b6de8
+Subproject commit bb2c466204d46307e3e374a526268c37ca4f7839

config/users/kat/default.nix

@@ -33,6 +33,22 @@ dirImports // {
       personal
     ];
   };
+  guiBase = {
+    imports = with dirImports; [
+      gui
+      dev
+      media
+      personal
+    ];
+  };
+  guiFlavour = flavour: {
+    imports = (with dirImports; [
+      gui
+      dev
+      media
+      personal
+    ]) ++ [ dirImports.${flavour} ];
+  };
   guiFull = {
     imports = with dirImports; [
       gui

config/users/kat/gnome/gnome.nix

@@ -0,0 +1,6 @@
+{ config, lib, pkgs, ... }: {
+  home.packages = [ pkgs.pinentry-gnome pkgs.adapta-gtk-theme pkgs.papirus-icon-theme ];
+  services.gpg-agent = {
+    pinentryFlavor = lib.mkForce "gnome3";
+  };
+}

config/users/kat/gui/gtk.nix

@@ -2,14 +2,14 @@
 
 {
   gtk = {
-    enable = true;
+    enable = false;
     iconTheme = {
       name = "Papirus-Dark";
       package = pkgs.papirus-icon-theme;
     };
     theme = {
-      name = "Adementary-dark";
-      package = pkgs.adementary-theme;
+      name = "Adapta";
+      package = pkgs.adapta-gtk-theme;
     };
   };
 }

config/users/kat/gui/konawall.nix

@@ -10,7 +10,7 @@ with lib;
     commonTags = [ "width:>=1600" ];
     tagList = map (toList) [
       (["score:>=50"
-      "touhou"]) #++ optional (nixos.networking.hostName == "koishi") "rating:s")
+      "touhou" "rating:s"]) #++ optional (nixos.networking.hostName == "koishi") "rating:s")
     ];
   };
 }

config/users/kat/media/obs.nix

@@ -3,7 +3,7 @@
 {
   programs.obs-studio = {
     enable = true;
-    package = pkgs.obs-studio-pipewire;
+    package = pkgs.obs-studio;
     plugins = [ pkgs.obs-studio-plugins.wlrobs ];
   };
 }

config/users/kat/personal/email.nix

@@ -14,7 +14,7 @@
       neovim.plugins = [ pkgs.vimPlugins.notmuch-vim ];
     };
 
-    services.imapnotify.enable = true;
+    services.imapnotify.enable = false;
 
     accounts.email = {
       maildirBasePath = "${config.home.homeDirectory}/mail";

config/users/kat/personal/gpg.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ pinentry.gtk2 ];
+  home.packages = lib.mkIf (config.services.gpg-agent.pinentryFlavor == "gtk2") (with pkgs; [ pinentry.gtk2 ]);
   services.gpg-agent = {
     enable = true;
     enableExtraSocket = true;

config/users/kat/personal/packages.nix

@@ -2,7 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    pinentry.gtk2
     borgbackup
   ];
 }