daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-29 11:30:43 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:3040b77bff64c271efc0d0a04a9c19bba5b2f3a6
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:360cb79ea112630fbba473378c1b14ea9c520564
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "3040b77bff64c271efc0d0a04a9c19bba5b2f3a6" and "360cb79ea112630fbba473378c1b14ea9c520564" have entirely different histories.
3040b77bff ... 360cb79ea1

8 changed files with 72 additions and 252 deletions
Show stats Expand all files Collapse all files

265
flake.lock
View file

@ -1,25 +1,5 @@
{ {
"nodes": { "nodes": {
"f1multiviewer": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1712592932,
"narHash": "sha256-G44hEGn5+PvjkY9YvUoWnFz9FZOtRKwEc6W/7EjzOgs=",
"owner": "daylinmorgan",
"repo": "f1multiviewer-flake",
"rev": "189b84de363cfa1d95cc77093e4e3bcd1ff1e492",
"type": "github"
},
"original": {
"owner": "daylinmorgan",
"repo": "f1multiviewer-flake",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1688025799, "lastModified": 1688025799,
@ -35,22 +15,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -75,7 +39,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -93,7 +57,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -109,66 +73,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"hyprcursor": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": "hyprlang",
"hyprland",
"hyprlang"
],
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
@ -179,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712434681, "lastModified": 1711466786,
"narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=", "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3", "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,20 +103,20 @@
"inputs": { "inputs": {
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems", "systems": "systems_2",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1712586782, "lastModified": 1712248444,
"narHash": "sha256-8/JkRxsXLhiGELcw7t5RBf1mk94mbHc/oJiBzoPYTv8=", "narHash": "sha256-ayxuwrzpow3cRoKtCYj3v7GGrDHTbKVDDUxb8wd1cL8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "63e3668529f6c06478ec288723d0ba46374c4bc5", "rev": "c4b660a33930a0e60e853b6796c1fd76914b1719",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +133,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712505318, "lastModified": 1711036118,
"narHash": "sha256-fzlBLhXUN6y7mzEtcGNRDXxFakBEfaj4Bmj5PuoCNaM=", "narHash": "sha256-BxWizZAc845ks9BjEXosRjfBv/NMr1WwoORBQuixfII=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "5870244b592c22558b658dbaf94f9e41afb0316f", "rev": "536f00c5895015da1e7aa85bbee9aa6dcd149e69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -265,6 +172,29 @@
} }
}, },
"hyprlang": { "hyprlang": {
"inputs": {
"nixpkgs": [
"hyprland",
"hyprcursor",
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
@ -276,11 +206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711671891, "lastModified": 1711250455,
"narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=", "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "c1402612146ba06606ebf64963a02bc1efe11e74", "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,29 +219,17 @@
"type": "github" "type": "github"
} }
}, },
"langref": {
"flake": false,
"locked": {
"narHash": "sha256-94broSBethRhPJr0G9no4TPyB8ee6BQ/hHK1QnLPln0=",
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in"
}
},
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1712491724, "lastModified": 1711886936,
"narHash": "sha256-E5EcBzf/zaR3hD8g1CDtqqwXXebSWtqOvoaR+LDjTME=", "narHash": "sha256-D2WENp9GuaCostvNcQ7vElekk0V5cuMdnFZ7NfRhVrQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "2737d0204685c3274390229a09eb8f7eaa1a9e89", "rev": "9c06929b83e57c18d125f1105ba6a423f24083d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +288,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712459390, "lastModified": 1711854532,
"narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", "narHash": "sha256-JPStavwlT7TfxxiXHk6Q7sbNxtnXAIjXQJMLO0KB6M0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4676d72d872459e1e3a248d049609f110c570e9a", "rev": "2844b5f3ad3b478468151bd101370b9d8ef8a3a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +303,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712573573, "lastModified": 1712192574,
"narHash": "sha256-xxon7WwNm4/EadMKg1eF40/5s0O78nXUy2ILZt6vT7E=", "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0d28066770464d19d637f6e8e42e8688420b6ac6", "rev": "f480f9d09e4b4cf87ee6151eba068197125714de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +319,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1712450863, "lastModified": 1711846064,
"narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "rev": "90b1a963ff84dc532db92f678296ff2499a60a87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712589286, "lastModified": 1712237761,
"narHash": "sha256-pyppS3qgeZagY/YZF0ug2rf97Z91+gaUwnS0McFuH1k=", "narHash": "sha256-NoMBBCADTms3yx5BL+sbc7vfDivNiYULO6t9GBAsPt0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "2547cb5b49297ad22dee07f6847c7a99a99f7721", "rev": "9b77653338f52da4b498abdf4835efb6ff6e453e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,7 +393,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"f1multiviewer": "f1multiviewer",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
@ -484,17 +401,16 @@
"pinix": "pinix", "pinix": "pinix",
"stable": "stable", "stable": "stable",
"tsm": "tsm", "tsm": "tsm",
"zig2nix": "zig2nix", "zig2nix": "zig2nix"
"zls": "zls"
} }
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1712437997, "lastModified": 1712168706,
"narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,16 +437,16 @@
}, },
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1689347949,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"type": "github" "type": "github"
} }
}, },
@ -660,29 +576,6 @@
"type": "github" "type": "github"
} }
}, },
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1711627798,
"narHash": "sha256-4BUZmgUFrrD5dRZbOUYRRQEDwLX/r7/ErLi+vHfB/+8=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "b01e0b81d1fa489e54362ea0a74f182eaa9a35bb",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zig2nix": { "zig2nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -691,11 +584,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712539287, "lastModified": 1712193674,
"narHash": "sha256-TIcl3dKFqSymIFUj3vRN05Ahl2eAH/EqJRf/P5nCBtY=", "narHash": "sha256-VNFjRCfTYvWP2UvjA9r/44qrTXZ+JGOVnYSTDSajdeM=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "53e12c1a03c34b0b35bcb0eb5b495ba90f62302f", "rev": "31122d9accecf7d281229bb9e12dedddef120a1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -703,30 +596,6 @@
"repo": "zig2nix", "repo": "zig2nix",
"type": "github" "type": "github"
} }
},
"zls": {
"inputs": {
"flake-utils": "flake-utils_3",
"gitignore": "gitignore",
"langref": "langref",
"nixpkgs": [
"nixpkgs"
],
"zig-overlay": "zig-overlay"
},
"locked": {
"lastModified": 1711925513,
"narHash": "sha256-DFgsGlEGsxLgtRrh7J+v8x4w+/cJatTCkrZP3/0Gb/o=",
"owner": "zigtools",
"repo": "zls",
"rev": "4e01c08f558ea07462aaa7b71d2a24f86f47a855",
"type": "github"
},
"original": {
"owner": "zigtools",
"repo": "zls",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

6
flake.nix
View file

@ -25,12 +25,6 @@
zig2nix.url = "github:Cloudef/zig2nix"; zig2nix.url = "github:Cloudef/zig2nix";
zig2nix.inputs.nixpkgs.follows = "nixpkgs"; zig2nix.inputs.nixpkgs.follows = "nixpkgs";
zls.url = "github:zigtools/zls";
zls.inputs.nixpkgs.follows = "nixpkgs";
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
}; };
nixConfig = { nixConfig = {

1
hosts/othalan/default.nix
View file

@ -20,7 +20,6 @@ in {
"nim" "nim"
"tex" "tex"
"node" "node"
"zig"
]; ];
}; };

3
modules/desktop/gui.nix
View file

@ -1,5 +1,4 @@
{ {
inputs,
pkgs, pkgs,
config, config,
lib, lib,
@ -26,8 +25,6 @@ in {
accents = ["rosewater"]; accents = ["rosewater"];
variant = "mocha"; variant = "mocha";
}) })
inputs.f1multiviewer.outputs.packages.${pkgs.system}.default
]; ];
}; };
} }

1
modules/development/cli.nix
View file

@ -23,7 +23,6 @@ mkDefaultOizysModule config "cli" {
delta delta
ripgrep ripgrep
glow
btop btop
inputs.tsm.packages.${pkgs.system}.tsm inputs.tsm.packages.${pkgs.system}.tsm
]; ];

4
modules/languages/default.nix
View file

@ -1,10 +1,10 @@
{lib, ...}: let {lib, ...}: let
inherit (lib) mkOption types literalExpression mdDoc; inherit (lib) mkOption types literalExpression mdDoc;
in { in {
imports = [./nim.nix ./tex.nix ./misc.nix ./node.nix ./python.nix ./zig.nix]; imports = [./nim.nix ./tex.nix ./misc.nix ./node.nix ./python.nix];
options.oizys.languages = mkOption { options.oizys.languages = mkOption {
type = with types; (listOf str); type = with types; (listOf str);
description = mdDoc '' description = lib.mdDoc ''
List of programming languages to enable. List of programming languages to enable.
''; '';
default = []; default = [];

16
modules/languages/zig.nix
View file

@ -1,16 +0,0 @@
{
inputs,
config,
lib,
pkgs,
...
}: let
inherit (lib) mkIfIn;
cfg = config.oizys.languages;
zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
zls = inputs.zls.outputs.packages.${pkgs.system}.default;
in {
config = mkIfIn "zig" cfg {
environment.systemPackages = [zig zls];
};
}

28
pkgs/oizys/oizys-zig/src/Oizys.zig
View file

@ -31,11 +31,7 @@ pub fn init(allocator: std.mem.Allocator, matches: *const ArgMatches) !Oizys {
.allocator = allocator, .allocator = allocator,
.host = host, .host = host,
.flake = flake, .flake = flake,
.output = try std.fmt.allocPrint( .output = try std.fmt.allocPrint(allocator, "{s}#nixosConfigurations.{s}.config.system.build.toplevel", .{ flake, host }),
allocator,
"{s}#nixosConfigurations.{s}.config.system.build.toplevel",
.{ flake, host },
),
.cmd = std.meta.stringToEnum(OizysCmd, cmd).?, .cmd = std.meta.stringToEnum(OizysCmd, cmd).?,
.cache_name = flags.getSingleValue("cache") orelse "daylin", .cache_name = flags.getSingleValue("cache") orelse "daylin",
.no_pinix = flags.containsArg("no-pinix"), .no_pinix = flags.containsArg("no-pinix"),
@ -71,11 +67,7 @@ pub fn getDefaultFlake(allocator: Allocator) ![]const u8 {
} }
pub fn getOutputPath(self: *Oizys) ![]const u8 { pub fn getOutputPath(self: *Oizys) ![]const u8 {
return std.fmt.allocPrint( return std.fmt.allocPrint(self.allocator, "{s}#nixosConfigurations.{s}.config.system.build.toplevel", .{ self.flake, self.host });
self.allocator,
"{s}#nixosConfigurations.{s}.config.system.build.toplevel",
.{ self.flake, self.host },
);
} }
pub const NixCmd = enum { Nix, NixosRebuild }; pub const NixCmd = enum { Nix, NixosRebuild };
@ -94,21 +86,7 @@ pub fn runNixCmd(self: *Oizys, cmd: NixCmd, argv: []const []const u8) !void {
} }
pub fn cache(self: *Oizys) !void { pub fn cache(self: *Oizys) !void {
var p = std.ChildProcess.init( var p = std.ChildProcess.init(&.{ "cachix", "watch-exec", self.cache_name, "--verbose", "--", "nix", "build", self.flake, "--print-build-logs", "--accept-flake-config" }, self.allocator);
&.{
"cachix",
"watch-exec",
self.cache_name,
"--verbose",
"--",
"nix",
"build",
self.output,
"--print-build-logs",
"--accept-flake-config",
},
self.allocator,
);
_ = try p.spawnAndWait(); _ = try p.spawnAndWait();
} }