From 75a50069699e6305c7a2aaa67f63cae8fb3c77d7 Mon Sep 17 00:00:00 2001 From: sioodmy Date: Mon, 4 Dec 2023 00:36:26 +0100 Subject: [PATCH] feat: syncthing and stuff --- flake.lock | 266 ++++++++++++++++----------------- flake.nix | 2 +- home/impermanence.nix | 3 +- home/misc/default.nix | 1 - home/misc/schizofox.nix | 42 +++--- home/misc/syncthing.nix | 5 - home/packages.nix | 3 +- home/rice/hyprland/config.nix | 2 +- home/rice/hyprland/default.nix | 93 ++++++------ secrets/secrets.nix | 13 +- secrets/syncthing-cert.age | Bin 0 -> 1809 bytes secrets/syncthing-key.age | Bin 0 -> 1346 bytes system/core/default.nix | 1 + system/core/nix.nix | 13 +- system/core/syncthing.nix | 59 ++++++++ system/wayland/default.nix | 1 + 16 files changed, 280 insertions(+), 224 deletions(-) delete mode 100644 home/misc/syncthing.nix create mode 100644 secrets/syncthing-cert.age create mode 100644 secrets/syncthing-key.age create mode 100644 system/core/syncthing.nix diff --git a/flake.lock b/flake.lock index 462fac5e..78d8be4e 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1696926085, - "narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=", + "lastModified": 1701342983, + "narHash": "sha256-5EPBbhk9u0dk2MAUZ3KVTifHgdYAkKIwoDX26936Ubg=", "owner": "Kirottu", "repo": "anyrun", - "rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216", + "rev": "872984a6c9aceac64d9be24a3c6c4b65bcd3d746", "type": "github" }, "original": { @@ -120,6 +120,28 @@ "type": "github" } }, + "crane_3": { + "inputs": { + "nixpkgs": [ + "schizofox", + "searx-randomizer", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701386725, + "narHash": "sha256-w4aBlMYh9Y8co1V80m5LzEKMijUJ7CBTq209WbqVwUU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b9bad9b30bd7a9ed08782e64846b7485f9d0a38", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "cryptorun": { "inputs": { "flake-utils": "flake-utils", @@ -342,24 +364,6 @@ } }, "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1698579227, - "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f76e870d64779109e41370848074ac4eaa1606ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixpak", @@ -380,7 +384,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -590,11 +594,11 @@ ] }, "locked": { - "lastModified": 1699381651, - "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", + "lastModified": 1701009247, + "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", + "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", "type": "github" }, "original": { @@ -610,11 +614,11 @@ ] }, "locked": { - "lastModified": 1700847865, - "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -654,11 +658,11 @@ ] }, "locked": { - "lastModified": 1697662575, - "narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=", + "lastModified": 1701433070, + "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3433206e51766b4164dad368a81325efbf343fbe", + "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", "type": "github" }, "original": { @@ -674,11 +678,11 @@ ] }, "locked": { - "lastModified": 1700499713, - "narHash": "sha256-1+0EXzRXcHn3Zqy8+kdcHClDJR181sqGBRp0xVoedEA=", + "lastModified": 1700963402, + "narHash": "sha256-JhkanLmYRLekGOysO6JpCWKPlgRoemHPzUrARCGBqYA=", "owner": "hyprwm", "repo": "contrib", - "rev": "11bbb96e44818f67e5259c1788231f30fe5fe2e7", + "rev": "65e567a81176d39be7ce6513d1af23954f00cbec", "type": "github" }, "original": { @@ -698,11 +702,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1700934998, - "narHash": "sha256-85TggoP7zfZJfo7nN6n9IxsS4XXS7XSJRVCQOtfS88Q=", + "lastModified": 1701370414, + "narHash": "sha256-Q7A8BWWS1YndiNaAKM0IP73SGKJiQDfOdZAIdTLGNj8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b281d8647a557f51977c25cb6c0d2f818fe4e4e4", + "rev": "b394c1695c05cf3b2133a473aa459d4cd750911b", "type": "github" }, "original": { @@ -809,11 +813,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1700811440, - "narHash": "sha256-wrJpW3JCJ9egZpYUMne4c3PFEp+vmkTj5VFpPAT4xdY=", + "lastModified": 1701284014, + "narHash": "sha256-k/7fo0a/G8T6NYtIFTv1MPE9oxiLeiXONgvWfGmkeOs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "cbafc8f8fe388fba6f2c27224276f5f984f9ae47", + "rev": "43582b56cfd104e5944d38166839d10c7a0d292f", "type": "github" }, "original": { @@ -825,14 +829,14 @@ "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1700395747, - "narHash": "sha256-pzLYZGK34vhAFfyAJjcZYX3BK0Ap/QY/rd8B6Q30tHo=", + "lastModified": 1701000511, + "narHash": "sha256-ISihdFB0FlIk5d5tdyqL+61o0by0p1ugA9w5c8qQtFM=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "474538707da35589543af5a1c8c31f9978841add", + "rev": "565fa4f33c785158e3effe4fee3cd9b143d5761d", "type": "github" }, "original": { @@ -896,18 +900,16 @@ }, "nh": { "inputs": { - "flake-parts": "flake-parts_4", - "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1698826948, - "narHash": "sha256-Th05oofIIhsN2bmJNsb0Xev3+RJgtk8stjHZX9EdWA0=", + "lastModified": 1701344951, + "narHash": "sha256-F0jd1tbSFreIpxNGtqVCxzUHKdSxjKLl2XFZPiz83zY=", "owner": "viperML", "repo": "nh", - "rev": "23d21975231d569afbe3973eb19d955c650f8f08", + "rev": "c192a4a937ed3ab974e14c09b90092b226188281", "type": "github" }, "original": { @@ -918,17 +920,17 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1700459485, - "narHash": "sha256-vHE+wNz3o0ygEY/XIC4XrQq18DlC6Ek7zu8tSdUbVzk=", + "lastModified": 1701195091, + "narHash": "sha256-8v4Pr7DOfyOv9xBxaAHj+1qbej4+nUlThUGosNxKXGU=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "575ca7a957cfd49f3e82c5434ac8029e2e6519d3", + "rev": "608089054e7cf4e86b218375aaecbb2ca80c9e67", "type": "github" }, "original": { @@ -937,21 +939,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1694857738, - "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -981,11 +968,11 @@ ] }, "locked": { - "lastModified": 1700363379, - "narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=", + "lastModified": 1700968077, + "narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "27920146e671a0d565aaa7452907383be14d8d82", + "rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07", "type": "github" }, "original": { @@ -1003,11 +990,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1700687412, - "narHash": "sha256-XJ/qOgzABDeSQnJkNfkg7AFVpdHnAvbxQtX6DEd57RA=", + "lastModified": 1700941252, + "narHash": "sha256-2c8miJcsG24YEtXOSjvgW0ES1ND5DpY+ymGPq3S56YE=", "owner": "privatevoid-net", "repo": "nix-super", - "rev": "4f4d3a538eb78a8232bc4cb4c9df6747a6703b2a", + "rev": "c076362db8b438c921d9bbe196ede50205f788c6", "type": "github" }, "original": { @@ -1018,11 +1005,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1700559156, - "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=", + "lastModified": 1701250978, + "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb", + "rev": "8772491ed75f150f02552c60694e1beff9f46013", "type": "github" }, "original": { @@ -1033,18 +1020,18 @@ }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1700914353, - "narHash": "sha256-fNza2ijVR3COgQG12+g6IJezPyzwK4EC58+tgSIPH4U=", + "lastModified": 1701312151, + "narHash": "sha256-3OruwXBf5K9h370NSTDI62pBU90KLMcSgA5ErZN0ywc=", "owner": "nixpak", "repo": "nixpak", - "rev": "d81b8685a3e5ab64669fbf79144a3160789f3b73", + "rev": "6ad4d5e8a7f4cb9ad7cbf6a10e40ca21ecde4eea", "type": "github" }, "original": { @@ -1071,29 +1058,11 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1700354803, - "narHash": "sha256-kJYhswYp1XMdpI2p/2oRcZxvwW83e64r1av/9zypFLU=", + "lastModified": 1700959576, + "narHash": "sha256-2hoFXToIiGdPzVKKUEUhNuWAvSb0lOfdCvhHhISvb7I=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "07e160fb6ad2c4bcabecd43425ebaaa4336c5da2", + "rev": "d00d4561f0601ff5aaacff6d4882513e379ca873", "type": "github" }, "original": { @@ -1160,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1700932374, - "narHash": "sha256-ZCweuFpbcEeNkNnsxwjMbSrNLNN2Hk+dwif+eXBjFog=", + "lastModified": 1701226630, + "narHash": "sha256-7Mkgcr8icaOn41Uo+q44aKQ4fRXAgStKHPGUtEUoP5k=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "dbe4afaf1de500be6da94f7f15717f778bdd491f", + "rev": "1706d0acb842839a013aad5a7d82409e411ce2a5", "type": "github" }, "original": { @@ -1175,11 +1144,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1701068326, + "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "type": "github" }, "original": { @@ -1191,11 +1160,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1700444282, - "narHash": "sha256-s/+tgT+Iz0LZO+nBvSms+xsMqvHt2LqYniG9r+CYyJc=", + "lastModified": 1701045352, + "narHash": "sha256-iWsDbWzBP4gotkRfg/lH2A3O9wFoJc+yVO8CDuHLRe8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f21a22b5aafefa1845dec6f4a378a8f53d8681c", + "rev": "5171694860f185961daff3b1b413dabcab421300", "type": "github" }, "original": { @@ -1224,11 +1193,11 @@ "nmd": { "flake": false, "locked": { - "lastModified": 1687627428, - "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=", + "lastModified": 1701431551, + "narHash": "sha256-5HPHG1u3koaWHG/TXHl5/YxYPYOuKc58104btrD8ypE=", "owner": "~rycee", "repo": "nmd", - "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff", + "rev": "f18defadcc25e69e95b04493ee02682005472255", "type": "sourcehut" }, "original": { @@ -1356,11 +1325,11 @@ ] }, "locked": { - "lastModified": 1700878361, - "narHash": "sha256-O30hSOliHJhSdhZw5T8JFtxlL309mNLI+agYffuccIo=", + "lastModified": 1701310566, + "narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0309d58c91c57e8d519de68312430074de3ef5f8", + "rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff", "type": "github" }, "original": { @@ -1383,17 +1352,48 @@ "nixpkgs" ], "nmd": "nmd", + "searx-randomizer": "searx-randomizer", "wavefox": "wavefox" }, "locked": { - "lastModified": 1700611706, - "narHash": "sha256-HSMFDBsX3dwQVEFdaRBFEe6F2XmjvA0a58dF/FGRPiA=", - "path": "/home/sioodmy/dev/schizofox", - "type": "path" + "lastModified": 1701464346, + "narHash": "sha256-m5TJ6Um/VViPltvq3dP95DjmXFA/yZv9IvNbHiQ8nb8=", + "owner": "schizofox", + "repo": "schizofox", + "rev": "948eca7b406f0c8c7bee75bb801db3a52785dea6", + "type": "github" + }, + "original": { + "owner": "schizofox", + "ref": "wavefox", + "repo": "schizofox", + "type": "github" + } + }, + "searx-randomizer": { + "inputs": { + "crane": "crane_3", + "flake-parts": [ + "schizofox", + "flake-parts" + ], + "nixpkgs": [ + "schizofox", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701454956, + "narHash": "sha256-9m6QXEka8YUmAnM/o6OpPrPoYHCGFw40lNXV8VMlN24=", + "owner": "schizofox", + "repo": "searx-randomizer", + "rev": "46c41f2ae7107cc541ead1390f4cd6ce06045721", + "type": "github" }, "original": { - "path": "/home/sioodmy/dev/schizofox", - "type": "path" + "owner": "schizofox", + "repo": "searx-randomizer", + "type": "github" } }, "shadower": { @@ -1630,18 +1630,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1700736101, - "narHash": "sha256-1Fh1xf/JX5zFbGIF9LDaffaleG6JDwwwnKby0LyiXEA=", + "lastModified": 1701368958, + "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", "owner": "wlroots", "repo": "wlroots", - "rev": "f1762f428b0ef2989c81f57ea9e810403d34d946", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "f1762f428b0ef2989c81f57ea9e810403d34d946", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" } }, @@ -1652,11 +1652,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1700508250, - "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", + "lastModified": 1701339854, + "narHash": "sha256-BYC0H/p9JtPxnVxQHNdZlb6GKgFAs1F/+FcBHgWsO2g=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", + "rev": "8b2183b3a548700275aa6c9752547bff77de60bd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1be9873b..0de1cac9 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ nix-super.url = "github:privatevoid-net/nix-super"; schizofox = { - url = "github:schizofox/schizofox"; + url = "github:schizofox/schizofox/wavefox"; # url = "path:/home/sioodmy/dev/schizofox"; inputs = { nixpkgs.follows = "nixpkgs"; diff --git a/home/impermanence.nix b/home/impermanence.nix index 9792d07c..95c485b5 100644 --- a/home/impermanence.nix +++ b/home/impermanence.nix @@ -10,6 +10,7 @@ _: { "music" "dev" "docs" + ".keepass" "vids" "other" { @@ -26,8 +27,8 @@ _: { ".cache/tealdeer" ".local/share/distrobox" ".cache/containers" - ".cache/flutter" ".config/syncthing" + ".cache/flutter" ".local/share/PrismLauncher" ".local/share/TelegramDesktop" ".local/share/keyrings" diff --git a/home/misc/default.nix b/home/misc/default.nix index 2a9afa78..a90a34f4 100644 --- a/home/misc/default.nix +++ b/home/misc/default.nix @@ -3,7 +3,6 @@ ./media.nix ./schizofox.nix ./rnnoise.nix - ./syncthing.nix ./swayidle.nix ]; } diff --git a/home/misc/schizofox.nix b/home/misc/schizofox.nix index d80ba5a1..78cf8c37 100644 --- a/home/misc/schizofox.nix +++ b/home/misc/schizofox.nix @@ -4,7 +4,7 @@ package = pkgs.firefox-esr-115-unwrapped; security = { sanitizeOnShutdown = false; - sandbox = false; + sandbox = true; userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0"; }; @@ -12,33 +12,29 @@ background-darker = "181825"; background = "1e1e2e"; foreground = "cdd6f4"; + darkTheme = true; font = "Lexend"; - simplefox.enable = true; + wavefox = { + enable = true; + transparency = "High"; + tabs = { + oneline = "NavBarFirst"; + shadowSaturation = "High"; + }; + menu.density = "Compact"; + }; darkreader.enable = true; }; - - extensions.extraExtensions = { - "webextension@metamask.io".install_url = "https://addons.mozilla.org/firefox/downloads/latest/ether-metamask/latest.xpi"; - }; search = { - defaultSearchEngine = "Google"; + searx-randomizer = { + enable = true; + instances = ["searx.be" "search.notashelf.dev" "searx.tiekoetter.com" "opnxng.com"]; + }; + defaultSearchEngine = "Searx"; removeEngines = ["Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia"]; - addEngines = [ - { - Name = "LibreY"; - Description = "femboy search :3"; - Alias = "!ly"; - Method = "GET"; - URLTemplate = "https://search.ahwx.org/search.php?q={searchTerms}&p=0&t=0"; - } - { - Name = "Etherscan"; - Description = "Checking balances"; - Alias = "!eth"; - Method = "GET"; - URLTemplate = "https://etherscan.io/search?f=0&q={searchTerms}"; - } - ]; + }; + extensions.extraExtensions = { + "webextension@metamask.io".install_url = "https://addons.mozilla.org/firefox/downloads/latest/ether-metamask/latest.xpi"; }; }; } diff --git a/home/misc/syncthing.nix b/home/misc/syncthing.nix deleted file mode 100644 index 1bf1e96f..00000000 --- a/home/misc/syncthing.nix +++ /dev/null @@ -1,5 +0,0 @@ -{config, ...}: { - services.syncthing = { - enable = true; - }; -} diff --git a/home/packages.nix b/home/packages.nix index c0a7d15f..6bbce1ed 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -12,7 +12,6 @@ postBuild = "wrapProgram $out/bin/ledger-live-desktop --add-flags --use-gl=desktop"; }) inputs.blahaj.packages.${pkgs.system}.default - anytype distrobox gnome.geary cargo-tauri @@ -23,6 +22,8 @@ caprine-bin pulseaudio onefetch + brave + session-desktop pfetch-rs qrcp nheko diff --git a/home/rice/hyprland/config.nix b/home/rice/hyprland/config.nix index 14104d06..acaab7f3 100644 --- a/home/rice/hyprland/config.nix +++ b/home/rice/hyprland/config.nix @@ -319,7 +319,7 @@ in { animation = "fromTop"; }; spotify = { - command = "foot --title scratchpad-spotify -e spt"; + command = "foot --title scratchpad-spotify -e sh -c 'systemctl --user restart spotifyd; sleep 1; spt'"; margin = 50; unfocus = "hide"; animation = "fromTop"; diff --git a/home/rice/hyprland/default.nix b/home/rice/hyprland/default.nix index 9b40a7d3..bb9bb274 100644 --- a/home/rice/hyprland/default.nix +++ b/home/rice/hyprland/default.nix @@ -15,58 +15,57 @@ in { imports = [./config.nix]; home.packages = with pkgs; with inputs.hyprcontrib.packages.${pkgs.system}; - with inputs.xdg-portal-hyprland.packages.${pkgs.system}; - with inputs.hyprpicker.packages.${pkgs.system}; - with inputs.shadower.packages.${pkgs.system}; [ - libnotify - wf-recorder - brightnessctl - xdg-desktop-portal-hyprland - pamixer - python39Packages.requests - slurp - grim - hyprpicker - swappy - grimblast - shadower - hyprpicker - wl-clip-persist - wl-clipboard - pngquant - cliphist - (writeShellScriptBin - "pauseshot" - '' - ${hyprpicker}/bin/hyprpicker -r -z & - picker_proc=$! + # with inputs.xdg-portal-hyprland.packages.${pkgs.system}; + # with inputs.hyprpicker.packages.${pkgs.system}; + # with inputs.shadower.packages.${pkgs.system}; [ + [ + libnotify + wf-recorder + brightnessctl + xdg-desktop-portal-hyprland + pamixer + python39Packages.requests + slurp + grim + hyprpicker + swappy + grimblast + # shadower + hyprpicker + wl-clip-persist + wl-clipboard + pngquant + cliphist + (writeShellScriptBin + "pauseshot" + '' + ${hyprpicker}/bin/hyprpicker -r -z & + picker_proc=$! - ${grimblast}/bin/grimblast save area - + ${grimblast}/bin/grimblast save area - - kill $picker_proc - '') - (pkgs.python3Packages.buildPythonPackage rec { - pname = "pyprland"; - version = "1.4.1"; - src = pkgs.fetchPypi { - inherit pname version; - sha256 = "sha256-JRxUn4uibkl9tyOe68YuHuJKwtJS//Pmi16el5gL9n8="; - }; - format = "pyproject"; - propagatedBuildInputs = with pkgs; [ - python3Packages.setuptools - python3Packages.poetry-core - poetry - ]; - doCheck = false; - }) - ]; + kill $picker_proc + '') + (pkgs.python3Packages.buildPythonPackage rec { + pname = "pyprland"; + version = "1.4.1"; + src = pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-JRxUn4uibkl9tyOe68YuHuJKwtJS//Pmi16el5gL9n8="; + }; + format = "pyproject"; + propagatedBuildInputs = with pkgs; [ + python3Packages.setuptools + python3Packages.poetry-core + poetry + ]; + doCheck = false; + }) + ]; wayland.windowManager.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.system}.default.override { - enableNvidiaPatches = true; - }; + package = inputs.hyprland.packages.${pkgs.system}.default; systemd.enable = true; }; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e80ee851..415e8a2c 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,15 +1,10 @@ -{config, ...}: let +let sioodmy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9ExEl6WqtCI4yCqbSAhAGmzvVp/nYADbgy/Qi4AKQy sioodmy@anthe"; anthe = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3LBESPBY559NbAJ7KL/+K4S5InhWf5YDQgl2XjT5ZxTtPg0x24IDcEmxrPi+7nKSAvMJCkneTfWHPYoRYrNA/G15a+Pqr/9w1EtuK+D054qtz2q+oUM029JdTP/0qzbKxAV/qzUXyJyrgcGRnRYhFRKmg3Sl7G7mxhYN20RIYL3ENXnpfculGrnqX8yONda7YRQfjyEQAsLUIS4aEN7pQsUGO2lGzvXueHcRGRflbatVD59REWoD5kYE984EVhgbky092HHhDR5rIFnFJygrhl9irYk7x6Un98qsvKBeRKzpNMZ1iqs8EFdSbayNdRimooSyFLx83pUhx7SY01cJXxuVmW8Rec9xgnW8rrclz2H+ArQHSZQz/T/QPH2zZgtE3A2xX5HsmQnCu/h7yOpwD6ULTyR8/xK61jHgx4AM1hLyGGrMoPailSXyvT9OGnmXuvcIrx8R2oHy7e48DGWiTHoW8+nltWURkUjdolg373ruLxT+Rqf1JFgPcFwCEVSjVxtTz33ljFD31OOKjs5O2y/9jndwcx54twlgLr+H/6Y1SWIPNeuhNO3IiGuFkH3+JLrQLXVN9UIE1/qHyOIIJpR3ONd4uW6xDsnl8SBZUWuYf468FQGHkinWZxdYdi1SlHbulXxGPTiRjqSUBeR9fB+CND2WJEvfeSJccofk29w== root@anthe"; in { - age.identityPaths = - if config.custom.impermanence.enable - then [ - "/persist/home/sioodmy/.ssh/id_ed25519" - ] - else [ - "/home/sioodmy/.ssh/id_ed25519" - ]; + age.identityPaths = "/persist/home/sioodmy/.ssh/id_ed25519"; "spotify.age".publicKeys = [sioodmy anthe]; + "syncthing-key.age".publicKeys = [sioodmy anthe]; + "syncthing-cert.age".publicKeys = [sioodmy anthe]; } diff --git a/secrets/syncthing-cert.age b/secrets/syncthing-cert.age new file mode 100644 index 0000000000000000000000000000000000000000..87513624359cc7afcebf13d18445e38fe5c6a361 GIT binary patch literal 1809 zcmXxi`%@DK0>E*VdR}u?5vA(XT12UjlxCA`Hi<>-ZeAObY~D|*$Zj6Hd2O=UWD^)g z@p`C0^{!YH@vJ?oFsE1KdMeZdTd)((8GBXQqf*rKP-~^uN5PISuJ^c$Pd@2LJ zVqcVCGBK8-qp#CUK#&shic1R;39{Jd6-gvQd4UGvv=Od=AheK;ad31(EsoQ$hsG_* zFiMMkdQH$0jF-8bItgS#bqOxPUi^62iGB@U=;vlBr8z7I$p;56a+#ZH2 z84X0JIk%EwoE(?dh+G0y!p&o&X*hwwT1i-8B9XAbz~Qi*jf<3!UtY=3YBfKGc~a&u zob(zXn-XKrO<0q#vq%5=W)a`>U20Q58Hjgw3X8WA!CR^!K6kIMO>j6gbS6V zSd}sb&5pDZ2r4;1?9t$M(&cc*!d{MNXCXP`vX`;4N-WJ!(moMQ#c7?X3h^iagg_B1 zV^qfFMoT;quM~h$)FpK>VLl|6%V>Mt>F2?ep$bt;Q=m&p$h3e*??{?uGKrDZQ)Lhn zPDOA#>L{b4a?)FOxnoFrcu zK)tBTua*a_pf3~VSf>WmMM#m&MT;_O#0K&yPNL_ro`?=nVNQ?U8cqOF)yOCqHXS8wGEdAzn23Zk=;h>`(}m$0cMP)t8lEj|G1#I>SCSNn0SJ$Wg$N_8 zlClziSe)T&lQAG;p+UCH=wr0r08wUUJ*WZKurQb=1#p?4hx>y%T<r(y;(`imkk$nb+MwSh7!Qvxk!0%_78)mS5N0w6(9jqoI#%GwonM6GG2m412~zY?UIDis!k-e?hq)7q_wQkqQJmP)TB4_t|Zpm6tnYxWxeT< zk;6m4YnifCRmlgTubbwM7rn z@*`jWWn}kY;<#ktf-Oo7;5~b+;v3cO`LFf!-^u^uU=4F|1wH&}kgFIl?wIv*#TNJB z=iixI5AWRjP=D_6@%40o=khAXpUur)WTBGHvQ<^5e)_(;`n12Vq3g_?`p(b) zTC#G_i-vuT(W`f(_ZHqAjgMb9Otvlxeuo#D2cohmMW1cwB(0BEwms5+uxG*IU8;>U z3t#N+eDM46nKLT334mF|!Qa*XkWhXyI`sT+BPhx)9^q~ucc0Wf+SoqY-2C*bi~A7d zNpa}1G9Ui(=vZCHoNHWmsD0r2;GG(8w%l+lkL%udch$6-jlVhm&kH8$wcHK!4BZU@ z!_lpaikOT0N64E3{}eI&#UA44Q}x-O@9a(04{Vu>h!5v}+u5>uV(P-p)LPMj*^MLc z(D|;$@taGnGqlG_&l20RRN%y%4!6(Q{B}IImK*Ju%&Glgq;D@b|IfQ#dGBifgLCKq zG4Jd*w$3i&+dc0;f^+^fe{f6QZT9=Un$1^`6BtqR!W)q{kG%PCH*)Cp5YgmTRaECX zmPgyO8&0h3%&c*4I#`s-DVUhRkF+=Rd^GUN!h2mmHZ3vsOe-(%Ew8Ry-sit`KOtPa z7Pd9jwrRgAsbjy+o3bQuYIkqZ-{@_vr8!fN=Dy3<{NQZ5_UZnu$#E%ez1Fb)>B`bO z=X?LXtE*_$y^7hl_Vo2{?Hq0SxT*c8mX{VC>Xlr+uwz2`uS?VZ-qNFQyHP(m@3eSz zcGGy<@!S>SOCR5FzP|lgWHZ}ax~~87(uTfe+35p0x@U_@Hmo6sZ%h^BpPV(dHD~oF zMC|3U(+if(E4CF4l^YMz7e>&U&MzirHg@F4cg~q{sbJ|~(|=yN&FfuP(vrSeGnCib z(f9Pb^22q{;BT85GKXFF`KyKJUO14wdVYABzYtub%Ilr{ux<(b>(a~btAE_C%T8|` zmcAA0&zU(N#h)l$;kOPSyajga?{HGd;$!ckHxIAroZmJ OBi$b@`*43rYV5yx$l^`_ literal 0 HcmV?d00001 diff --git a/secrets/syncthing-key.age b/secrets/syncthing-key.age new file mode 100644 index 0000000000000000000000000000000000000000..9347cc8129e84dd3602682ec177b74eb2c98a02f GIT binary patch literal 1346 zcmXxi>yOg}003}^XAA|@goqMJ+y$eMIktA|*7^YYTGy^?*IT=F^8stuwcWF8yLOv` zh=ic1d_fKH0f>;p#7LsXX9$Yu7rclDJx>w?f%BpX5l%o8A~AmOFZg}=RSi9&cQj{c zdserzw(A&C9|R)nLau8@^cn=iAR3~R0n-jbNKYub1!^SvbhAh)`R4zc<5oiu zs-l(%&_NtCVBFO>CoO}ri}%A4o}^-NV_5Fyu&_E|g0Uo4#XF;{G|?Io2oGhUoalronfH?TQ-#tmFP$k2o3MXO)Q)O?NYBx4U0aa zC9lVx5n>iO(QmVLB7Xc`D2K~fttnOL_oNE8*?a+)ol?ONGVBZFp! zY0b;yF2MFjlHcijc)wNAq)G;^RZ9-96_Oc~?UzKNAi!;kpo}(|jk${BXA^3&IgpVO zr;6af>Hvr>X|+NcYlWq(VmX;)inhdV#_MA}nFb|ZQKJ=u4M4S7EK`( zPsBlw2I7G@#FQinb18Zd^AIB`K$O!Rkt|=S720giRvk;Ve2=Q=s@qIwQbwK(f=oec zr#Q0g0WpGVHbB+&S*tpbT^n&3gOi3$6>fF-7)YfuGNRHHUh$d#9=G!0gu6ZyF&w?> z>Y@53G?bQvRY^3IC|RL(naz!Y4&)WQ*thh!Y7v8S+Mx@D4y@P1IilbOy#U6QMz!Uq zD={Bt+x=8sGD*K@mC9kERV~Jn%{(ASdl&^}hjJ`Y?&{%`$yuzW2@SZ#P5_ZeB*d9X zRP4ni1uf}iOU@Y;Hs7#`6zH%c+hl9CD1oVHoJea35dCiZeT#Rp=gp^u)zqo+%`?%b zuJ7dEyi!{-zfL}P=E1~I2WI1Y#x_pl7wywuYrp5GpkJ%|H{Ww=>77r`9X}EI^d`7; z^5Olz1?vYdzqSltv-hDd5A8d7e90469$TFKhn(AYLz$ZSd*ilkmp`~QfBNpBJ~x%pXdyAJ1%m_PN`{g^2L;*tzU82i}gXxV1Zp-@S0|{qHN- zN_)$iAHDI57fx4SAK&oK?n}$z+QF}ujLnUWU)(WEPji!hOv5k!xoHuzYvIhzWrvPj zuRece>ii>D#m=mF?*;hA*1u*SWsj1R+i#LbjXT~T5AS_^YQwJOAFeq3?$sAAU%so) z_Q_Wd9?|QoU#fk(Xchm<{mjaZhdx_y+a>K4?*w*seBU=;oOo|CedeR-J#Wo(pR7N- MW$V60$9~ZM1!J1**#H0l literal 0 HcmV?d00001 diff --git a/system/core/default.nix b/system/core/default.nix index 313c1014..eb8e3e3b 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -7,6 +7,7 @@ ./system.nix ./schizo.nix ./network.nix + ./syncthing.nix ./impermanence.nix ./virtualisation.nix ./nix.nix diff --git a/system/core/nix.nix b/system/core/nix.nix index b38b1278..2bf567b0 100644 --- a/system/core/nix.nix +++ b/system/core/nix.nix @@ -38,6 +38,16 @@ owner = "sioodmy"; group = "users"; }; + age.secrets.syncthing-key = { + file = ../../secrets/syncthing-key.age; + owner = "sioodmy"; + group = "users"; + }; + age.secrets.syncthing-cert = { + file = ../../secrets/syncthing-cert.age; + owner = "sioodmy"; + group = "users"; + }; nh = { enable = true; @@ -62,8 +72,7 @@ "nvidia-x11" "nvidia-settings" # they got fossed recently so idk - "Anytype" - "Anytype-0.35.4" + "Anytype-0.35.25-beta" ]; overlays = [ inputs.nixpkgs-wayland.overlay diff --git a/system/core/syncthing.nix b/system/core/syncthing.nix new file mode 100644 index 00000000..bec73ae7 --- /dev/null +++ b/system/core/syncthing.nix @@ -0,0 +1,59 @@ +{config, ... }: { + networking.firewall.allowedTCPPorts = [8384]; + services.syncthing = let + hm = "/home/sioodmy"; + in { + enable = true; + systemService = true; + user = "sioodmy"; + configDir = "${hm}/.config/syncthing"; + dataDir = "${hm}/.config/syncthing"; + openDefaultPorts = true; + guiAddress = "127.0.0.1:8384"; + overrideDevices = true; + overrideFolders = true; + key = config.age.secrets.syncthing-key.path; + cert = config.age.secrets.syncthing-cert.path; + settings = { + devices = { + "methone" = {id = "FDHPTFD-BJK2ER6-2C4A5DU-5VMUAOF-M4VGKM2-VZJS5IT-KP7ADOQ-UEFJLAU";}; + }; + folders = { + "photos" = { + id = "pixel_7_pro_6dj3-photos"; + path = "${hm}/pics/cam"; + devices = ["methone"]; + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; # 1 hour + maxAge = "1209600"; # 14 days + }; + }; + }; + "keepass" = { + id = "wwm5g-uhgoz"; + path = "${hm}/.keepass"; + devices = ["methone"]; + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; # 1 hour + maxAge = "1209600"; # 14 days + }; + }; + }; + }; + }; + }; + + # credits: Ramblurr + # https://github.com/Ramblurr/nixcfg/blob/7343640bd4f5474eeba3b115424c2b0ccc809858/hosts/unstable/x86_64-linux/quine/syncthing.nix#L103 + # FIX: home-manager impermanence + # when using with home-manager impermanence we need to ensure that home-manager activates before + # syncthing. otherwise the syncthing init will create ~/.config/syncthing, but ~/.config will be created + # with root:root ownership. + systemd.services.syncthing.after = ["home-manager-sioodmy.service"]; + systemd.services.syncthing-init.after = ["home-manager-sioodmy.service"]; + # END FIX: home-manager impermanence +} diff --git a/system/wayland/default.nix b/system/wayland/default.nix index f44f30b9..f8a8cecd 100644 --- a/system/wayland/default.nix +++ b/system/wayland/default.nix @@ -58,6 +58,7 @@ enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-hyprland ]; };