From d0dcfe61013f33b339bc0e89992987646339b0d0 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sat, 4 Nov 2023 15:21:43 +0100 Subject: [PATCH] Update flake.lock - Remove cadence as it has been removed from nixpkgs... Replace with helvum, ew. - Remove "manual" jovian overlay as it gets added already by the module --- flake.lock | 79 +++++++++++++++++++------------ flake.nix | 4 +- overlays/gradientos.nix | 4 -- users/neith/graphical/default.nix | 2 +- users/vera/graphical/default.nix | 2 +- 5 files changed, 52 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 88aea85..da6c68d 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1697665314, - "narHash": "sha256-ogA8B/GmCac6Lk7N3dT4GtoOGnhQEOu3zKVFcVhH1zQ=", + "lastModified": 1698144717, + "narHash": "sha256-uN3u8LjqmVVTqam80YgzcOWCSixZg2hRjUBGHbqTX0Y=", "owner": "zhaofengli", "repo": "colmena", - "rev": "197010c492a9606885e0cc9bd514f871f5aa0dc0", + "rev": "3538f18b30a8b1ca67978972419263d2849331a7", "type": "github" }, "original": { @@ -114,14 +114,15 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", + "nixpkgs-latest": "nixpkgs-latest", "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1690456824, - "narHash": "sha256-3cwWWad2pFcZlkG+Y/Jh65BohYDcFRa1m6Y0hrdYOos=", + "lastModified": 1698249294, + "narHash": "sha256-tzNT99Bvaaq0TKgRwVY5k912uUKTjzSALyis6d6AYT0=", "ref": "refs/heads/master", - "rev": "9f69a2ae5c27414f043493088bf904b7dff5ecec", - "revCount": 81, + "rev": "a2b39644a2ce809f65f6376bc52b77709d659790", + "revCount": 92, "type": "git", "url": "ssh://git@github.com/Zumorica/gradient-generator" }, @@ -153,11 +154,11 @@ ] }, "locked": { - "lastModified": 1697964592, - "narHash": "sha256-fua0LKNLkYYK2Dgdm9P+VPdqrVgDXUIx+EkQAQByhuc=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "219d268a69512ff520fe8da1739ac22d95d52355", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -175,11 +176,11 @@ ] }, "locked": { - "lastModified": 1697994897, - "narHash": "sha256-FX6ZJ0EbOd10xAEGZ0G66UiSmvZ0kfdC4eMwfY8lGNU=", + "lastModified": 1698485410, + "narHash": "sha256-+O5Acu2n4XQnT4M25W/oH5MLqXy4pFBFhBzKBFOF7Ik=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2660ce9e062c9c8622d0ca7616f8359e2ad289fe", + "rev": "fd7753956149d4e8b19a810eed445d1a52aecd30", "type": "github" }, "original": { @@ -196,11 +197,11 @@ ] }, "locked": { - "lastModified": 1697937354, - "narHash": "sha256-Qo3o+LpoFxAgRf/NpVzcgOGS4Tca9X1aCvxamVYOsdQ=", + "lastModified": 1698973934, + "narHash": "sha256-Q3bgQkd1m2LV23xCqMALB09UC0ek6cedNV2ZfwRWDCE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "3c35bd95c637c3c77d0c662eb90f49d91a2f3098", + "rev": "d4c46060dd31f5b529a3f0023f48103d04fe3c34", "type": "github" }, "original": { @@ -269,11 +270,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1697748412, - "narHash": "sha256-5VSB63UE/O191cuZiGHbCJ9ipc7cGKB8cHp0cfusuyo=", + "lastModified": 1699044561, + "narHash": "sha256-3uHmbq74CicpBPP40a6NHp830S7Rvh33uFgfIIC+7nw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72d53d51704295f1645d20384cd13aecc182f624", + "rev": "87f8403371fa74d9ad21ed677403cc235f37b96c", "type": "github" }, "original": { @@ -299,6 +300,22 @@ "type": "github" } }, + "nixpkgs-latest": { + "locked": { + "lastModified": 1697915759, + "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -319,11 +336,11 @@ }, "nixpkgs-stable-2305": { "locked": { - "lastModified": 1697851979, - "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", + "lastModified": 1698942558, + "narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", + "rev": "621f51253edffa1d6f08d5fce4f08614c852d17e", "type": "github" }, "original": { @@ -335,11 +352,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -403,11 +420,11 @@ ] }, "locked": { - "lastModified": 1697943852, - "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", + "lastModified": 1699021419, + "narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", + "rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f", "type": "github" }, "original": { @@ -423,11 +440,11 @@ ] }, "locked": { - "lastModified": 1694354200, - "narHash": "sha256-Bnt+2KfIj4oWljU1uc1Q44sQ9riZxAPbfAwhLgGbsyc=", + "lastModified": 1694354184, + "narHash": "sha256-gcstNUZLAOYdA1yNf3hrsYWrzT9YOTyX0S1D5qC17CA=", "owner": "space-wizards", "repo": "SS14.Watchdog", - "rev": "2cdd9425104a12abfe70dae55ee9f064c9ef5346", + "rev": "d603d8976d87a8e0d93f435f131df2c50f2ca197", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0e2b5e6..757bd70 100644 --- a/flake.nix +++ b/flake.nix @@ -138,7 +138,7 @@ { name = "neith-deck"; - overlays = [ jovian-nixos.overlays.default self.overlays.kernel-allow-missing ]; + overlays = [ self.overlays.kernel-allow-missing ]; modules = [ sops-nix.nixosModules.sops @@ -181,7 +181,7 @@ { name = "vera-deck"; - overlays = [ jovian-nixos.overlays.default self.overlays.kernel-allow-missing ]; + overlays = [ self.overlays.kernel-allow-missing ]; modules = [ sops-nix.nixosModules.sops diff --git a/overlays/gradientos.nix b/overlays/gradientos.nix index c509138..fecd483 100644 --- a/overlays/gradientos.nix +++ b/overlays/gradientos.nix @@ -26,10 +26,6 @@ let extraEnv.ROBUST_SOUNDFONT_OVERRIDE = "${prev.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"; }; in { - cadence = prev.cadence.override { - libjack2 = prev.pipewire.jack; - }; - discord = prev.discord.override { withOpenASAR = true; }; diff --git a/users/neith/graphical/default.nix b/users/neith/graphical/default.nix index 81728f4..7f44249 100644 --- a/users/neith/graphical/default.nix +++ b/users/neith/graphical/default.nix @@ -14,9 +14,9 @@ tdesktop rustdesk anydesk - cadence discord spotify + helvum kate vlc mpv diff --git a/users/vera/graphical/default.nix b/users/vera/graphical/default.nix index ce78d59..65d6563 100644 --- a/users/vera/graphical/default.nix +++ b/users/vera/graphical/default.nix @@ -23,9 +23,9 @@ audacity inkscape rustdesk - cadence discord anydesk + helvum vscode ventoy krita