johno/home-manager-config
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pin hyprland and hy3 to match the system

Browse Source
This commit is contained in:
John Ogle
2024-08-23 15:27:58 -07:00
parent c085821bd4
commit 36de237993
2 changed files with 106 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
flake.lock generated
View File

@@ -3,28 +3,32 @@
"aquamarine": { "aquamarine": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"system-flake",
"hyprland", "hyprland",
"hyprutils" "hyprutils"
], ],
"hyprwayland-scanner": [ "hyprwayland-scanner": [
"system-flake",
"hyprland", "hyprland",
"hyprwayland-scanner" "hyprwayland-scanner"
], ],
"nixpkgs": [ "nixpkgs": [
"system-flake",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"system-flake",
"hyprland", "hyprland",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1724273991, "lastModified": 1722347739,
"narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=", "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4", "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -53,9 +57,31 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"system-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723986931,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hy3": { "hy3": {
"inputs": { "inputs": {
"hyprland": [ "hyprland": [
"system-flake",
"hyprland" "hyprland"
] ]
}, },
@@ -77,24 +103,27 @@
"hyprcursor": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": [
"system-flake",
"hyprland", "hyprland",
"hyprlang" "hyprlang"
], ],
"nixpkgs": [ "nixpkgs": [
"system-flake",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"system-flake",
"hyprland", "hyprland",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1722623071, "lastModified": 1721330371,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -110,13 +139,14 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"systems": "systems", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723058230, "lastModified": 1723058230,
"narHash": "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=", "narHash": "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=",
"ref": "refs/heads/main",
"rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259", "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
"revCount": 5069, "revCount": 5069,
"submodules": true, "submodules": true,
@@ -133,11 +163,13 @@
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"system-flake",
"hyprland", "hyprland",
"xdph", "xdph",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"system-flake",
"hyprland", "hyprland",
"xdph", "xdph",
"systems" "systems"
@@ -160,24 +192,27 @@
"hyprlang": { "hyprlang": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"system-flake",
"hyprland", "hyprland",
"hyprutils" "hyprutils"
], ],
"nixpkgs": [ "nixpkgs": [
"system-flake",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"system-flake",
"hyprland", "hyprland",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1724174162, "lastModified": 1721324361,
"narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=", "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c", "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -189,20 +224,22 @@
"hyprutils": { "hyprutils": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"system-flake",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"system-flake",
"hyprland", "hyprland",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1722869141, "lastModified": 1722098849,
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7", "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -214,10 +251,12 @@
"hyprwayland-scanner": { "hyprwayland-scanner": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"system-flake",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"system-flake",
"hyprland", "hyprland",
"systems" "systems"
] ]
@@ -238,11 +277,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1724224976, "lastModified": 1723637854,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -252,7 +307,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1723637854,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
@@ -271,9 +326,28 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"system-flake": "system-flake"
}
},
"system-flake": {
"inputs": {
"home-manager": "home-manager_2",
"hy3": "hy3", "hy3": "hy3",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
},
"locked": {
"dirtyRev": "c11d973b4b80e9093469c2d631413400af2d0122-dirty",
"dirtyShortRev": "c11d973-dirty",
"lastModified": 1724450819,
"narHash": "sha256-m9w2HgDUvtXegSjuIPE3whTYOPnyEZuAdIRZLMtGQBc=",
"type": "git",
"url": "file:///etc/nixos"
},
"original": {
"type": "git",
"url": "file:///etc/nixos"
} }
}, },
"systems": { "systems": {
@@ -295,24 +369,27 @@
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": [ "hyprlang": [
"system-flake",
"hyprland", "hyprland",
"hyprlang" "hyprlang"
], ],
"nixpkgs": [ "nixpkgs": [
"system-flake",
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"system-flake",
"hyprland", "hyprland",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1724073926, "lastModified": 1722365976,
"narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "a08ecbbf33598924e93542f737fc6169a26b481e", "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
flake.nix
View File

@@ -10,19 +10,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = { system-flake = {
type = "git"; type = "git";
url = "https://github.com/hyprwm/Hyprland"; url = "file:///etc/nixos";
submodules = true;
rev = "9a09eac79b85c846e3a865a9078a3f8ff65a9259";
};
hy3 = {
url = "github:outfoxxed/hy3?ref=hl0.42.0";
inputs.hyprland.follows = "hyprland";
}; };
}; };
outputs = { nixpkgs, home-manager, hyprland, hy3, ... }: outputs = { nixpkgs, home-manager, ... } @inputs :
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@@ -33,14 +27,17 @@
# Specify your home configuration modules here, for example, # Specify your home configuration modules here, for example,
# the path to your home.nix. # the path to your home.nix.
modules = [ modules = [
hyprland.homeManagerModules.default inputs.system-flake.inputs.hyprland.homeManagerModules.default
./home.nix ./home.nix
]; ];
# Optionally use extraSpecialArgs # Optionally use extraSpecialArgs
# to pass through arguments to home.nix # to pass through arguments to home.nix
extraSpecialArgs = { inherit hy3; inherit hyprland; }; extraSpecialArgs = {
hy3 = inputs.system-flake.inputs.hy3;
hyprland = inputs.system-flake.inputs.hyprland;
};
}; };
}; };
} }