From 99b653229ee95221edcfb2852343f269fff49ba1 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sat, 22 Jun 2024 16:53:58 +0200
Subject: [PATCH] Move framework to unstable

---
 flake.lock                               | 33 +++++++++++++++++++-----
 flake.nix                                | 10 ++++---
 home/modules/linux/graphical/default.nix |  6 ++---
 modules/common/linux/default.nix         |  1 -
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index de39b4b..e18f93b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -738,6 +738,26 @@
         "type": "github"
       }
     },
+    "home-manager-unstable": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719037157,
+        "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "kak-lsp": {
       "flake": false,
       "locked": {
@@ -854,11 +874,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1718806950,
-        "narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=",
+        "lastModified": 1719007440,
+        "narHash": "sha256-ll9zg1P0W8cMk1Co1BOQOrICr9dDgUw+ZL3mGy5GnOg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda",
+        "rev": "e6d40db8924c3a663e1f76e0daed09510fea51c3",
         "type": "github"
       },
       "original": {
@@ -975,11 +995,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1718606988,
-        "narHash": "sha256-pmjP5ePc1jz+Okona3HxD7AYT0wbrCwm9bXAlj08nDM=",
+        "lastModified": 1718983919,
+        "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "38d3352a65ac9d621b0cd3074d3bef27199ff78f",
+        "rev": "90338afd6177fc683a04d934199d693708c85a3b",
         "type": "github"
       },
       "original": {
@@ -1205,6 +1225,7 @@
         "dtth-phanpy": "dtth-phanpy",
         "flake-utils": "flake-utils_5",
         "home-manager": "home-manager",
+        "home-manager-unstable": "home-manager-unstable",
         "kak-lsp": "kak-lsp",
         "kakoune": "kakoune",
         "lanzaboote": "lanzaboote",
diff --git a/flake.nix b/flake.nix
index 54ba2c9..8d1ae01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,8 @@
     darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
     home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager-unstable.url = "github:nix-community/home-manager";
+    home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
     sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
@@ -59,6 +61,8 @@
       overlays = import ./overlay.nix inputs;
       lib = nixpkgs.lib;
 
+      hmOf = nixpkgs: if nixpkgs == inputs.nixpkgs then home-manager else inputs.home-manager-unstable;
+
       applyOverlays = { ... }: {
         nixpkgs.overlays = lib.mkBefore overlays;
       };
@@ -164,10 +168,10 @@
         ];
       };
       # framework configuration
-      nixosConfigurations."nki-framework" = nixpkgs.lib.nixosSystem rec {
+      nixosConfigurations."nki-framework" = nixpkgs-unstable.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
-          (common-nixos nixpkgs)
+          (common-nixos nixpkgs-unstable)
           inputs.lanzaboote.nixosModules.lanzaboote
           inputs.nixos-hardware.nixosModules.framework-13-7040-amd
           ({ ... }: {
@@ -179,7 +183,7 @@
             };
           })
           ./nki-framework/configuration.nix
-          home-manager.nixosModules.home-manager
+          (hmOf nixpkgs-unstable).nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix
index 1fd1b4b..ef3eb10 100644
--- a/home/modules/linux/graphical/default.nix
+++ b/home/modules/linux/graphical/default.nix
@@ -59,8 +59,6 @@ in
       cinny-desktop
       gajim
       vivaldi
-      # Note taking
-      logseq
       # Audio
       qpwgraph # Pipewire graph
 
@@ -92,8 +90,8 @@ in
     nki.programs.discord.enable = pkgs.stdenv.isx86_64;
     nki.programs.discord.package = pkgs.vesktop.overrideAttrs (attrs: {
       nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.nss_latest pkgs.makeWrapper ];
-      postInstall = ''
-        makeWrapper $out/bin/vesktop $out/bin/discord
+      postFixup = (attrs.postFixup or "") + ''
+        ln -s $out/bin/vesktop $out/bin/discord
       '';
     });
 
diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix
index 0e97b7d..0ee3efe 100644
--- a/modules/common/linux/default.nix
+++ b/modules/common/linux/default.nix
@@ -286,7 +286,6 @@ in
     # Gaming! (not for ARM64)
     programs.steam.enable = !pkgs.stdenv.isAarch64;
     hardware.opengl.enable = true;
-    hardware.opengl.driSupport = true;
     hardware.opengl.driSupport32Bit = !pkgs.stdenv.isAarch64; # For 32 bit applications
 
     ## Services