From 90f053e0275d72986ec268e7bd6b4337bdff90a8 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Sat, 5 Oct 2024 02:21:56 +0200
Subject: [PATCH] chore: various fixes

- clean brontes config file
- fix context menus for nysh
- add adguard id for persistent client
---
 flake.lock                      |  8 ++++----
 hosts/brontes/configuration.nix | 16 +++++++++-------
 hosts/shan/adguard.nix          |  5 ++++-
 options/nysh.nix                |  9 ++++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index e974c3b..2a721a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -455,11 +455,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1727887250,
-        "narHash": "sha256-pdlBPauIA9hpqZAN6A+2KN60v8duoeukONkUbXT2/5Q=",
+        "lastModified": 1728080732,
+        "narHash": "sha256-DCymPOQVlOEYTuBWXwb+XA0U2TYPqxHT8944ikI43qw=",
         "ref": "refs/heads/main",
-        "rev": "05c0df347812c3dc0db21089a47f2da27e119bd2",
-        "revCount": 54,
+        "rev": "ddcbaedce4398689d1f38d09648db7f6cfff0c41",
+        "revCount": 55,
         "type": "git",
         "url": "https://codeberg.org/nydragon/nysh"
       },
diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index f359f30..33a0071 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -26,6 +26,7 @@
     powerKey = "hibernate";
   };
   #: }}}
+
   xdg = {
     portal.enable = true;
     mime.enable = true;
@@ -36,6 +37,10 @@
       wifi.enable = true;
       bluetooth.enable = true;
     };
+
+    services.nysh.enable = true;
+
+    media.enableAll = true;
   };
 
   services = {
@@ -53,6 +58,10 @@
         "https://hs.ccnlc.eu"
       ];
     };
+
+    # Necessary for Nautilus to display trash, DVDs and for gnome-disk-utility to show file systems
+    gvfs.enable = true;
+    gnome.gnome-keyring.enable = true;
   };
 
   programs = {
@@ -86,16 +95,11 @@
     "/etc/ssh/ssh_host_ed25519_key"
   ];
 
-  # Necessary for Nautilus to display trash, DVDs and for gnome-disk-utility to show file systems
-  services.gvfs.enable = true;
-
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
   };
 
-  services.gnome.gnome-keyring.enable = true;
-
   environment.systemPackages = with pkgs; [
     fish
     wireguard-tools
@@ -108,7 +112,5 @@
 
   services.rpcbind.enable = true; # necessary for nfs
 
-  modules.media.enableAll = true;
-
   system.stateVersion = "24.05";
 }
diff --git a/hosts/shan/adguard.nix b/hosts/shan/adguard.nix
index 907e69d..32ea7c9 100644
--- a/hosts/shan/adguard.nix
+++ b/hosts/shan/adguard.nix
@@ -39,7 +39,10 @@ in
               tags = [ "device_pc" ];
             }
             {
-              ids = [ "100.64.0.2" ];
+              ids = [
+                "100.64.0.2"
+                "192.168.178.53"
+              ];
               name = "oneplus9";
               tags = [ "device_phone" ];
             }
diff --git a/options/nysh.nix b/options/nysh.nix
index 1f24e15..d60861c 100644
--- a/options/nysh.nix
+++ b/options/nysh.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib) mkEnableOption mkOption;
+  inherit (lib) mkEnableOption mkOption mkIf;
   inherit (lib.types) package;
   cfg = config.modules.services.nysh;
 in
@@ -18,9 +18,12 @@ in
     };
   };
 
-  config = {
+  config = mkIf cfg.enable {
     systemd.user.services.nysh = {
-      wantedBy = [ "graphical-session.target" ];
+      wantedBy = [
+        "multi-user.target"
+        "graphical-session.target"
+      ];
 
       unitConfig = {
         After = [ "graphical-session-pre.target" ];