Updated unsable and added dev nixpkgs

flake.lock

@@ -303,21 +303,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-dev": {
-      "locked": {
-        "lastModified": 1650234480,
-        "narHash": "sha256-EdnUK7+8pUoo/CraZvLb1pW9VvL7mfjpJ9swae5btjE=",
-        "owner": "aciceri",
-        "repo": "nixpkgs",
-        "rev": "c2bc2e8c2488f4b0b88217d8655e072ab4fc403b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aciceri",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-wayland": {
       "inputs": {
         "cachix": [
@@ -342,6 +327,21 @@
         "type": "github"
       }
     },
+    "nixpkgsDevInput": {
+      "locked": {
+        "lastModified": 1650235668,
+        "narHash": "sha256-OmGlM2pIMMrhkoHNi4yxG0H3JzoK8gZ7dUfx7OsDoFE=",
+        "owner": "aciceri",
+        "repo": "nixpkgs",
+        "rev": "a28ba9716a4c3f16379ceba7e4d754782846bebb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aciceri",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1648097358,
@@ -415,8 +415,8 @@
         "emacs-overlay": "emacs-overlay",
         "home": "home",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs-dev": "nixpkgs-dev",
         "nixpkgs-wayland": "nixpkgs-wayland",
+        "nixpkgsDevInput": "nixpkgsDevInput",
         "nur": "nur",
         "stable": "stable",
         "unstable": "unstable"
@@ -459,11 +459,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1647893727,
+        "lastModified": 1650161686,
-        "narHash": "sha256-pOi7VdCb+s5Cwh5CS7YEZVRgH9uCmE87J5W7iXv29Ck=",
+        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1ec61dd4167f04be8d05c45780818826132eea0d",
+        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
         "type": "github"
       },
       "original": {

flake.nix

@@ -5,7 +5,7 @@
     {
       stable.url = github:nixos/nixpkgs/release-21.11;
       unstable.url = github:nixos/nixpkgs/nixos-unstable;
-      nixpkgs-dev.url = github:aciceri/nixpkgs;
+      nixpkgsDevInput.url = github:aciceri/nixpkgs;
 
       nur.url = github:nix-community/NUR;
 
@@ -35,7 +35,6 @@
     { self
     , digga
     , unstable
-    , nixpkgs-dev
     , home
     , nixos-hardware
     , darwin
@@ -60,7 +59,8 @@
               deploy.overlay
               #nixpkgs-wayland.overlay
               (import ./pkgs/default.nix {
-                unstablePkgsInput = inputs.unstable;
+                nixpkgsUnstableInput = inputs.unstable;
+                nixpkgsDevInput = inputs.nixpkgsDevInput;
               })
             ];
           in
@@ -128,7 +128,6 @@
             suites = with profiles; rec {
               base = [ core users.ccr users.root ];
             };
-            nixpkgs-dev = inputs.nixpkgs-dev.legacyPackages.aarch64-linux;
           };
         };
 
@@ -166,7 +165,9 @@
         modules = [ home.darwinModules.home-manager ./hosts/mbp ];
         inputs = { inherit darwin; };
         specialArgs = {
-          inherit emacs-overlay; unstablePkgsInput = inputs.unstablePkgs;
+          inherit emacs-overlay;
+          nixpkgsUnstableInput = inputs.unstable;
+          nixpkgsDevInput = inputs.nixpkgsDevInput;
         };
       };
     };

pkgs/default.nix

@@ -1,11 +1,14 @@
-{ unstablePkgsInput }:
+{ nixpkgsUnstableInput, nixpkgsDevInput }:
-
-
 
 final: prev:
 let
-  unstablePkgs = (import unstablePkgsInput {
+  nixpkgsUnstable = (import nixpkgsUnstableInput {
     system = prev.system;
+    config.allowUnfree = true;
+  }).pkgs;
+  nixpkgsDev = (import nixpkgsDevInput {
+    system = prev.system;
+    config.allowUnfree = true;
   }).pkgs;
 in
 {
@@ -13,10 +16,14 @@ in
   # sources = prev.callPackage (import ./_sources/generated.nix) { };
   customEmacs = prev.callPackage (import ./emacs) { };
   amule = prev.callPackage (import ./amule) { };
-  digikam = unstablePkgs.digikam;
+  digikam = nixpkgsUnstable.digikam;
-  cura = unstablePkgs.cura;
+  cura = nixpkgsUnstable.cura;
-  firefox-unwrapped = unstablePkgs.firefox-unwrapped;
+  #firefox-unwrapped = nixpkgsUnstable.firefox-unwrapped;
-  geoclue2 = unstablePkgs.geoclue2;
+  xdg-desktop-portal = nixpkgsUnstable.xdg-desktop-portal;
-  gnome = unstablePkgs.gnome;
+  xdg-desktop-portal-gtk = nixpkgsUnstable.xdg-desktop-portal-gtk;
+  vscode = nixpkgsUnstable.vscode;
+  geoclue2 = nixpkgsUnstable.geoclue2;
+  gnome = nixpkgsUnstable.gnome;
+  umoria = nixpkgsDev.umoria;
   # then, call packages with `final.callPackage`
 }

users/ccr/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, suites, lib, config, nixpkgs-dev, ... }:
+{ pkgs, suites, lib, config, ... }:
 {
   home-manager.users.ccr = { suites, ... }: {
     imports = with suites; shell ++ base ++ (if config.networking.hostName != "hs" then
@@ -9,7 +9,7 @@
     home.packages = with pkgs; [
       ack
       ranger
-      nixpkgs-dev.umoria
+      umoria
     ] ++ (if config.networking.hostName != "hs" then [
       imv
       calibre

users/profiles/vscode/default.nix

@@ -1,9 +1,8 @@
 { pkgs, ... }:
 {
   # only purpose of this is to make vscode login to Github
-  services.gnome-keyring = {
+  services.gnome-keyring.enable = true;
-    enable = true;
+
-  };
 
   programs.vscode = {
     enable = true;
@@ -32,6 +31,7 @@
   };
 
   home.packages = with pkgs; [
+    gnome.gnome-keyring
     stylish-haskell
     ghc
   ] ++ (if pkgs.system == "x86_64-linux" then [