flake.lock

@@ -55,24 +55,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": "hyprlang",
@@ -112,11 +94,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1712248444,
+        "lastModified": 1711985879,
-        "narHash": "sha256-ayxuwrzpow3cRoKtCYj3v7GGrDHTbKVDDUxb8wd1cL8=",
+        "narHash": "sha256-Gv0GD7NqsO6M4WeORRTK+LCfNjZD7LGhAZTapoZortw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "c4b660a33930a0e60e853b6796c1fd76914b1719",
+        "rev": "db1506130b507f92e0daf3a36495fb985e242bbc",
         "type": "github"
       },
       "original": {
@@ -303,11 +285,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712192574,
+        "lastModified": 1711715736,
-        "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=",
+        "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f480f9d09e4b4cf87ee6151eba068197125714de",
+        "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
         "type": "github"
       },
       "original": {
@@ -342,11 +324,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712237761,
+        "lastModified": 1711889114,
-        "narHash": "sha256-NoMBBCADTms3yx5BL+sbc7vfDivNiYULO6t9GBAsPt0=",
+        "narHash": "sha256-e3gegueJAWQVrE4SXYh13Uu6tOCjpnagqHiKOQ7B31c=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "9b77653338f52da4b498abdf4835efb6ff6e453e",
+        "rev": "8c4df2153c615554b516ba698f5f7bd64f7bf520",
         "type": "github"
       },
       "original": {
@@ -400,17 +382,16 @@
         "nixpkgs-wayland": "nixpkgs-wayland",
         "pinix": "pinix",
         "stable": "stable",
-        "tsm": "tsm",
+        "tsm": "tsm"
-        "zig2nix": "zig2nix"
       }
     },
     "stable": {
       "locked": {
-        "lastModified": 1712168706,
+        "lastModified": 1711668574,
-        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
+        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
+        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
         "type": "github"
       },
       "original": {
@@ -465,21 +446,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -575,27 +541,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "zig2nix": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712193674,
-        "narHash": "sha256-VNFjRCfTYvWP2UvjA9r/44qrTXZ+JGOVnYSTDSajdeM=",
-        "owner": "Cloudef",
-        "repo": "zig2nix",
-        "rev": "31122d9accecf7d281229bb9e12dedddef120a1f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Cloudef",
-        "repo": "zig2nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -22,9 +22,6 @@
 
     nix-index-database.url = "github:nix-community/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-
-    zig2nix.url = "github:Cloudef/zig2nix";
-    zig2nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   nixConfig = {

lib/default.nix

@@ -10,7 +10,7 @@ inputs: let
   #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
   supportedSystems = ["x86_64-linux"];
 in rec {
-  forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs {inherit system;}));
+  forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system});
 
   nixosModules = listToAttrs (findModulesList ../modules);
 
@@ -32,10 +32,9 @@ in rec {
   oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
   oizysPkg = forAllSystems (
     pkgs: rec {
-      oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig { zig2nix = inputs.zig2nix;};
       oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim {};
-      oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs {};
+      oizys = pkgs.callPackage ../pkgs/oizys/oizys-rs {};
-      default = oizys-zig;
+      default = oizys;
     }
   );
   devShells = forAllSystems (

modules/desktop/gui.nix

@@ -20,11 +20,6 @@ in {
 
       libreoffice-qt
       hunspell # spell check for libreoffice
-
-      (catppuccin-gtk.override {
-        accents = ["rosewater"];
-        variant = "mocha";
-      })
     ];
   };
 }

modules/languages/misc.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   config,
   lib,
   pkgs,
@@ -7,12 +6,11 @@
 }: let
   inherit (lib) mkIfIn;
   cfg = config.oizys.languages;
-  zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
 in {
   config = mkIfIn "misc" cfg {
     environment.systemPackages = with pkgs; [
       go
       rustup
-    ] ++ [ zig ];
+    ];
   };
 }

modules/nix.nix

@@ -25,7 +25,7 @@
     nil
     alejandra
 
-    self.packages.${pkgs.system}.default
+    self.packages.${pkgs.system}.oizys
     inputs.pinix.packages.${pkgs.system}.default
   ];
 

pkgs/oizys/oizys-rs/default.nix

@@ -1,7 +1,6 @@
 {
   installShellFiles,
   rustPlatform,
-  nix-output-monitor,
 }:
 rustPlatform.buildRustPackage {
   pname = "oizys";
@@ -12,7 +11,6 @@ rustPlatform.buildRustPackage {
   };
 
   nativeBuildInputs = [installShellFiles];
-  buildInputs = [nix-output-monitor];
 
   postInstall = ''
     installShellCompletion --cmd oizys \

pkgs/oizys/oizys-zig/.gitignore

@@ -1,13 +0,0 @@
-# Created by https://www.toptal.com/developers/gitignore/api/zig
-# Edit at https://www.toptal.com/developers/gitignore?templates=zig
-
-### zig ###
-# Zig programming language
-
-zig-cache/
-zig-out/
-build/
-build-*/
-docgen_tmp/
-
-# End of https://www.toptal.com/developers/gitignore/api/zig

pkgs/oizys/oizys-zig/build.zig

@@ -1,36 +0,0 @@
-const std = @import("std");
-
-pub fn build(b: *std.Build) void {
-    b.release_mode = .safe;
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    const exe = b.addExecutable(.{
-        .name = "oizys",
-        .root_source_file = .{ .path = "src/main.zig" },
-        .target = target,
-        .optimize = optimize,
-    });
-    exe.root_module.addImport("yazap", b.dependency("yazap", .{ .target = target }).module("yazap"));
-    b.installArtifact(exe);
-
-    const run_cmd = b.addRunArtifact(exe);
-    run_cmd.step.dependOn(b.getInstallStep());
-    if (b.args) |args| {
-        run_cmd.addArgs(args);
-    }
-    const run_step = b.step("run", "Run the app");
-    run_step.dependOn(&run_cmd.step);
-
-    // I haven't written any...
-    // const exe_unit_tests = b.addTest(.{
-    //     .root_source_file = .{ .path = "src/main.zig" },
-    //     .target = target,
-    //     .optimize = optimize,
-    // });
-    //
-    // const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);
-    // const test_step = b.step("test", "Run unit tests");
-    // test_step.dependOn(&run_exe_unit_tests.step);
-    //
-}

pkgs/oizys/oizys-zig/build.zig.zon

@@ -1,11 +0,0 @@
-.{
-    .name = "oizys-zig",
-    .version = "0.0.0",
-    .dependencies = .{
-        .yazap = .{
-            .url = "git+https://github.com/cdmistman/yazap.git#1ae1a5b562f5c66caf8e87e04313094f16e327fc",
-            .hash = "1220fa71798c994044a987cbde6e73af76bfc402117a61971ccf48f4af4b7154e8d3",
-        },
-    },
-    .paths = .{""},
-}

pkgs/oizys/oizys-zig/build.zig.zon2json-lock

@@ -1,7 +0,0 @@
-{
-  "1220fa71798c994044a987cbde6e73af76bfc402117a61971ccf48f4af4b7154e8d3": {
-    "name": "yazap",
-    "url": "git+https://github.com/cdmistman/yazap.git#1ae1a5b562f5c66caf8e87e04313094f16e327fc",
-    "hash": "sha256-nNhFpay+xk0Ix3GAT1fZ2q/bD9AAx7Xkl4X7QxlzK0M="
-  }
-}

pkgs/oizys/oizys-zig/default.nix

@@ -1,12 +0,0 @@
-{
-  pkgs,
-  zig2nix,
-  lib,
-  ...
-}:
-        (zig2nix.outputs.zig-env.${pkgs.system} {
-          zig = zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
-        }).package {
-  name = "oizys";
-  src = lib.cleanSource ./.;
-}

pkgs/oizys/oizys-zig/src/Cli.zig

@@ -1,35 +0,0 @@
-const Cli = @This();
-const std = @import("std");
-const yazap = @import("yazap");
-const App = yazap.App;
-const Arg = yazap.Arg;
-
-const Allocator = std.mem.Allocator;
-app: App,
-
-pub fn init(allocator: Allocator) !Cli {
-    var app = App.init(allocator, "oizys", "nix begat oizys");
-
-    const oizys = app.rootCommand();
-    var cmd_dry = app.createCommand("dry", "poor man's nix flake check");
-    var cmd_build = app.createCommand("build", "build nixos (w/nix build)");
-    var cmd_cache = app.createCommand("cache", "build and push to cachix");
-    var cmd_output = app.createCommand("output", "show system flake output path");
-    var cmd_boot = app.createCommand("boot", "nixos rebuild boot");
-    var cmd_switch = app.createCommand("switch", "nixos rebuild switch");
-    const commands = .{ &cmd_dry, &cmd_build, &cmd_cache, &cmd_output, &cmd_switch, &cmd_boot };
-
-    try cmd_cache.addArg(Arg.singleValueOption("name", 'n', "name of cachix cache"));
-    inline for (commands) |subcmd| {
-        try subcmd.addArg(Arg.singleValueOption("flake", 'f', "path to flake"));
-        try subcmd.addArg(Arg.singleValueOption("host", null, "hostname (default: current host)"));
-        try subcmd.addArg(Arg.booleanOption("no-pinix", null, "don't use pinix"));
-        try oizys.addSubcommand(subcmd.*);
-    }
-
-    return Cli{ .app = app };
-}
-
-pub fn deinit(self: *Cli) void {
-    self.app.deinit();
-}

pkgs/oizys/oizys-zig/src/Oizys.zig

@@ -1,114 +0,0 @@
-const Oizys = @This();
-const std = @import("std");
-const ArgMatches = @import("yazap").ArgMatches;
-const Allocator = std.mem.Allocator;
-
-allocator: Allocator,
-flake: []const u8,
-host: []const u8,
-cache_name: []const u8,
-output: []const u8,
-cmd: OizysCmd,
-debug: bool = false,
-no_pinix: bool = false,
-
-pub const OizysCmd = enum {
-    dry,
-    @"switch",
-    boot,
-    cache,
-    output,
-    build,
-};
-
-pub fn init(allocator: std.mem.Allocator, matches: *const ArgMatches) !Oizys {
-    const cmd = matches.subcommand.?.name;
-    const flags = matches.subcommandMatches(cmd).?;
-    const host = flags.getSingleValue("host") orelse try Oizys.getDefaultHostName(allocator);
-    const flake = flags.getSingleValue("flake") orelse try Oizys.getDefaultFlake(allocator);
-    const cache_name = flags.getSingleValue("cache") orelse "daylin";
-
-    return Oizys{
-        .allocator = allocator,
-        .host = host,
-        .flake = flake, 
-        .output = try std.fmt.allocPrint(allocator, "{s}#nixosConfigurations.{s}.config.system.build.toplevel", .{ flake, host }),
-        .cmd = std.meta.stringToEnum(OizysCmd, cmd).?,
-        .cache_name = cache_name,
-    };
-}
-
-pub fn deinit(self: *Oizys) void {
-    self.allocator.free(self.flake);
-    self.allocator.free(self.host);
-    self.allocator.free(self.output);
-}
-
-pub fn nix(self: *Oizys) []const u8 {
-    return if (self.no_pinix) "nix" else "pix";
-}
-
-pub fn nixos_rebuild(self: *Oizys) []const u8 {
-    return if (self.no_pinix) "nixos-rebuild" else "pixos-rebuild";
-}
-
-pub fn getDefaultHostName(allocator: Allocator) ![]const u8 {
-    var name_buffer: [std.posix.HOST_NAME_MAX]u8 = undefined;
-    const hostname = try std.posix.gethostname(&name_buffer);
-    return std.fmt.allocPrint(allocator, "{s}", .{hostname});
-}
-
-pub fn getDefaultFlake(allocator: Allocator) ![]const u8 {
-    return std.process.getEnvVarOwned(allocator, "OIZYS_DIR") catch {
-        const homedir = try std.process.getEnvVarOwned(allocator, "HOME");
-        defer allocator.free(homedir);
-        return try std.fmt.allocPrint(allocator, "{s}/oizys", .{homedir});
-    };
-}
-
-pub fn getOutputPath(self: *Oizys) ![]const u8 {
-    return std.fmt.allocPrint(self.allocator, "{s}#nixosConfigurations.{s}.config.system.build.toplevel", .{ self.flake, self.host });
-}
-
-pub const NixCmd = enum { Nix, NixosRebuild };
-
-pub fn runNixCmd(self: *Oizys, cmd: NixCmd, argv: []const []const u8) !void {
-    var args = std.ArrayList([]const u8).init(self.allocator);
-    defer args.deinit();
-
-    switch (cmd) {
-        NixCmd.Nix => try args.append(self.nix()),
-        NixCmd.NixosRebuild => try args.appendSlice(&.{ "sudo", self.nixos_rebuild() }),
-    }
-    try args.appendSlice(argv);
-    var p = std.ChildProcess.init(args.items, self.allocator);
-    _ = try p.spawnAndWait();
-}
-
-pub fn cache(self: *Oizys) !void {
-    var p = std.ChildProcess.init(&.{ "cachix", "watch-exec", self.cache_name,"--verbose" ,"--", "nix", "build", self.flake, "--print-build-logs", "--accept-flake-config" }, self.allocator);
-    _ = try p.spawnAndWait();
-}
-
-pub fn run(self: *Oizys) !void {
-    switch (self.cmd) {
-        .@"switch" => {
-            try self.runNixCmd(NixCmd.NixosRebuild, &.{ "switch", "--flake", self.flake });
-        },
-        .boot => {
-            try self.runNixCmd(NixCmd.NixosRebuild, &.{ "boot", "--flake", self.flake });
-        },
-        .dry => {
-            try self.runNixCmd(NixCmd.Nix, &.{ "build", self.output, "--dry-run" });
-        },
-        .build => {
-            try self.runNixCmd(NixCmd.Nix, &.{ "build", self.output });
-        },
-        .output => {
-            std.debug.print("{s}", .{self.output});
-        },
-        .cache => {
-            try self.cache();
-        },
-    }
-}

pkgs/oizys/oizys-zig/src/main.zig

@@ -1,22 +0,0 @@
-const std = @import("std");
-const Oizys = @import("Oizys.zig");
-const Cli = @import("Cli.zig");
-
-pub fn main() !void {
-    // memory management isn't hard :P
-    var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
-    defer arena.deinit();
-    const allocator = arena.allocator();
-
-    var cli = try Cli.init(allocator);
-    const matches = try cli.app.parseProcess();
-
-    if (!matches.containsArgs()) {
-        try cli.app.displayHelp();
-        return;
-    }
-
-    var oizys = try Oizys.init(allocator, matches);
-    try oizys.run();
-
-}