From 061e92d763e6d2faf307a2626313a3ad2333dce7 Mon Sep 17 00:00:00 2001 From: beanigen Date: Wed, 19 Feb 2025 21:03:40 +0800 Subject: [PATCH] balls --- flake.lock | 57 +++++++++++----------------------------------- home/default.nix | 2 ++ home/packages.nix | 2 +- home/syncthing.nix | 40 ++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 45 deletions(-) create mode 100644 home/syncthing.nix diff --git a/flake.lock b/flake.lock index 594476f..1908f14 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,12 @@ { "nodes": { - "blender-bin": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1739778001, - "narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=", - "path": "/home/maya/.config/nixos/blender-bin", - "type": "path" - }, - "original": { - "path": "/home/maya/.config/nixos/blender-bin", - "type": "path" - } - }, "catppuccin": { "inputs": { "catppuccin-v1_1": "catppuccin-v1_1", "catppuccin-v1_2": "catppuccin-v1_2", "home-manager": "home-manager", "home-manager-stable": "home-manager-stable", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nuscht-search": "nuscht-search" }, @@ -291,7 +276,7 @@ "nixgl": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1713543440, @@ -309,17 +294,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -351,22 +337,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -381,7 +351,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1736012469, "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", @@ -397,7 +367,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1737370608, "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", @@ -458,7 +428,7 @@ "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nmd": "nmd", "plugin-aerial-nvim": "plugin-aerial-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim", @@ -3302,12 +3272,11 @@ }, "root": { "inputs": { - "blender-bin": "blender-bin", "catppuccin": "catppuccin", "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nvf": "nvf" } }, diff --git a/home/default.nix b/home/default.nix index 0bc9d0b..ed8f813 100644 --- a/home/default.nix +++ b/home/default.nix @@ -8,6 +8,7 @@ ./sway.nix ./theming.nix ./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways + ./syncthing.nix #this is a big block of configuration, really dont feel like cluttering this file more than it already is ]; home = rec { username = vars.user; #this is set in flake.nix @@ -19,6 +20,7 @@ }; }; programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix + targets.genericLinux.enable = (!vars.isNixOS); programs.foot = { enable = true; settings.main.font = "monospace:size=10"; diff --git a/home/packages.nix b/home/packages.nix index c27c70b..22267ad 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -2,8 +2,8 @@ home.packages = with pkgs; [ prismlauncher libgpod + nextcloud-client blender-hip - blender-bin.blender_3_3 libimobiledevice mpc strawberry diff --git a/home/syncthing.nix b/home/syncthing.nix new file mode 100644 index 0000000..50bc155 --- /dev/null +++ b/home/syncthing.nix @@ -0,0 +1,40 @@ +{ + services.syncthing = { + enable = true; + overrideDevices = true; + overrideFolders = true; + settings = { + devices = { + "hypermac" = { id = "XVY5YLM-QETCA4H-KT4XBEH-IR4U47O-CJCJ5YM-DPVWQQX-VHEK4MS-GJCMIQ2"; }; + "adventurer" = { id = "LLKP3BJ-5RBN5KR-63NXUCW-JC4FMAX-QOXTJBK-65OHI7V-OKZQPTD-5FJIIAB"; }; + "callisto" = { id = "NPXGWEK-JP4C2NM-QZZPBYI-ISAXIZK-ORCNVGO-C4GFRHJ-SWWFQGC-F5JAMQC"; }; + "traveler" = { id = "JVNNE3V-IMVW2YL-JKEWUJZ-N5PU4NE-3YQDEU7-77ZHIP3-ADW3LAA-NODOVA3"; }; + }; + folders = { + "General" = { + path = "/home/maya/sync/general"; + devices = [ "callisto" "hypermac" "adventurer" "traveler" ]; + }; + "Music" = { + path = "/home/maya/Music"; + devices = [ "callisto" "hypermac" "adventurer" "traveler" ]; + }; + "College" = { + path = "/home/maya/sync/college"; + devices = [ "callisto" "hypermac" "adventurer" "traveler" ]; + versioning = { + type = "staggered"; + params = { + cleanInterval = "3600"; + maxAge = "15768000"; + }; + }; + }; + "PrusaSlicer" = { + path = "/home/maya/.config/PrusaSlicer"; + devices = [ "callisto" "hypermac" "adventurer" "traveler" ]; + }; + }; + }; + }; +}