diff --git a/dotfiles b/dotfiles index 4864c2d..f7bb64d 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 4864c2d85524ed6ba933fa1da92f587dfc6efd58 +Subproject commit f7bb64db27919ddb10f3960c09fe51aa84688a37 diff --git a/flake.lock b/flake.lock index 54fc770..cd62321 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1696063111, - "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=", + "lastModified": 1696145345, + "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01", + "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 1fb90d2..ce8c6a1 100644 --- a/home.nix +++ b/home.nix @@ -3,6 +3,7 @@ { home.packages = with pkgs; [ bemenu + dmenu # dmenu_path for bemenu ffmpeg firefox-wayland fzf @@ -14,13 +15,13 @@ htop kanshi kitty - libnotify + libnotify # for mako libreoffice megatools mpv networkmanagerapplet nnn - nodejs + obsidian pass pavucontrol pinentry-qt diff --git a/hosts/workstation.nix b/hosts/workstation.nix index 55ad958..4fa7aba 100644 --- a/hosts/workstation.nix +++ b/hosts/workstation.nix @@ -102,4 +102,24 @@ options = "--delete-older-than 30d"; }; + services.syncthing = { + enable = true; + user = "dm"; + dataDir = "/home/dm/documents"; + configDir = "/home/dm/documents/.config/syncthing"; + overrideDevices = true; # overrides any devices added or deleted through the WebUI + overrideFolders = true; # overrides any folders added or deleted through the WebUI + settings = { + devices = { + "phone" = { id = "P6ZJ5WK-SBKAYYS-IYBBA37-ARCGHFA-3JJVOLH-2B3PO57-GA3EQKZ-ULWDQAV"; }; + }; + folders = { + "notes" = { # Name of folder in Syncthing, also the folder ID + path = "/home/dm/documents/notes"; # Which folder to add to Syncthing + devices = [ "phone" ]; # Which devices to share the folder with + }; + }; + }; + }; + }