Fix NixOS switch inputs
This commit is contained in:
@@ -6,6 +6,29 @@
|
|||||||
makeEnable,
|
makeEnable,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
codexDesktopLinuxSource = pkgs.applyPatches {
|
||||||
|
name = "codex-desktop-linux-patched";
|
||||||
|
src = inputs.codex-desktop-linux;
|
||||||
|
patches = [ ./patches/codex-desktop-linux-dmg-hash.patch ];
|
||||||
|
};
|
||||||
|
codexDesktopLinux =
|
||||||
|
let
|
||||||
|
flake = import "${codexDesktopLinuxSource}/flake.nix";
|
||||||
|
self' =
|
||||||
|
(flake.outputs {
|
||||||
|
self = self';
|
||||||
|
nixpkgs = inputs.nixpkgs;
|
||||||
|
flake-utils = inputs.flake-utils;
|
||||||
|
})
|
||||||
|
// {
|
||||||
|
outPath = "${codexDesktopLinuxSource}";
|
||||||
|
rev = inputs.codex-desktop-linux.rev or "";
|
||||||
|
lastModified = inputs.codex-desktop-linux.lastModified or 1;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
self';
|
||||||
|
in
|
||||||
makeEnable config "myModules.code" true {
|
makeEnable config "myModules.code" true {
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -20,7 +43,7 @@ makeEnable config "myModules.code" true {
|
|||||||
};
|
};
|
||||||
|
|
||||||
home-manager.sharedModules = lib.mkIf config.myModules.desktop.enable [
|
home-manager.sharedModules = lib.mkIf config.myModules.desktop.enable [
|
||||||
inputs.codex-desktop-linux.homeManagerModules.default
|
codexDesktopLinux.homeManagerModules.default
|
||||||
{
|
{
|
||||||
home.sessionVariables.YDOTOOL_SOCKET = "/run/ydotoold/socket";
|
home.sessionVariables.YDOTOOL_SOCKET = "/run/ydotoold/socket";
|
||||||
systemd.user.sessionVariables.YDOTOOL_SOCKET = "/run/ydotoold/socket";
|
systemd.user.sessionVariables.YDOTOOL_SOCKET = "/run/ydotoold/socket";
|
||||||
|
|||||||
22
nixos/flake.lock
generated
22
nixos/flake.lock
generated
@@ -226,7 +226,9 @@
|
|||||||
},
|
},
|
||||||
"emacs-overlay": {
|
"emacs-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_7",
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -1425,7 +1427,7 @@
|
|||||||
"nix-utils": {
|
"nix-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": "nixpkgs_8"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744222205,
|
"lastModified": 1744222205,
|
||||||
@@ -1631,22 +1633,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1779560665,
|
|
||||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_8": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1629252929,
|
"lastModified": 1629252929,
|
||||||
"narHash": "sha256-Aj20gmGBs8TG7pyaQqgbsqAQ6cB+TVuL18Pk3DPBxcQ=",
|
"narHash": "sha256-Aj20gmGBs8TG7pyaQqgbsqAQ6cB+TVuL18Pk3DPBxcQ=",
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
../configuration.nix
|
../configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
myModules.wyoming.enable = true;
|
myModules.wyoming.enable = false;
|
||||||
features.full.enable = true;
|
features.full.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|||||||
13
nixos/patches/codex-desktop-linux-dmg-hash.patch
Normal file
13
nixos/patches/codex-desktop-linux-dmg-hash.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/flake.nix b/flake.nix
|
||||||
|
index 3a350b7..e54821b 100644
|
||||||
|
--- a/flake.nix
|
||||||
|
+++ b/flake.nix
|
||||||
|
@@ -81,7 +81,7 @@
|
||||||
|
|
||||||
|
codexDmg = pkgs.fetchurl {
|
||||||
|
url = "https://persistent.oaistatic.com/codex-app-prod/Codex.dmg";
|
||||||
|
- hash = "sha256-L5fZniPJ9N1mwOAr2tpebGa/Z3cs2J+IaoG1udfrSHw=";
|
||||||
|
+ hash = "sha256-smhl7TqwSYqLigb9lBfS2wOKLA8oUI+QHjnOzNTCZSk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
codexVersion = "26.527.30818";
|
||||||
Reference in New Issue
Block a user