From 64874216242c579661c6f24dceb2f91b7f98f6c7 Mon Sep 17 00:00:00 2001 From: kat witch Date: Tue, 12 Apr 2022 16:09:01 +0100 Subject: [PATCH] Koishi, GNOME 3 --- config/hosts/koishi.nix | 3 +- config/profiles/gnome/gnome.nix | 39 ++++++++++++++++++++++++++ config/services/ha.nix | 3 +- config/services/nextcloud.nix | 2 +- config/tf | 2 +- config/users/kat/default.nix | 16 +++++++++++ config/users/kat/gnome/gnome.nix | 6 ++++ config/users/kat/gui/gtk.nix | 6 ++-- config/users/kat/gui/konawall.nix | 2 +- config/users/kat/media/obs.nix | 2 +- config/users/kat/personal/email.nix | 2 +- config/users/kat/personal/gpg.nix | 2 +- config/users/kat/personal/packages.nix | 1 - 13 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 config/profiles/gnome/gnome.nix create mode 100644 config/users/kat/gnome/gnome.nix diff --git a/config/hosts/koishi.nix b/config/hosts/koishi.nix index d11a32c9..e326d28d 100644 --- a/config/hosts/koishi.nix +++ b/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 ]; diff --git a/config/profiles/gnome/gnome.nix b/config/profiles/gnome/gnome.nix new file mode 100644 index 00000000..ea46585c --- /dev/null +++ b/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 + ]); +} diff --git a/config/services/ha.nix b/config/services/ha.nix index 8cb401f1..5c56e28d 100644 --- a/config/services/ha.nix +++ b/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 ]; } diff --git a/config/services/nextcloud.nix b/config/services/nextcloud.nix index 2e9d021e..30aacaca 100644 --- a/config/services/nextcloud.nix +++ b/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; diff --git a/config/tf b/config/tf index 84b1742d..bb2c4662 160000 --- a/config/tf +++ b/config/tf @@ -1 +1 @@ -Subproject commit 84b1742d36714279de336e2bee37848d0b3b6de8 +Subproject commit bb2c466204d46307e3e374a526268c37ca4f7839 diff --git a/config/users/kat/default.nix b/config/users/kat/default.nix index 1bf5b248..0a5da480 100644 --- a/config/users/kat/default.nix +++ b/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 diff --git a/config/users/kat/gnome/gnome.nix b/config/users/kat/gnome/gnome.nix new file mode 100644 index 00000000..2a148014 --- /dev/null +++ b/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"; + }; +} diff --git a/config/users/kat/gui/gtk.nix b/config/users/kat/gui/gtk.nix index 0c82172d..1ed2063e 100644 --- a/config/users/kat/gui/gtk.nix +++ b/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; }; }; } diff --git a/config/users/kat/gui/konawall.nix b/config/users/kat/gui/konawall.nix index 2d3ae6c2..8efd7b13 100644 --- a/config/users/kat/gui/konawall.nix +++ b/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") ]; }; } diff --git a/config/users/kat/media/obs.nix b/config/users/kat/media/obs.nix index d97d9cd7..28ced6f3 100644 --- a/config/users/kat/media/obs.nix +++ b/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 ]; }; } diff --git a/config/users/kat/personal/email.nix b/config/users/kat/personal/email.nix index f2d461d5..1a7551c0 100644 --- a/config/users/kat/personal/email.nix +++ b/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"; diff --git a/config/users/kat/personal/gpg.nix b/config/users/kat/personal/gpg.nix index 6936e1a4..acc60268 100644 --- a/config/users/kat/personal/gpg.nix +++ b/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; diff --git a/config/users/kat/personal/packages.nix b/config/users/kat/personal/packages.nix index 3f112c25..6049860f 100644 --- a/config/users/kat/personal/packages.nix +++ b/config/users/kat/personal/packages.nix @@ -2,7 +2,6 @@ { home.packages = with pkgs; [ - pinentry.gtk2 borgbackup ]; }