diff --git a/flake.lock b/flake.lock index 7611e89..46e38f8 100644 --- a/flake.lock +++ b/flake.lock @@ -404,16 +404,16 @@ "nixos-m1": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable-asahi" + "nixpkgs-unstable" ], "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1679451428, - "narHash": "sha256-Xk3WBlejWUpnuOnMZzTH7mV/bTRxKIrln871ba3uQjI=", + "lastModified": 1683434835, + "narHash": "sha256-idBmY6LKkB5hTcTFroUi1oQdCK1/fDfJA+qNaivl1Wk=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "696d7b4ac7ca05684a3cceedd44acfd0d1c5f1e3", + "rev": "ef6f0de57ef175e0de8c7e846a95481ac6f4ce58", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1681753173, - "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", + "lastModified": 1683442750, + "narHash": "sha256-IiJ0WWW6OcCrVFl1ijE+gTaP0ChFfV6dNkJR05yStmw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", + "rev": "eb751d65225ec53de9cf3d88acbf08d275882389", "type": "github" }, "original": { @@ -470,22 +470,6 @@ "type": "github" } }, - "nixpkgs-unstable-asahi": { - "locked": { - "lastModified": 1681740123, - "narHash": "sha256-RrcHEqm+f04nFpQQSnsGsUhJb2mNuqfdcGWL2DREEaY=", - "owner": "natsukagami", - "repo": "nixpkgs", - "rev": "55325c13e8f5c06a57a210b30a19b2fbebe185f1", - "type": "github" - }, - "original": { - "owner": "natsukagami", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable_2": { "locked": { "lastModified": 1665934222, @@ -616,7 +600,6 @@ "nixos-m1": "nixos-m1", "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", - "nixpkgs-unstable-asahi": "nixpkgs-unstable-asahi", "nur": "nur", "rnix-lsp": "rnix-lsp", "secrets": "secrets", diff --git a/flake.nix b/flake.nix index e5d1587..0ba924d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs-unstable-asahi.url = "github:natsukagami/nixpkgs/nixpkgs-unstable"; # nixpkgs-unstable.follows = "nixos-m1/nixpkgs"; darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -45,7 +44,7 @@ kak-lsp.url = github:kak-lsp/kak-lsp; kak-lsp.flake = false; nixos-m1.url = github:tpwrules/nixos-apple-silicon; - nixos-m1.inputs.nixpkgs.follows = "nixpkgs-unstable-asahi"; + nixos-m1.inputs.nixpkgs.follows = "nixpkgs-unstable"; # --- # DEPLOYMENT ONLY! secrets @@ -172,10 +171,10 @@ # ]; # }; # macbook nixos - nixosConfigurations."kagami-air-m1" = inputs.nixpkgs-unstable-asahi.lib.nixosSystem rec { + nixosConfigurations."kagami-air-m1" = inputs.nixpkgs-unstable.lib.nixosSystem rec { system = "aarch64-linux"; modules = [ - (common-nixos inputs.nixpkgs-unstable-asahi) + (common-nixos inputs.nixpkgs-unstable) inputs.nixos-m1.nixosModules.apple-silicon-support ./kagami-air-m1/configuration.nix inputs.home-manager-unstable.nixosModules.home-manager diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix index c48d3bc..bf2f2a3 100644 --- a/modules/common/linux/default.nix +++ b/modules/common/linux/default.nix @@ -206,7 +206,7 @@ in qt5.qtwayland ]; # Add a reliable terminal - programs.gnome-terminal.enable = true; + # programs.gnome-terminal.enable = true; # KDEConnect is just based programs.kdeconnect.enable = true; # Flatpaks are useful... sometimes... diff --git a/overlay.nix b/overlay.nix index 3c74948..90bc8ba 100644 --- a/overlay.nix +++ b/overlay.nix @@ -17,7 +17,9 @@ let sources = final.lib.attrsets.filterAttrs (name: f: !(builtins.hasAttr "outputs" f)) inputs; }; - overlay-versioning = final: prev: { }; + overlay-versioning = final: prev: { + ulauncher = prev.ulauncher.override { webkitgtk = final.webkitgtk_4_1; }; + }; overlay-libs = final: prev: { libs.crane = inputs.crane.lib.${prev.system};