diff options
| -rw-r--r-- | flake.lock | 15 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | ivi/ivi.nix | 20 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/events.fnl | 1 | ||||
| -rw-r--r-- | profiles/core/home.nix | 18 | ||||
| -rw-r--r-- | profiles/core/syncthing.nix | 11 |
6 files changed, 41 insertions, 26 deletions
@@ -275,17 +275,14 @@ ] }, "locked": { - "lastModified": 1706833576, - "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", - "type": "github" + "lastModified": 1707601714, + "narHash": "sha256-/IRc56GzSexkZYni1FxyLnr8WRkMvlExFELG7vQekgw=", + "path": "/Users/ivi/nix-darwin", + "type": "path" }, "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" + "path": "/Users/ivi/nix-darwin", + "type": "path" } }, "nixpkgs": { @@ -17,7 +17,7 @@ neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - nix-darwin.url = "github:LnL7/nix-darwin"; + nix-darwin.url = "path:/Users/ivi/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/ivi/ivi.nix b/ivi/ivi.nix index 4be5f03..a10423d 100644 --- a/ivi/ivi.nix +++ b/ivi/ivi.nix @@ -97,12 +97,6 @@ self: lib: with lib; let ]; machines = { - work = { - isDarwin = true; - profiles = [ - "core" - ]; - }; wsl = { isFake = true; profiles = [ @@ -132,6 +126,20 @@ self: lib: with lib; let "station" "email" ]; + syncthing = { + enable = true; + id = ""; + }; + }; + work = { + isDarwin = true; + profiles = [ + "core" + ]; + syncthing = { + enable = true; + id = "GR5MHK2-HDCFX4I-Y7JYKDN-EFTQFG6-24CXSHB-M5C6R3G-2GWX5ED-VEPAQA7"; + }; }; serber = { isServer = true; diff --git a/mut/neovim/fnl/conf/events.fnl b/mut/neovim/fnl/conf/events.fnl index 60ec28b..f6a4227 100644 --- a/mut/neovim/fnl/conf/events.fnl +++ b/mut/neovim/fnl/conf/events.fnl @@ -4,6 +4,7 @@ (local event vim.api.nvim_create_autocmd) +(vim.api.nvim_create_augroup "my" {:clear true}) (vim.api.nvim_create_augroup "conf#events" {:clear true}) (event diff --git a/profiles/core/home.nix b/profiles/core/home.nix index 246e73d..7972a75 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -34,15 +34,15 @@ "x-scheme-handler/msteams" = ["teams.desktop"]; }; }; - desktopEntries = optionalAttrs (!machine.isDarwin) { - text= { type = "Application"; name = "Text editor"; exec = "${pkgs.st}/bin/st -e kak %u"; }; - file = { type = "Application"; name = "File Manager"; exec = "${pkgs.st}/bin/st -e lfub %u"; }; - torrent = { type = "Application"; name = "Torrent"; exec = "${pkgs.coreutils}/bin/env transadd %U"; }; - img = { type = "Application"; name = "Image Viewer"; exec = "${pkgs.sxiv}/bin/sxiv -a %u"; }; - video = { type = "Application"; name = "Video Viewer"; exec = "${pkgs.mpv}/bin/mpv -quiet %f"; }; - mail = { type = "Application"; name = "Mail"; exec = "${pkgs.st}/bin/st -e neomutt %u"; }; - pdf = { type = "Application"; name = "PDF reader"; exec = "${pkgs.zathura}/bin/zathura %u"; }; - rss = { type = "Application"; name = "RSS feed addition"; exec = "${pkgs.coreutils}/bin/env rssadd %u"; }; + desktopEntries = with pkgs; optionalAttrs (!machine.isDarwin) { + text= { type = "Application"; name = "Text editor"; exec = "${st}/bin/st -e kak %u"; }; + file = { type = "Application"; name = "File Manager"; exec = "${st}/bin/st -e lfub %u"; }; + torrent = { type = "Application"; name = "Torrent"; exec = "${coreutils}/bin/env transadd %U"; }; + img = { type = "Application"; name = "Image Viewer"; exec = "${sxiv}/bin/sxiv -a %u"; }; + video = { type = "Application"; name = "Video Viewer"; exec = "${mpv}/bin/mpv -quiet %f"; }; + mail = { type = "Application"; name = "Mail"; exec = "${st}/bin/st -e neomutt %u"; }; + pdf = { type = "Application"; name = "PDF reader"; exec = "${zathura}/bin/zathura %u"; }; + rss = { type = "Application"; name = "RSS feed addition"; exec = "${coreutils}/bin/env rssadd %u"; }; }; }; diff --git a/profiles/core/syncthing.nix b/profiles/core/syncthing.nix index ebccdb4..d735cca 100644 --- a/profiles/core/syncthing.nix +++ b/profiles/core/syncthing.nix @@ -1,5 +1,14 @@ {lib,...}: with lib; { - hm.services.syncthing = { + services.syncthing = { enable = true; + user = ivi.username; + inherit (config.ivi) group; + overrideDevices = true; + overrideFolders = true; + + devices = mapAttrs (_: m: { + inherit (m.syncthing) id; + introducer = m.isServer; + }) (filterAttrs (_: m: m.syncthing.enable) ivi.machines); }; } |