diff --git a/flake.lock b/flake.lock index e0b240d..87450d3 100644 --- a/flake.lock +++ b/flake.lock @@ -1002,25 +1002,18 @@ } }, "pixelflasher": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1741157109, - "narHash": "sha256-yoOMkH0n7e3UQSEAHHDuoBRDbJhnSymjt3gtoA8mMkI=", + "lastModified": 1741302870, + "narHash": "sha256-7AywZ1b3PaqolAZ0vQmddD6Br4o0a7ucdtE0/W3rnaM=", "owner": "cything", - "repo": "pixelflasher-flake", - "rev": "400c423071a4807ac01152a1060b75df4a11cc2d", + "repo": "nixpkgs", + "rev": "5ef8b274bb7f939104295a22cec3382268ed73cc", "type": "github" }, "original": { "owner": "cything", - "repo": "pixelflasher-flake", + "ref": "pixelflasher", + "repo": "nixpkgs", "type": "github" } }, diff --git a/flake.nix b/flake.nix index a6b7f75..cdb829e 100644 --- a/flake.nix +++ b/flake.nix @@ -78,11 +78,7 @@ 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"; - }; + pixelflasher.url = "github:cything/nixpkgs/pixelflasher"; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 75c3ba0..c0182e7 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -100,6 +100,7 @@ nix-output-monitor wl-clipboard-rs pixelflasher + element-desktop ]; programs.feh.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index d367021..7f41acb 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -229,6 +229,7 @@ "**/.wine" "/home/yt/Games" "/home/yt/Videos" + "/home/yt/.bitmonero" ]; repo = "yt"; passFile = config.sops.secrets."borg/rsyncnet".path; diff --git a/overlay/default.nix b/overlay/default.nix index cf1e97a..d617b17 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -11,14 +11,14 @@ importedOverlays ( final: prev: let - # nixpkgsFrom = flake: pkg: flake.legacyPackages.${prev.system}.${pkg}; + nixpkgsFrom = flake: pkg: flake.legacyPackages.${prev.system}.${pkg}; pkgFrom = flake: pkgFrom' flake "default"; pkgFrom' = flake: pkg: flake.packages.${prev.system}.${pkg}; in { conduwuit = pkgFrom' inputs.conduwuit "static-x86_64-linux-musl-all-features-x86_64-haswell-optimised"; - pixelflasher = pkgFrom inputs.pixelflasher; + pixelflasher = nixpkgsFrom inputs.pixelflasher "pixelflasher"; } ) ] \ No newline at end of file