From eb60d4d76715ecd5a01efd85ece103af1ac3fe5f Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 4 Dec 2023 06:42:34 +0000 Subject: [PATCH] Remove Ronin from syncthing --- home/hyprland/default.nix | 4 +--- hosts/Ronin/home.nix | 45 ++++++++++++++++++++------------------- services/syncthing.nix | 4 +--- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index cda717f2..0bc2eb71 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -{ +{ config, lib, pkgs, ... }: { home.packages = with pkgs; [ grim slurp discord ]; imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ]; services = { diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix index c98767ac..3268f8e7 100644 --- a/hosts/Ronin/home.nix +++ b/hosts/Ronin/home.nix @@ -1,6 +1,4 @@ -{ config, pkgs, lib, ... }: - -{ +{ lib, ... }: { programs.git.userEmail = "evie.litherland-smith@ukaea.uk"; accounts = { email.accounts = { @@ -13,26 +11,29 @@ outlook.primary = true; }; }; - services.kanshi = { - enable = true; - profiles = { - undocked = { - outputs = [{ - criteria = "eDP-1"; - status = "enable"; - }]; - }; - docked = { - outputs = [ - { - criteria = "Dell Inc. DELL P3223QE CCG8YN3"; - status = "enable"; - } - { + services = { + syncthing.enable = lib.mkForce false; + kanshi = { + enable = true; + profiles = { + undocked = { + outputs = [{ criteria = "eDP-1"; - status = "disable"; - } - ]; + status = "enable"; + }]; + }; + docked = { + outputs = [ + { + criteria = "Dell Inc. DELL P3223QE CCG8YN3"; + status = "enable"; + } + { + criteria = "eDP-1"; + status = "disable"; + } + ]; + }; }; }; }; diff --git a/services/syncthing.nix b/services/syncthing.nix index 8f2c4728..9b36ce51 100644 --- a/services/syncthing.nix +++ b/services/syncthing.nix @@ -1,5 +1,5 @@ { ... }: -let devices = [ "Ion" "Legion" "Northstar" "Ronin" "Vanguard" ]; +let devices = [ "Ion" "Legion" "Northstar" "Vanguard" ]; in { imports = [ ./caddy.nix ]; services.syncthing = { @@ -16,8 +16,6 @@ in { "3SSNCLP-ZZKNS65-7CKKGFY-KJYQU6S-P5BM7SB-MMW5ZLM-TMND6IV-ZMUO4AQ"; "Northstar".id = "DJVVFUX-QRJNEUZ-OVEQ63J-KJIGNY7-O4MEOMH-GDKYHOB-BQES3O4-C3BJHQ2"; - "Ronin".id = - "WNM6YCB-K2ZHB4E-J3A3NFI-DE4QKAD-QCNNYGS-QUTVFOG-NWFHVJQ-CUDXKQD"; "Vanguard".id = "NCJBYBK-JRVFAAN-XO4I5AS-B5L7QD2-5PAMWX7-PHD5FQH-Q2EI32H-U3GF5AA"; };