From 91165ea5630ceeeb8618260f650c12a6680ff461 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 6 Mar 2025 11:29:53 -0500 Subject: [PATCH] disable btrbk; install pixelflasher from my flake --- flake.lock | 24 ++++++++++++++++++++++++ flake.nix | 5 +++++ home/yt/ytnix.nix | 2 ++ hosts/ytnix/default.nix | 21 +-------------------- overlay/default.nix | 10 ++++++---- 5 files changed, 38 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index be8d519..e0b240d 100644 --- a/flake.lock +++ b/flake.lock @@ -1001,6 +1001,29 @@ "type": "github" } }, + "pixelflasher": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741157109, + "narHash": "sha256-yoOMkH0n7e3UQSEAHHDuoBRDbJhnSymjt3gtoA8mMkI=", + "owner": "cything", + "repo": "pixelflasher-flake", + "rev": "400c423071a4807ac01152a1060b75df4a11cc2d", + "type": "github" + }, + "original": { + "owner": "cything", + "repo": "pixelflasher-flake", + "type": "github" + } + }, "pre-commit-hooks": { "flake": false, "locked": { @@ -1078,6 +1101,7 @@ "nixpkgs-stable": "nixpkgs-stable_3", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", + "pixelflasher": "pixelflasher", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "treefmt": "treefmt", diff --git a/flake.nix b/flake.nix index 12de664..a6b7f75 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,11 @@ url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + pixelflasher = { + url = "github:cything/pixelflasher-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + }; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index b368bae..75c3ba0 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -98,6 +98,8 @@ libllvm ]) nix-output-monitor + wl-clipboard-rs + pixelflasher ]; programs.feh.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 630afce..d367021 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -217,7 +217,6 @@ enable = true; powerOnBoot = true; }; - services.blueman.enable = true; my.backup = { enable = true; @@ -236,25 +235,6 @@ sshKeyFile = config.sops.secrets."rsyncnet/id_ed25519".path; }; - services.btrbk.instances.local = { - onCalendar = "hourly"; - # only create snapshots automatically. backups are triggered manually with `btrbk resume` - snapshotOnly = true; - settings = { - snapshot_preserve_min = "latest"; - target_preserve = "30d"; - target_preserve_min = "2d"; - target = "/mnt/target/btr_backup/ytnix"; - stream_compress = "zstd"; - stream_compress_level = "8"; - snapshot_dir = "/snapshots"; - subvolume = { - "/home" = { }; - "/" = { }; - }; - }; - }; - programs.steam = { enable = true; extest.enable = true; @@ -293,6 +273,7 @@ fontconfig libxkbcommon zlib + libz libxml2 dbus freetype diff --git a/overlay/default.nix b/overlay/default.nix index 6a824d1..cf1e97a 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -11,12 +11,14 @@ importedOverlays ( final: prev: let - pkgFrom = flake: pkg: flake.legacyPackages.${prev.system}.${pkg}; - stable = inputs.nixpkgs-stable; + # nixpkgsFrom = flake: pkg: flake.legacyPackages.${prev.system}.${pkg}; + pkgFrom = flake: pkgFrom' flake "default"; + pkgFrom' = flake: pkg: flake.packages.${prev.system}.${pkg}; in { conduwuit = - inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; + pkgFrom' inputs.conduwuit "static-x86_64-linux-musl-all-features-x86_64-haswell-optimised"; + pixelflasher = pkgFrom inputs.pixelflasher; } ) -] +] \ No newline at end of file