diff --git a/flake.lock b/flake.lock index 5f10d57c..4921ebb3 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1733047432, - "narHash": "sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e30a3622b606dffc622305b4bbe1cfe37e78fa40", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1732988076, - "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1732722421, - "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -133,6 +133,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -195,11 +216,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1732735497, - "narHash": "sha256-qaiRKT4T+kRAMwfFf1fIJ5pwCcaLp2dfNpT65C4uWuE=", + "lastModified": 1733496398, + "narHash": "sha256-zPxsEI6P/RfEbv2STItY3LbXQMdFJQoY5khOIv3oYJM=", "owner": "helix-editor", "repo": "helix", - "rev": "e1d1a5c5a12127ded88dfcf66dd74aad1650977c", + "rev": "fc9968bd4bbc5adbcc35bb2fa40515dbb96a3a36", "type": "github" }, "original": { @@ -216,11 +237,11 @@ ] }, "locked": { - "lastModified": 1732466619, - "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3111f62a23451114433888902a55cf0692b408d", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -233,15 +254,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1720626042, - "narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=", - "rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed", + "lastModified": 1729298361, + "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", + "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" } }, "lix-module": { @@ -256,15 +277,15 @@ ] }, "locked": { - "lastModified": 1720641669, - "narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=", - "rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257", + "lastModified": 1732605668, + "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", + "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" } }, "nil": { @@ -299,11 +320,11 @@ ] }, "locked": { - "lastModified": 1728031945, - "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=", + "lastModified": 1733143273, + "narHash": "sha256-pVogdQb09YrbVyFrzadfF1fseT6W2We4lNKRvWPPHsY=", "owner": "Mic92", "repo": "nix-ld", - "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2", + "rev": "1e17dfe486a0c4dc245f5177a7328930b8392b34", "type": "github" }, "original": { @@ -315,11 +336,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -329,13 +350,29 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-master": { "locked": { - "lastModified": 1733052534, - "narHash": "sha256-fqmu39j1Y0FEhF/KZcGUW9MjAGotAaTfN2gyb1a2LZ0=", + "lastModified": 1733590501, + "narHash": "sha256-yD3MByHtrzxVRF/S9hvZVdIS8Q9W0JoYHMF1fx9THWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10f06c512e429ffd497761a5a49e31ada70e85ca", + "rev": "b7073fc2bd708bac0a0c77dddb3c24ab47096b20", "type": "github" }, "original": { @@ -347,11 +384,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -363,11 +400,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1733052534, - "narHash": "sha256-fqmu39j1Y0FEhF/KZcGUW9MjAGotAaTfN2gyb1a2LZ0=", + "lastModified": 1733590501, + "narHash": "sha256-yD3MByHtrzxVRF/S9hvZVdIS8Q9W0JoYHMF1fx9THWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10f06c512e429ffd497761a5a49e31ada70e85ca", + "rev": "b7073fc2bd708bac0a0c77dddb3c24ab47096b20", "type": "github" }, "original": { @@ -379,11 +416,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -394,12 +431,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1733053581, - "narHash": "sha256-hD/2NwEniVcvRbF8Yo+NTkDnMFYzmcoqIQQ7XeFQL8Y=", + "lastModified": 1733589916, + "narHash": "sha256-ZHjk/6caiSypWWPeN0PhRhDpgwvB36f2aLZYOtfBlzo=", "owner": "nix-community", "repo": "NUR", - "rev": "22a702207667b663fb1e31720457daade0580312", + "rev": "8b6de353ee0f4cb1d12fae5abf0b3003c51677c0", "type": "github" }, "original": { @@ -409,6 +451,22 @@ "type": "github" } }, + "resilio3": { + "locked": { + "lastModified": 1734371922, + "narHash": "sha256-7iRhDzfChXowG1xQ0hsg0gi1Y33EaMfTsN2k6RWE37I=", + "owner": "cyplo", + "repo": "nixpkgs", + "rev": "4ca49d35b584e73b77cb4e496298729c1c3d2a7f", + "type": "github" + }, + "original": { + "owner": "cyplo", + "ref": "4ca49d35b584e73b77cb4e496298729c1c3d2a7f", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "alejandra": "alejandra", @@ -428,6 +486,7 @@ "nixpkgs-rust-analyzer": "nixpkgs-rust-analyzer", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", + "resilio3": "resilio3", "sops": "sops" } }, @@ -497,11 +556,11 @@ ] }, "locked": { - "lastModified": 1732575825, - "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { @@ -525,6 +584,27 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5f15167f..e4de8802 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,7 @@ nixpkgs-rust-analyzer, nixpkgs-stable, nur, + resilio3, self, sops, } @ inputs: let @@ -110,6 +111,7 @@ disko.nixosModules.disko nix-ld.nixosModules.nix-ld {programs.nix-ld.dev.enable = true;} + {nixpkgs.config.allowUnfree = true;} home-manager.nixosModules.home-manager { home-manager = { @@ -125,6 +127,10 @@ ]; specialArgs = { inherit inputs system; + resilio3 = import resilio3 { + inherit system; + config = {allowUnfree = true;}; + }; nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable { inherit system; config = {allowUnfree = true;}; @@ -356,6 +362,12 @@ repo = "nixpkgs"; ref = "2100c4926200b1ebbee032ad22113597195932f2"; }; + resilio3 = { + type = "github"; + owner = "cyplo"; + repo = "nixpkgs"; + ref = "4ca49d35b584e73b77cb4e496298729c1c3d2a7f"; + }; nixos-hardware = { type = "github"; owner = "NixOS"; @@ -380,7 +392,7 @@ ref = "main"; }; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.flake-utils.follows = "flake-utils"; }; diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix index 286ff4d4..af81cd65 100644 --- a/nixos/boxes/foryog/default.nix +++ b/nixos/boxes/foryog/default.nix @@ -4,12 +4,14 @@ inputs, lib, system, + resilio3, ... }: { networking.hostName = "foryog"; imports = [ ./hardware-configuration.nix + ./resilio.nix ../../backups.nix ../../boot.nix ../../git diff --git a/nixos/boxes/foryog/resilio.nix b/nixos/boxes/foryog/resilio.nix new file mode 100644 index 00000000..35042acb --- /dev/null +++ b/nixos/boxes/foryog/resilio.nix @@ -0,0 +1,15 @@ +{ + config, + pkgs, + inputs, + system, + resilio3, + ... +}: { + services.resilio = { + package = resilio3.resilio-sync; + enable = true; + enableWebUI = true; + httpListenAddr = "127.0.0.1"; + }; +} diff --git a/nixos/email-accounts.nix b/nixos/email-accounts.nix index 6ea63172..705ee68d 100644 --- a/nixos/email-accounts.nix +++ b/nixos/email-accounts.nix @@ -63,7 +63,6 @@ in { enable = true; hooks.preNew = "${pkgs.isync}/bin/mbsync -a"; }; - alot = {enable = true;}; }; home.packages = [unstable.protonmail-bridge]; diff --git a/nixos/gnome/home.nix b/nixos/gnome/home.nix index 2709a879..79bcc026 100644 --- a/nixos/gnome/home.nix +++ b/nixos/gnome/home.nix @@ -9,7 +9,7 @@ home.sessionVariables = {QT_QPA_PLATFORM = "wayland";}; home.packages = - (with pkgs; [gnome-usage gnome.gnome-tweaks]) + (with pkgs; [gnome-usage gnome-tweaks]) ++ (with pkgs.gnomeExtensions; [ caffeine clipboard-indicator diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index c4645bfb..f7ea99df 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -15,7 +15,7 @@ enable = true; iconTheme = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; }; }; qt = {enable = true;}; diff --git a/nixos/home-manager/linux.nix b/nixos/home-manager/linux.nix index 0e6cfbd6..711ac3b6 100644 --- a/nixos/home-manager/linux.nix +++ b/nixos/home-manager/linux.nix @@ -17,7 +17,6 @@ hsetroot lm_sensors minicom - nerdfonts pciutils powertop ranger