daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-13 19:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:110058d2cb85ffbd419699685b3573b24bc20db1
Branches Tags
daylin:main
daylin:flake-lock
daylin:algiz
daylin:master
..
compare: daylin:6efe35770fa92cbb6293cf56afc5f53af09046a2
Branches Tags
daylin:main
daylin:flake-lock
daylin:algiz
daylin:master

3 commits
110058d2cb ... 6efe35770f

Author SHA1 Message Date
Daylin Morgan
6efe35770f
don't use multiline log in ci since no lix 2024-07-01 10:50:53 -05:00
Daylin Morgan
2160a0d184
switch to stable swww 2024-07-01 10:43:42 -05:00
Daylin Morgan
aad5cf3eb2
flake.lock: Update 
Flake lock file updates:

• Updated input 'f1multiviewer':
    'github:daylinmorgan/f1multiviewer-flake/5ef3bb97663a0b179e712300c6bdc0c8919f80b0' (2024-06-23)
  → 'github:daylinmorgan/f1multiviewer-flake/486b994efb44be7a77e86f7a65f6d3e5cde0dc97' (2024-06-30)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=718afe271ecebfe6711453b9cfee90fa49a7e761' (2024-06-29)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=d7ea1b7785f31e9fd6477490309721a19a835592' (2024-06-30)
• Updated input 'lix':
    '5dc85e8b72.tar.gz?narHash=sha256-Qn0y/WEYcBL/SKEnpJq1e9tDpVi57YGDiJM2MgavLXM%3D' (2024-06-26)
  → '010ff57ebb.tar.gz?narHash=sha256-u5ppUxkqx9fj4uLo131D93RA1Al1pyi6BcHprevgwkQ%3D' (2024-06-30)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/4293f532d0107dfb7e6f8b34a0421dc8111320e6' (2024-06-23)
  → 'github:nix-community/nix-index-database/2917972ed34ce292309b3a4976286f8b5c08db27' (2024-07-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/1e3deb3d8a86a870d925760db1a5adecc64d329d' (2024-06-27)
  → 'github:nixos/nixpkgs/12a9c0004bc987afb1ff511ebb97b67497a68e22' (2024-06-30)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/2601e1f153afbad9f0714a354109a31c2fbaed66' (2024-06-29)
  → 'github:nix-community/nixpkgs-wayland/39007212220f3eb8aa439ac0d7e3a8940f3f227f' (2024-07-01)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a' (2024-06-23)
  → 'github:nix-community/lib-aggregate/a15b020a1d0fc483386eb001ec6735b8a30bec81' (2024-06-30)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863' (2024-06-23)
  → 'github:nix-community/nixpkgs.lib/1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6' (2024-06-30)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/b2852eb9365c6de48ffb0dc2c9562591f652242a' (2024-06-27)
  → 'github:nixos/nixpkgs/2741b4b489b55df32afac57bc4bfd220e8bf617e' (2024-06-29)
• Updated input 'roc':
    'github:roc-lang/roc/8538a883fa49d67b504a9dbefbc032917c3d7360' (2024-06-29)
  → 'github:roc-lang/roc/05ab0183805907c3042e9f946a08b793ea75c038' (2024-07-01)
• Updated input 'stable':
    'github:nixos/nixpkgs/90bd1b26e23760742fdcb6152369919098f05417' (2024-06-24)
  → 'github:nixos/nixpkgs/4a1e673523344f6ccc84b37f4413ad74ea19a119' (2024-06-29)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/c2ae891725912c737d69194be673f0676ed001e8' (2024-06-29)
  → 'github:Cloudef/zig2nix/40dde9856de971543b41e5f680a59df5a6be540f' (2024-07-01)
 2024-07-01 10:38:10 -05:00
5 changed files with 54 additions and 54 deletions
Show stats Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View file

@ -44,16 +44,6 @@ jobs:
name: daylin name: daylin
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" 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 - name: write lock file
if: "${{ inputs.lockFile != '' }}" if: "${{ inputs.lockFile != '' }}"
run: | run: |

76
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1719147217, "lastModified": 1719753430,
"narHash": "sha256-h0MkxLXLqyaIa8BsnW2THNoCw2/pPIhgtl2wxTiGvtQ=", "narHash": "sha256-z8IbDp2jRzCb7842v0sFnRL0nFTXgtSEl9XJBGGeeNw=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "f1multiviewer-flake", "repo": "f1multiviewer-flake",
"rev": "5ef3bb97663a0b179e712300c6bdc0c8919f80b0", "rev": "486b994efb44be7a77e86f7a65f6d3e5cde0dc97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1719684307, "lastModified": 1719786368,
"narHash": "sha256-mpBw92WX8uqxRd4UWAHg4K6r33brYqDg8cpVXzr1NnQ=", "narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "718afe271ecebfe6711453b9cfee90fa49a7e761", "rev": "d7ea1b7785f31e9fd6477490309721a19a835592",
"revCount": 4897, "revCount": 4900,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -482,11 +482,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1719144654, "lastModified": 1719749459,
"narHash": "sha256-3eKm5xwc2M4WJ1wQ4POID8jpDARWXEAMcuh1xDItJl8=", "narHash": "sha256-sAZRJNJ9FRUPvseuH21kmh9s+Q6AfQWPNxKVm534wgk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a", "rev": "a15b020a1d0fc483386eb001ec6735b8a30bec81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719439912, "lastModified": 1719783043,
"narHash": "sha256-Qn0y/WEYcBL/SKEnpJq1e9tDpVi57YGDiJM2MgavLXM=", "narHash": "sha256-u5ppUxkqx9fj4uLo131D93RA1Al1pyi6BcHprevgwkQ=",
"rev": "5dc85e8b72d1ba433f69200537146275ff1c4a03", "rev": "010ff57ebb40f1a9aaff99867d2886f0e59f774a",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5dc85e8b72d1ba433f69200537146275ff1c4a03.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/010ff57ebb40f1a9aaff99867d2886f0e59f774a.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -582,11 +582,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719111455, "lastModified": 1719832725,
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +658,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1719103869, "lastModified": 1719708727,
"narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=", "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863", "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -679,11 +679,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1719667078, "lastModified": 1719847124,
"narHash": "sha256-DnmBMI+vSMfXdCrOvDNIicd6FbPna9lYwFumz0KWNSI=", "narHash": "sha256-7aAzoZpyoMofUHwCOCwmgwSYxj4gqvnRkJJ0/B14ltQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "2601e1f153afbad9f0714a354109a31c2fbaed66", "rev": "39007212220f3eb8aa439ac0d7e3a8940f3f227f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1719468428, "lastModified": 1719760900,
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "narHash": "sha256-NkvFphHXKtQQ8F0XrqGlqkOhjHbE3671F8oLxwtTHhk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "rev": "12a9c0004bc987afb1ff511ebb97b67497a68e22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -774,11 +774,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1719506693, "lastModified": 1719690277,
"narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,11 +851,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1719637499, "lastModified": 1719834518,
"narHash": "sha256-AKizREh+fzww8MJz+kp2hrSV4nrxmjCTd8gf0noZrPY=", "narHash": "sha256-5gkZjzHe5exZHq9VNzVAyJ1uOx7WPSVvWAuo8r5mmg0=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "8538a883fa49d67b504a9dbefbc032917c3d7360", "rev": "05ab0183805907c3042e9f946a08b793ea75c038",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -911,11 +911,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1719234068, "lastModified": 1719663039,
"narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90bd1b26e23760742fdcb6152369919098f05417", "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1150,11 +1150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719623866, "lastModified": 1719822050,
"narHash": "sha256-9dX+QyfkoUNT7di2Tu2DZz3OrvCTs1aRxyoglfSTtXY=", "narHash": "sha256-b+nuXFemxeTTCUa4/zcMnFJqsQz/VhYJwIsomAABjfc=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "c2ae891725912c737d69194be673f0676ed001e8", "rev": "40dde9856de971543b41e5f680a59df5a6be540f",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -23,7 +23,6 @@
inputs.lix.follows = "lix"; inputs.lix.follows = "lix";
}; };
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.url = "github:hyprwm/contrib";

15
modules/desktop/window-managers/hyprland.nix
View file

@ -41,12 +41,21 @@ mkOizysModule config "hyprland" {
swww swww
]) ])
++ [ inputs.hyprman.packages.${pkgs.system}.default ]; ++ [ inputs.hyprman.packages.${pkgs.system}.default ]
# swww-git isbroken
++ (with inputs.nixpkgs-wayland.packages.${pkgs.system}; [
mako
eww
wlr-randr
# swww
#
# dunst
]);
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.hyprland-contrib.overlays.default inputs.hyprland-contrib.overlays.default
inputs.nixpkgs-wayland.overlay # inputs.nixpkgs-wayland.overlay
# inputs.hyprland.overlays.default # inputs.hyprland.overlays.default
]; ];
} }

6
pkgs/oizys/internal/oizys/main.go
View file

@ -259,7 +259,9 @@ func NixosRebuild(subcmd string, rest ...string) {
"--flake", "--flake",
o.flake, o.flake,
) )
cmd.Args = append(cmd.Args, "--log-format", "multiline") if !o.inCI {
cmd.Args = append(cmd.Args, "--log-format", "multiline")
}
if o.verbose { if o.verbose {
cmd.Args = append(cmd.Args, "--print-build-logs") cmd.Args = append(cmd.Args, "--print-build-logs")
} }
@ -290,7 +292,7 @@ func NixBuild(nom bool, minimal bool, rest ...string) {
} }
cmd.Args = append(cmd.Args, drvs...) cmd.Args = append(cmd.Args, drvs...)
} }
cmd.Args = append(cmd.Args, "--log-format", "multiline") cmd.Args = append(cmd.Args, "--log-format", "multiline")
cmd.Args = append(cmd.Args, rest...) cmd.Args = append(cmd.Args, rest...)
exitWithCommand(cmd) exitWithCommand(cmd)
} }