syncing my things

7 files changed, 106 insertions, 75 deletions

diff --git a/modules/core.nix b/modules/core.nix
index 598dbe6..99a4a30 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -19,9 +19,9 @@
   documentation.dev.enable = true;
   environment.systemPackages = with pkgs; [
     kakoune
-	  # useful reference manuals
-	  man-pages
-	  man-pages-posix
+    # useful reference manuals
+    man-pages
+    man-pages-posix
   ];
 
   hardware.enableRedistributableFirmware = true;
@@ -51,7 +51,10 @@
     users.rosa = {
       enable = lib.mkDefault false;
       description = "Rosa";
-      extraGroups = [ "input" "wheel" ];
+      extraGroups = [
+        "input"
+        "wheel"
+      ];
       isNormalUser = true;
       openssh.authorizedKeys.keyFiles = [ ../.ssh/id_rosa.pub ];
     };
diff --git a/modules/user/default.nix b/modules/user/default.nix
index 4b9c6f7..cb685ee 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -4,6 +4,7 @@
     ./desktop
     ./editors
     ./git.nix
+    ./syncthing.nix
     ./zsh
   ];
 
diff --git a/modules/user/desktop/apps/waybar/default.nix b/modules/user/desktop/apps/waybar/default.nix
index 844c0f7..2c68fd5 100644
--- a/modules/user/desktop/apps/waybar/default.nix
+++ b/modules/user/desktop/apps/waybar/default.nix
@@ -16,7 +16,10 @@
 
       backlight = {
         format = "{icon}";
-        format-icons = [ "" "󰖨" ];
+        format-icons = [
+          ""
+          "󰖨"
+        ];
         tooltip-format = "{percent}%";
       };
 
@@ -73,7 +76,11 @@
 
       wireplumber = {
         format = "{icon}";
-        format-icons = [ "󰕿" "󰖀" "󰕾" ];
+        format-icons = [
+          "󰕿"
+          "󰖀"
+          "󰕾"
+        ];
         format-muted = "󰝟";
         tooltip-format = "{node_name} ({volume}%)";
       };
diff --git a/modules/user/desktop/sessions/sway.nix b/modules/user/desktop/sessions/sway.nix
index 1ff9b98..4f7aae5 100644
--- a/modules/user/desktop/sessions/sway.nix
+++ b/modules/user/desktop/sessions/sway.nix
@@ -158,7 +158,9 @@
             mod = config.wayland.windowManager.sway.config.modifier;
             scripts = {
               screenshot = pkgs.writeShellScript "screenshot" (builtins.readFile ../scripts/screenshot.sh);
-              switchkbdlayout = pkgs.writeShellScript "switchkbdlayout" (builtins.readFile ../scripts/switchkbdlayout.sh);
+              switchkbdlayout = pkgs.writeShellScript "switchkbdlayout" (
+                builtins.readFile ../scripts/switchkbdlayout.sh
+              );
             };
             terminal = "${pkgs.foot}/bin/foot";
           in
diff --git a/modules/user/editors/kakoune/default.nix b/modules/user/editors/kakoune/default.nix
index fa2132b..a728d7d 100644
--- a/modules/user/editors/kakoune/default.nix
+++ b/modules/user/editors/kakoune/default.nix
@@ -1,76 +1,76 @@
 {
-	config,
-	lib,
-	options,
-	pkgs,
-	...
+  config,
+  lib,
+  options,
+  pkgs,
+  ...
 }:
 {
-	config.programs.kakoune = lib.mkIf config.editors.kakoune.enable {
-		enable = true;
-		colorSchemePackage = pkgs.kakounePlugins.kakoune-catppuccin;
-		config = {
-			alignWithTabs = true;
-			colorScheme = "catppuccin_mocha";
-			hooks = [
-				{
-					commands = "set window tabstop 2";
-					group = "set-indentwidth";
-					name = "WinSetOption";
-					option = "filetype=(nix)";
-				}
-				{
-					commands = "lsp-enable-window";
-					name = "WinSetOption";
-					option = "filetype=(css|html|java|zig)";
-				}
-				{
-					commands = "set window filetype json";
-					name = "WinCreate";
-					option = ".*\.mcmeta";
-				}
-			];
+  config.programs.kakoune = lib.mkIf config.editors.kakoune.enable {
+    enable = true;
+    colorSchemePackage = pkgs.kakounePlugins.kakoune-catppuccin;
+    config = {
+      alignWithTabs = true;
+      colorScheme = "catppuccin_mocha";
+      hooks = [
+        {
+          commands = "set window tabstop 2";
+          group = "set-indentwidth";
+          name = "WinSetOption";
+          option = "filetype=(nix)";
+        }
+        {
+          commands = "lsp-enable-window";
+          name = "WinSetOption";
+          option = "filetype=(css|html|java|zig)";
+        }
+        {
+          commands = "set window filetype json";
+          name = "WinCreate";
+          option = ".*\.mcmeta";
+        }
+      ];
 
-			indentWidth = 0;
-			keyMappings = [
-				{
-					docstring = "Open a new window";
-					effect = ":new<ret>";
-					key = "<c-w>";
-					mode = "normal";
-				}
-				{
-					docstring = "Open a new file";
-					effect = ":e %sh{${pkgs.fd}/bin/fd -tf | fuzzel --prompt=\"open: \" --dmenu --minimal-lines --width=60}<ret>";
-					key = "<c-o>";
-					mode = "normal";
-				}
-				{
-					docstring = "Comment the selected line(s)";
-					effect = ":comment-line<ret>";
-					key = "<c-a-c>";
-					mode = "normal";
-				}
-			];
+      indentWidth = 0;
+      keyMappings = [
+        {
+          docstring = "Open a new window";
+          effect = ":new<ret>";
+          key = "<c-w>";
+          mode = "normal";
+        }
+        {
+          docstring = "Open a new file";
+          effect = ":e %sh{${pkgs.fd}/bin/fd -tf | fuzzel --prompt=\"open: \" --dmenu --minimal-lines --width=60}<ret>";
+          key = "<c-o>";
+          mode = "normal";
+        }
+        {
+          docstring = "Comment the selected line(s)";
+          effect = ":comment-line<ret>";
+          key = "<c-a-c>";
+          mode = "normal";
+        }
+      ];
 
-			numberLines = {
-				enable = true;
-				highlightCursor = true;
-				relative = true;
-			};
+      numberLines = {
+        enable = true;
+        highlightCursor = true;
+        relative = true;
+      };
 
-			tabStop = 4;
-			ui.assistant = "cat";
-		};
+      tabStop = 4;
+      ui.assistant = "cat";
+    };
 
-	defaultEditor = true;
-	extraConfig = builtins.readFile ./kakrc;
-		plugins = with pkgs.kakounePlugins; [
-			auto-pairs-kak
-			kakoune-extra-filetypes
-		kakoune-lsp
-		];
-	};
+    defaultEditor = true;
+    extraConfig = builtins.readFile ./kakrc;
+    plugins = with pkgs.kakounePlugins; [
+      auto-pairs-kak
+      kakoune-extra-filetypes
+      kakoune-lsp
+    ];
+  };
 
-	options.editors.kakoune.enable = lib.mkEnableOption "rosa's kakoune setup";
+  options.editors.kakoune.enable = lib.mkEnableOption "rosa's kakoune setup";
 }
diff --git a/modules/user/syncthing.nix b/modules/user/syncthing.nix
new file mode 100644
index 0000000..e719672
--- /dev/null
+++ b/modules/user/syncthing.nix
@@ -0,0 +1,18 @@
+{ config, ... }:
+{
+  services.syncthing.settings = {
+    devices = {
+      angel = {
+        addresses = [ "tcp://10.6.6.2:22000" ];
+        id = "DN6TIYA-X4BUO4M-4VQKZFO-NP2QYNY-NRNXE4S-QT6WTNK-FW4ZASY-2GJ3QAZ";
+      };
+    };
+
+    folders = {
+      "/home/rosa/Documents/Security" = {
+        devices = [ "angel" ];
+        id = "passwords_and_such";
+      };
+    };
+  };
+}
diff --git a/modules/user/zsh/default.nix b/modules/user/zsh/default.nix
index e77ce83..3d52279 100644
--- a/modules/user/zsh/default.nix
+++ b/modules/user/zsh/default.nix
@@ -23,7 +23,7 @@
       loginExtra = builtins.readFile ./zlogin.zsh;
       setOptions = [ "extendedglob" ];
       shellAliases = {
-	      k = "kak";
+        k = "kak";
       };
 
       syntaxHighlighting.enable = true;