From 0ec5d4150919898c0fa2619bdc1c7c0a942cfe20 Mon Sep 17 00:00:00 2001 From: op Date: Wed, 6 Nov 2024 11:56:49 +0000 Subject: use upstream flaresolverr --- flake.lock | 301 +++++++++++++++++++++++++++++++++++++++++ flake.nix | 17 +-- hosts/laurel/configuration.nix | 4 +- hosts/laurel/servarr.nix | 2 +- 4 files changed, 313 insertions(+), 11 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..9faf5d0 --- /dev/null +++ b/flake.lock @@ -0,0 +1,301 @@ +{ + "nodes": { + "better-text-objs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1674354525, + "narHash": "sha256-C0Fc7I2S1MGNGKgvGkMzzEyVF3WkRHlj8i+PF0o9tYI=", + "ref": "refs/heads/master", + "rev": "697b2c8f2415832bae7520a1d802e080363aa84b", + "revCount": 5, + "type": "git", + "url": "https://git.peppe.rs/vim/better-text-objs" + }, + "original": { + "type": "git", + "url": "https://git.peppe.rs/vim/better-text-objs" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e83414058edd339148dc142a8437edb9450574c8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "niri": { + "inputs": { + "flake-parts": "flake-parts", + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1730267238, + "narHash": "sha256-Qwr72PbHBmc88UeLtm7K6/PJ0cfJjq8p2R4lsHA4cWw=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "92d467d0c2dc8aeade9d858c95104b6a678cd9c0", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1726304152, + "narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v0.1.9", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1730263923, + "narHash": "sha256-HFOXeh+WNtAwuV/KNtOSKXGnOoy465a/dud2zvtsCt8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "d3e72245b003cbeed0810bf00c4a445b7c8a652a", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1730045389, + "narHash": "sha256-4spSNTZ6h8Xmvrr9oqfuxc9jarasGj1QOcsgw8BfNd8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0fcb98acb6633445764dafe180e6833eb0f95208", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1724748588, + "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "prompt": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701510523, + "narHash": "sha256-uf0JCa+PP/aM77icihT79hew1/TTcMJV6AoIfmuLABM=", + "ref": "refs/heads/master", + "rev": "9450828084f42d3f1eb261c00820cfd2bf8b819b", + "revCount": 7, + "type": "git", + "url": "https://git.peppe.rs/cli/prompt" + }, + "original": { + "type": "git", + "url": "https://git.peppe.rs/cli/prompt" + } + }, + "readit": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1730847014, + "narHash": "sha256-ZnXEn7bUg43yeePXkG8THfCQTC7YmchigPnOx3pd0+w=", + "ref": "refs/heads/master", + "rev": "276f8e058d831429f171293e399f43c94719a504", + "revCount": 32, + "type": "git", + "url": "https://git.peppe.rs/web/readit" + }, + "original": { + "type": "git", + "url": "https://git.peppe.rs/web/readit" + } + }, + "root": { + "inputs": { + "better-text-objs": "better-text-objs", + "home-manager": "home-manager", + "niri": "niri", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs", + "prompt": "prompt", + "readit": "readit", + "vim-colors-plain": "vim-colors-plain" + } + }, + "vim-colors-plain": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730272245, + "narHash": "sha256-B5ADR+N8297uv9i6HazGaT/uSXM5aJ9RpXNnVQPQPQI=", + "owner": "oppiliappan", + "repo": "vim-colors-plain", + "rev": "d9b9c11a55ec5500c65d062490f60ea707eb46c8", + "type": "github" + }, + "original": { + "owner": "oppiliappan", + "repo": "vim-colors-plain", + "type": "github" + } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1718165778, + "narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.4", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1730258684, + "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index c6f8c48..61b529a 100644 --- a/flake.nix +++ b/flake.nix @@ -22,14 +22,14 @@ }; vim-colors-plain = { - url = "git+https://git.peppe.rs/vim/vim-colors-plain"; + url = "github:oppiliappan/vim-colors-plain"; inputs.nixpkgs.follows = "nixpkgs"; }; - flaresolverr = { - url = "git+https://git.peppe.rs/flakes/flaresolverr"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # flaresolverr = { + # url = "git+https://git.peppe.rs/flakes/flaresolverr"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; niri = { url = "github:sodiboo/niri-flake"; @@ -50,7 +50,7 @@ , prompt , better-text-objs , vim-colors-plain - , flaresolverr + # , flaresolverr , niri , readit , ... @@ -61,7 +61,8 @@ prompt = prompt.overlay; better-text-objs = better-text-objs.overlay; vim-colors-plain = vim-colors-plain.overlay; - flaresolverr = flaresolverr.overlays.default; + # flaresolverr = flaresolverr.overlays.default; + niri = niri.overlays.niri; }; formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt; @@ -131,7 +132,7 @@ imports = [ ./hosts/laurel/configuration.nix ]; _module.args.self = self; } - flaresolverr.nixosModules.default + # flaresolverr.nixosModules.default readit.nixosModules.default ]; }; diff --git a/hosts/laurel/configuration.nix b/hosts/laurel/configuration.nix index 61d8ed1..8ff1fe5 100644 --- a/hosts/laurel/configuration.nix +++ b/hosts/laurel/configuration.nix @@ -33,7 +33,7 @@ }; # Enable sound. - sound.enable = true; + # sound.enable = true; hardware.pulseaudio.enable = true; hardware.opengl = { enable = true; @@ -155,7 +155,7 @@ }; }; services.mautrix-whatsapp = { - enable = true; + enable = false; settings = { homeserver = { address = "http://localhost:6197"; diff --git a/hosts/laurel/servarr.nix b/hosts/laurel/servarr.nix index cc225c1..e9c06c4 100644 --- a/hosts/laurel/servarr.nix +++ b/hosts/laurel/servarr.nix @@ -4,7 +4,7 @@ imports = [ ]; nixpkgs.overlays = with self.overlays; [ - flaresolverr + #flaresolverr ]; users.groups."torrent".members = [ -- cgit v1.2.3