From d7fc1894803b2ffcbd8368900c62f876e2bef02d Mon Sep 17 00:00:00 2001 From: naturallaw77 Date: Fri, 11 Aug 2023 11:28:14 -0700 Subject: [PATCH] Updated Main Flake and Update Nixpkgs --- configuration.nix | 1 + flake.lock | 58 +++-------------------------------------------- flake.nix | 10 +------- 3 files changed, 5 insertions(+), 64 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1c4f7bd..b7d8388 100644 --- a/configuration.nix +++ b/configuration.nix @@ -152,6 +152,7 @@ in gnome.gnome-tweaks papirus-icon-theme ranger + sparrow bisq-desktop neofetch gnome.gedit diff --git a/flake.lock b/flake.lock index e4c8ed3..d911718 100644 --- a/flake.lock +++ b/flake.lock @@ -20,25 +20,6 @@ "type": "github" } }, - "erosanix": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1691672998, - "narHash": "sha256-1pqlZJ3agQ2sXJLl8yr/zrAAC+lm41KQ1cMsnpC6xiM=", - "owner": "emmanuelrosa", - "repo": "erosanix", - "rev": "2a98a02c2715cf27feff4fba4de579a6d4c59601", - "type": "github" - }, - "original": { - "owner": "emmanuelrosa", - "repo": "erosanix", - "type": "github" - } - }, "extra-container": { "inputs": { "flake-utils": [ @@ -64,22 +45,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -123,7 +88,7 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { @@ -174,22 +139,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1690318695, - "narHash": "sha256-Ca8Er9gNMNvTg15FdIXp7cdoRlqztsmG+dC0ZKZ8R1c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17d98b5b7c8bbeaf1e0a4140d125c7e797882f3b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1690558459, "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=", @@ -205,7 +154,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1691654369, "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", @@ -224,9 +173,8 @@ "root": { "inputs": { "agenix": "agenix", - "erosanix": "erosanix", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" } }, "systems": { diff --git a/flake.nix b/flake.nix index 33e4b2c..4199c6d 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,9 @@ agenix.inputs.darwin.follows = ""; - erosanix.url = "github:emmanuelrosa/erosanix"; - }; - outputs = { self, nixpkgs, nix-bitcoin, agenix, erosanix, ... }: + outputs = { self, nixpkgs, nix-bitcoin, agenix, ... }: { @@ -35,12 +33,6 @@ agenix.nixosModules.default ]; - - environment.systemPackages = with pkgs; [ - - erosanix.packages.x86_64-linux.sparrow - - ]; }; }; } \ No newline at end of file