From 1863240cd61f5319584b89ebc23716480a5ea8ce Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Sat, 26 Oct 2024 01:51:22 +0200
Subject: [PATCH] chore: various stuff

---
 .pre-commit-config.yaml   |  8 ++++----
 home/hyprland/default.nix |  2 +-
 home/sway/default.nix     |  2 +-
 hosts/brontes/default.nix |  1 -
 hosts/brontes/home.nix    |  2 +-
 hosts/marr/default.nix    |  2 +-
 hosts/shan/default.nix    | 15 +++++++++++++++
 modules/programs/sway.nix | 16 +---------------
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ea5cb00..39bcbf1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
     rev: v8.18.2
     hooks:
       - id: gitleaks
-        stages: [commit]
+        stages: [pre-commit]
 
   - repo: local
     hooks:
@@ -17,7 +17,7 @@ repos:
         language: system
         files: .*\.nix$
         args: [-c]
-        stages: [commit]
+        stages: [pre-commit]
 
       - id: prettier
         name: Check css, scss, js, ts and yaml formatting
@@ -25,7 +25,7 @@ repos:
         language: system
         files: .*\.(css|scss|js|ts|yaml)$
         args: [-c]
-        stages: [commit]
+        stages: [pre-commit]
 
       - id: typos
         name: Check for typos
@@ -33,4 +33,4 @@ repos:
         language: system
         files: .*
         exclude: .*\.(png|jpg|jpeg|age)
-        stages: [commit]
+        stages: [pre-commit]
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index c180e2a..3671acb 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -21,7 +21,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
 
       exec-once = [
         "${pkgs.nextcloud-client}/bin/nextcloud --background"
-        "${pkgs.kdeconnect}/bin/kdeconnect-indicator"
+        "${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator"
         "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"
 
         # keepassxc ignores themeing and doesnt show up in system tray otherwise
diff --git a/home/sway/default.nix b/home/sway/default.nix
index 6ec33e1..bee7638 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -117,7 +117,7 @@ lib.mkIf osConfig.programs.sway.enable {
         #: Startup {{{
         startup = [
           { command = "${pkgs.nextcloud-client}/bin/nextcloud --background"; }
-          { command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
+          { command = "${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator"; }
           { command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
           {
             command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}";
diff --git a/hosts/brontes/default.nix b/hosts/brontes/default.nix
index e68d5cb..c7dc120 100644
--- a/hosts/brontes/default.nix
+++ b/hosts/brontes/default.nix
@@ -77,7 +77,6 @@
     firefox.enable = true;
     thunderbird.enable = true;
     sway.enable = true;
-    hyprland.enable = true;
   };
 
   security.polkit.enable = true;
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index 5cc4c16..ad54261 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -40,7 +40,7 @@
 
       packages = with pkgs; [
         keepassxc
-        kdeconnect
+        kdePackages.kdeconnect-kde
         nextcloud-client
         digikam
         fragments
diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index 1edf32a..bf23d10 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -159,7 +159,7 @@
   environment.systemPackages = with pkgs; [
     shared-mime-info
     nextcloud-client
-    kdeconnect
+    kdePackages.kdeconnect-kde
     glib
     wireguard-tools
     dconf
diff --git a/hosts/shan/default.nix b/hosts/shan/default.nix
index 35710e3..302aa11 100644
--- a/hosts/shan/default.nix
+++ b/hosts/shan/default.nix
@@ -10,6 +10,10 @@
     ./adguard.nix
   ];
 
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/cc568199-7a9b-4aa2-83f8-2a63982ff4f1"; }
+  ];
+
   age.secrets = {
     navidrome.file = ../../secrets/navidrome.age;
     adguard-dns-list = {
@@ -139,6 +143,17 @@
     };
   };
 
+  #  security.acme = {
+  #certs = {
+  #"ccnlc.eu" = {
+  #dnsProvider = "ovh";
+  #dnsResolver = "9.9.9.9";
+  #extraDomainNames = [ "*.ccnlc.eu" ];
+  #environmentFile = "/var/secrets/ovh-ccnlc";
+  #};
+  #};
+  #};
+
   fileSystems = {
     "/mnt/shows" = {
       device = "192.168.178.21:/mnt/Fort/data/shows";
diff --git a/modules/programs/sway.nix b/modules/programs/sway.nix
index 599309c..3668ff1 100644
--- a/modules/programs/sway.nix
+++ b/modules/programs/sway.nix
@@ -1,20 +1,6 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
+{ config, lib, ... }:
 lib.mkIf config.programs.sway.enable {
   programs.sway = {
     wrapperFeatures.gtk = true;
-    extraPackages = with pkgs; [
-      waybar
-      grim
-      slurp
-      wl-clipboard
-      swaybg
-      swaylock
-      swayidle
-    ];
   };
 }