diff --git a/common/default.nix b/common/default.nix index 8c8af70..d031bd2 100644 --- a/common/default.nix +++ b/common/default.nix @@ -24,9 +24,6 @@ ## Other - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # Flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix index 4f34421..2bebeea 100644 --- a/common/fragments/graphical/default.nix +++ b/common/fragments/graphical/default.nix @@ -23,8 +23,6 @@ bspm = final.callPackage ../../../common/pkgs/bspm.nix { }; polybar-spotify = final.callPackage ../../../common/pkgs/polybar-spotify.nix { }; - element-desktop = - prev.element-desktop.override { electron = prev.electron_24; }; }) ]; @@ -57,7 +55,7 @@ nitrogen nmap obs-studio - obsidian + unstable.obsidian pfetch polybar-spotify pridefetch diff --git a/flake.lock b/flake.lock index c505dcd..044ae07 100644 --- a/flake.lock +++ b/flake.lock @@ -242,11 +242,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1697893116, - "narHash": "sha256-KVA6ybNgqVpM4JEkvJE5ujucqvAUCsQGdxZYIasRp/8=", + "lastModified": 1699520217, + "narHash": "sha256-+b4R/GUQrRBGGpmDXna8w28ueeK7FhIYhQTSHqFJuqo=", "owner": "helix-editor", "repo": "helix", - "rev": "31f50bf5bf0d49af7359533e0865e878184c5225", + "rev": "6ab774da0b473c36a437d90abcdac3558353d32e", "type": "github" }, "original": { @@ -465,11 +465,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697915759, - "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1697777081, - "narHash": "sha256-n2vQARhKevRGyeo+LAa8g+CdUQsdH/caNk8jnylcPhY=", + "lastModified": 1699291058, + "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "679cadfdfed2b90311a247b2d6ef6dfd3d6cab73", + "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1693075322, - "narHash": "sha256-O/qmWiE23pzYMSKNhA74jfY1D5TyiJrHx35PYkRx9Gs=", + "lastModified": 1699469086, + "narHash": "sha256-FC350WZKaTh+b0c3THfrJW9WNu1Y0oC9Y9F5z32gIFk=", "owner": "the-argus", "repo": "spicetify-nix", - "rev": "78495ade242ad155942c2e33e3930e4a05963f13", + "rev": "f395fe14de6d934159d3aa5cc904bbb41f1ea053", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c9a65d3..de3473b 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,7 @@ nixpkgs = import nixpkgs rec { system = "x86_64-linux"; + config.allowUnfree = true; overlays = [ (final: prev: { helix = let helix-pkgs = helix.packages.${final.system}; @@ -116,7 +117,7 @@ ccase = ccase.packages.${final.system}.default; # Unstable packages - unstable = import nixpkgs-unstable { inherit system; }; + unstable = import nixpkgs-unstable { inherit system config; }; }) colmena.overlay ];