mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-26 09:20:44 -06:00
Compare commits
No commits in common. "6efe35770fa92cbb6293cf56afc5f53af09046a2" and "110058d2cb85ffbd419699685b3573b24bc20db1" have entirely different histories.
6efe35770f
...
110058d2cb
5 changed files with 54 additions and 54 deletions
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
|
|
@ -44,6 +44,16 @@ jobs:
|
|||
name: daylin
|
||||
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
||||
|
||||
- name: Swap Lix for nix
|
||||
run: |
|
||||
which nix
|
||||
sudo nix run \
|
||||
--experimental-features "nix-command flakes" \
|
||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \
|
||||
'git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90.0-rc1' -- \
|
||||
upgrade-nix \
|
||||
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
|
||||
|
||||
- name: write lock file
|
||||
if: "${{ inputs.lockFile != '' }}"
|
||||
run: |
|
||||
|
|
|
|||
76
flake.lock
76
flake.lock
|
|
@ -5,11 +5,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719753430,
|
||||
"narHash": "sha256-z8IbDp2jRzCb7842v0sFnRL0nFTXgtSEl9XJBGGeeNw=",
|
||||
"lastModified": 1719147217,
|
||||
"narHash": "sha256-h0MkxLXLqyaIa8BsnW2THNoCw2/pPIhgtl2wxTiGvtQ=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "f1multiviewer-flake",
|
||||
"rev": "486b994efb44be7a77e86f7a65f6d3e5cde0dc97",
|
||||
"rev": "5ef3bb97663a0b179e712300c6bdc0c8919f80b0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -305,11 +305,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719786368,
|
||||
"narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=",
|
||||
"lastModified": 1719684307,
|
||||
"narHash": "sha256-mpBw92WX8uqxRd4UWAHg4K6r33brYqDg8cpVXzr1NnQ=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "d7ea1b7785f31e9fd6477490309721a19a835592",
|
||||
"revCount": 4900,
|
||||
"rev": "718afe271ecebfe6711453b9cfee90fa49a7e761",
|
||||
"revCount": 4897,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -482,11 +482,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719749459,
|
||||
"narHash": "sha256-sAZRJNJ9FRUPvseuH21kmh9s+Q6AfQWPNxKVm534wgk=",
|
||||
"lastModified": 1719144654,
|
||||
"narHash": "sha256-3eKm5xwc2M4WJ1wQ4POID8jpDARWXEAMcuh1xDItJl8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "a15b020a1d0fc483386eb001ec6735b8a30bec81",
|
||||
"rev": "7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -498,11 +498,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1719783043,
|
||||
"narHash": "sha256-u5ppUxkqx9fj4uLo131D93RA1Al1pyi6BcHprevgwkQ=",
|
||||
"rev": "010ff57ebb40f1a9aaff99867d2886f0e59f774a",
|
||||
"lastModified": 1719439912,
|
||||
"narHash": "sha256-Qn0y/WEYcBL/SKEnpJq1e9tDpVi57YGDiJM2MgavLXM=",
|
||||
"rev": "5dc85e8b72d1ba433f69200537146275ff1c4a03",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/010ff57ebb40f1a9aaff99867d2886f0e59f774a.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5dc85e8b72d1ba433f69200537146275ff1c4a03.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -582,11 +582,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719832725,
|
||||
"narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
|
||||
"lastModified": 1719111455,
|
||||
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
|
||||
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -658,11 +658,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1719708727,
|
||||
"narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=",
|
||||
"lastModified": 1719103869,
|
||||
"narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6",
|
||||
"rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -679,11 +679,11 @@
|
|||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719847124,
|
||||
"narHash": "sha256-7aAzoZpyoMofUHwCOCwmgwSYxj4gqvnRkJJ0/B14ltQ=",
|
||||
"lastModified": 1719667078,
|
||||
"narHash": "sha256-DnmBMI+vSMfXdCrOvDNIicd6FbPna9lYwFumz0KWNSI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "39007212220f3eb8aa439ac0d7e3a8940f3f227f",
|
||||
"rev": "2601e1f153afbad9f0714a354109a31c2fbaed66",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -742,11 +742,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1719760900,
|
||||
"narHash": "sha256-NkvFphHXKtQQ8F0XrqGlqkOhjHbE3671F8oLxwtTHhk=",
|
||||
"lastModified": 1719468428,
|
||||
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "12a9c0004bc987afb1ff511ebb97b67497a68e22",
|
||||
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -774,11 +774,11 @@
|
|||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1719690277,
|
||||
"narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
|
||||
"lastModified": 1719506693,
|
||||
"narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
|
||||
"rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -851,11 +851,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719834518,
|
||||
"narHash": "sha256-5gkZjzHe5exZHq9VNzVAyJ1uOx7WPSVvWAuo8r5mmg0=",
|
||||
"lastModified": 1719637499,
|
||||
"narHash": "sha256-AKizREh+fzww8MJz+kp2hrSV4nrxmjCTd8gf0noZrPY=",
|
||||
"owner": "roc-lang",
|
||||
"repo": "roc",
|
||||
"rev": "05ab0183805907c3042e9f946a08b793ea75c038",
|
||||
"rev": "8538a883fa49d67b504a9dbefbc032917c3d7360",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -911,11 +911,11 @@
|
|||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1719663039,
|
||||
"narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
|
||||
"lastModified": 1719234068,
|
||||
"narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
|
||||
"rev": "90bd1b26e23760742fdcb6152369919098f05417",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1150,11 +1150,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719822050,
|
||||
"narHash": "sha256-b+nuXFemxeTTCUa4/zcMnFJqsQz/VhYJwIsomAABjfc=",
|
||||
"lastModified": 1719623866,
|
||||
"narHash": "sha256-9dX+QyfkoUNT7di2Tu2DZz3OrvCTs1aRxyoglfSTtXY=",
|
||||
"owner": "Cloudef",
|
||||
"repo": "zig2nix",
|
||||
"rev": "40dde9856de971543b41e5f680a59df5a6be540f",
|
||||
"rev": "c2ae891725912c737d69194be673f0676ed001e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
inputs.lix.follows = "lix";
|
||||
};
|
||||
|
||||
|
||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
|
||||
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||
|
||||
|
|
|
|||
|
|
@ -41,21 +41,12 @@ mkOizysModule config "hyprland" {
|
|||
|
||||
swww
|
||||
])
|
||||
++ [ inputs.hyprman.packages.${pkgs.system}.default ]
|
||||
|
||||
# swww-git isbroken
|
||||
++ (with inputs.nixpkgs-wayland.packages.${pkgs.system}; [
|
||||
mako
|
||||
eww
|
||||
wlr-randr
|
||||
# swww
|
||||
#
|
||||
# dunst
|
||||
]);
|
||||
++ [ inputs.hyprman.packages.${pkgs.system}.default ];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
inputs.hyprland-contrib.overlays.default
|
||||
# inputs.nixpkgs-wayland.overlay
|
||||
inputs.nixpkgs-wayland.overlay
|
||||
|
||||
# inputs.hyprland.overlays.default
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -259,9 +259,7 @@ func NixosRebuild(subcmd string, rest ...string) {
|
|||
"--flake",
|
||||
o.flake,
|
||||
)
|
||||
if !o.inCI {
|
||||
cmd.Args = append(cmd.Args, "--log-format", "multiline")
|
||||
}
|
||||
if o.verbose {
|
||||
cmd.Args = append(cmd.Args, "--print-build-logs")
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue