try out lix for fun and profit

drop needless inputs
use "host" instead path
2024-05-07 10:17:45 -05:00 · 2024-05-07 10:15:44 -05:00 · 2024-05-07 09:51:15 -05:00 · 2024-05-07 09:39:11 -05:00
5 changed files with 149 additions and 90 deletions
--- a/flake.lock
+++ b/flake.lock
@ -93,6 +93,24 @@
      "inputs": {
        "systems": "systems_3"
      },
+      "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_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
      "locked": {
        "lastModified": 1705309234,
        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -107,9 +125,9 @@
        "type": "github"
      }
    },
-    "flake-utils_3": {
+    "flake-utils_4": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
      },
      "locked": {
        "lastModified": 1710146030,
@ -125,7 +143,7 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
+    "flake-utils_5": {
      "locked": {
        "lastModified": 1659877975,
        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -140,6 +158,21 @@
        "type": "github"
      }
    },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@ -200,11 +233,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1715012366,
-        "narHash": "sha256-+e9u2a92M3CIdnjMxqbJS0ulxkjXaRwHGIJR+fyhZII=",
+        "lastModified": 1715094470,
+        "narHash": "sha256-5m2mh5UbZLv54W0jvELt5l0xXE13yt+X2wtKjIvzQPI=",
        "ref": "refs/heads/main",
-        "rev": "fa69de8ab6cc17bb763a1586c55847c5d5a82a83",
-        "revCount": 4620,
+        "rev": "6ccc22194ca2d16bd7dc4b7263f897a547c50e6b",
+        "revCount": 4628,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@ -297,11 +330,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714755542,
-        "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
+        "lastModified": 1715088365,
+        "narHash": "sha256-cVH43+fiiCXqr6F2vUA8KmNI9ytWIQoZGnVz0IpBbZw=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
+        "rev": "6119dc2a965fd30ffa45c50a8398d5da3150df4c",
        "type": "github"
      },
      "original": {
@ -324,7 +357,7 @@
    },
    "lib-aggregate": {
      "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
@ -341,6 +374,48 @@
        "type": "github"
      }
    },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1714955862,
+        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
+        "ref": "refs/tags/2.90-beta.1",
+        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
+        "revCount": 15501,
+        "type": "git",
+        "url": "https://git@git.lix.systems/lix-project/lix"
+      },
+      "original": {
+        "ref": "refs/tags/2.90-beta.1",
+        "type": "git",
+        "url": "https://git@git.lix.systems/lix-project/lix"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "flakey-profile": "flakey-profile",
+        "lix": [
+          "lix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715038983,
+        "narHash": "sha256-DCZbFoNM8sx6YhEtu/xkNZfRwEt7RucJr3zuVVkugIw=",
+        "ref": "refs/heads/main",
+        "rev": "aaf759cd93d1946336247808e7551df714cfd332",
+        "revCount": 70,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nixos-module"
+      }
+    },
    "nix-eval-jobs": {
      "inputs": {
        "flake-parts": "flake-parts",
@ -443,11 +518,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1715004883,
-        "narHash": "sha256-4gtiHlHDC9P7/+cXNYVVTKLNN7v0ltJ1HIgYhX8c1wk=",
+        "lastModified": 1715091264,
+        "narHash": "sha256-EVtWdLNsWmOELUAY/Jvud2gmFIrXiJdy0v/ZtXDWq/I=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "05dbf637618396834607a9844660e2bf85f3051c",
+        "rev": "ccf2fce3be282a544ebe141c6a09103a0fb0d923",
        "type": "github"
      },
      "original": {
@ -490,11 +565,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1714912032,
-        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
+        "lastModified": 1715037484,
+        "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
+        "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
        "type": "github"
      },
      "original": {
@ -522,11 +597,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1714763106,
-        "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
+        "lastModified": 1714906307,
+        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
+        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
        "type": "github"
      },
      "original": {
@ -536,57 +611,21 @@
        "type": "github"
      }
    },
-    "pinix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709390347,
-        "narHash": "sha256-C7RDQ1xPktZGf8eSDUeZ2ZKetHtM2VJA0C10z0d8tkw=",
-        "owner": "remi-dupre",
-        "repo": "pinix",
-        "rev": "6f7dc0fccb0e48176629d061b07576d092a5d09c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "remi-dupre",
-        "repo": "pinix",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "f1multiviewer": "f1multiviewer",
        "hyprland": "hyprland",
        "hyprland-contrib": "hyprland-contrib",
+        "lix": "lix",
+        "lix-module": "lix-module",
        "nix-index-database": "nix-index-database",
        "nixpkgs": "nixpkgs_4",
        "nixpkgs-wayland": "nixpkgs-wayland",
-        "pinix": "pinix",
-        "stable": "stable",
        "tsm": "tsm",
        "zig2nix": "zig2nix",
        "zls": "zls"
      }
    },
-    "stable": {
-      "locked": {
-        "lastModified": 1714782413,
-        "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "651b4702e27a388f0f18e1b970534162dec09aff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1689347949,
@ -647,6 +686,21 @@
        "type": "github"
      }
    },
+    "systems_5": {
+      "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": [
@ -724,18 +778,18 @@
    "zig-overlay": {
      "inputs": {
        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
        "nixpkgs": [
          "zls",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1714133353,
-        "narHash": "sha256-oDA4fGiFPxwiLHTJjY2hWn06Dg4yFW+EH/U9FTL8oRY=",
+        "lastModified": 1715041400,
+        "narHash": "sha256-yI67g+yU2J/tjytr9cTk51feKjLc+f9+BKE1KjlMNLQ=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "751dd89e227c60e89c6362fc5cdd5cb814e3f1ba",
+        "rev": "48bcb35d1d59509010af9a3da06af8750ab9593b",
        "type": "github"
      },
      "original": {
@ -746,7 +800,7 @@
    },
    "zig2nix": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
        "nixpkgs": [
          "nixpkgs"
        ]
@ -767,7 +821,7 @@
    },
    "zls": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "gitignore": "gitignore",
        "langref": "langref",
        "nixpkgs": [
@ -776,11 +830,11 @@
        "zig-overlay": "zig-overlay"
      },
      "locked": {
-        "lastModified": 1714726694,
-        "narHash": "sha256-EZpShJM2csFe+EBFJyjVWs6/nPvQwiMuuWsmeltEMXg=",
+        "lastModified": 1715076382,
+        "narHash": "sha256-PK+ML1V5qI2dTU4a/7108RBHYcsZXamQtO+xt7qmT2E=",
        "owner": "zigtools",
        "repo": "zls",
-        "rev": "f6817ed3ca4d70c2181f96fbbf84cb533cd7205e",
+        "rev": "a660910dcb0a12067983de8e230e2a581e6edbbd",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -4,8 +4,15 @@
  outputs = inputs: (import ./lib inputs).oizysFlake;

  inputs = {
+    lix.url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+    lix.flake = false;
+
+    lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module";
+    lix-module.inputs.lix.follows = "lix";
+    lix-module.inputs.nixpkgs.follows = "nixpkgs";
+
    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    stable.url = "github:nixos/nixpkgs/nixos-23.11";
+    # stable.url = "github:nixos/nixpkgs/nixos-23.11";

    tsm.url = "github:daylinmorgan/tsm?dir=nix";
    tsm.inputs.nixpkgs.follows = "nixpkgs";
@ -16,9 +23,6 @@
    hyprland-contrib.url = "github:hyprwm/contrib";
    nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";

-    pinix.url = "github:remi-dupre/pinix";
-    pinix.inputs.nixpkgs.follows = "nixpkgs";
-
    nix-index-database.url = "github:nix-community/nix-index-database";
    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";

@ -36,13 +40,13 @@
      "https://hyprland.cachix.org"
      "https://nixpkgs-wayland.cachix.org"
      "https://daylin.cachix.org"
-      #   "https://cache.garnix.io"
+      "https://cache.lix.systems"
    ];
    extra-trusted-public-keys = [
      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
      "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
-      #   "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
    ];
  };
 }
--- a/lib/default.nix
+++ b/lib/default.nix
@ -32,10 +32,15 @@ rec {
    hostname:
    nixosSystem {
      system = "x86_64-linux";
-      modules = [
-        ../modules/oizys.nix
-        ../overlays
-      ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}"));
+      modules =
+        [
+          ../modules/oizys.nix
+          ../overlays
+          inputs.lix-module.nixosModules.default
+        ]
+        ++ filter
+        isNixFile
+        (listFilesRecursive (../. + "/hosts/${hostname}"));

      specialArgs = {
        inherit
--- a/modules/nix.nix
+++ b/modules/nix.nix
@ -8,7 +8,7 @@
  imports = [ inputs.nix-index-database.nixosModules.nix-index ];

  nixpkgs.config.allowUnfree = true;
-  nix.package = pkgs.nixVersions.latest;
+  # nix.package = pkgs.nixVersions.latest;
  nix.extraOptions = ''
    experimental-features = nix-command flakes
  '';
@ -24,7 +24,6 @@
    pkgs.nixd
    pkgs.nixfmt-rfc-style
    self.packages.${pkgs.system}.default
-    inputs.pinix.packages.${pkgs.system}.default
  ];

  programs.nix-index-database.comma.enable = true;
@ -35,12 +34,5 @@
  nix.settings = {
    trusted-users = [ "@wheel" ];
    accept-flake-config = true;
-
-    # substituters = [
-    #   "https://daylin.cachix.org"
-    # ];
-    # trusted-public-keys = [
-    #   "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
-    # ];
  };
 }
--- a/pkgs/oizys/oizys-go/pkg/oizys/oizys.go
+++ b/pkgs/oizys/oizys-go/pkg/oizys/oizys.go
@ -67,21 +67,25 @@ func ParseDryRunOutput(nixOutput string) {
 }

 func NixDryRun(flake string, host string) {
+	output := termenv.NewOutput(os.Stdout)
 	path := Output(flake, host)
 	cmd := exec.Command("nix", "build", path, "--dry-run")
 	s := spinner.New(
 		spinner.CharSets[14],
 		100*time.Millisecond,
-		spinner.WithSuffix(" evaluating derivation for: "+path),
+		spinner.WithSuffix(
+			fmt.Sprintf("%s %s", " evaluating derivation for:",
+				output.String(host).Bold().Foreground(output.Color("6")),
+			)),
 		spinner.WithColor("fgHiMagenta"))
 	s.Start()
-	output, err := cmd.CombinedOutput()
+	result, err := cmd.CombinedOutput()
 	s.Stop()
 	if err != nil {
-		fmt.Println(string(output))
+		fmt.Println(string(result))
 		log.Fatal(err)
 	}
-	ParseDryRunOutput(string(output))
+	ParseDryRunOutput(string(result))
 }

 func NixosRebuild(subcmd string, flake string, rest ...string) {
Author	SHA1	Message	Date
Daylin Morgan	90ae194c09	try out lix for fun and profit	2024-05-07 10:17:45 -05:00
Daylin Morgan	8fa4932820	drop needless inputs	2024-05-07 10:15:44 -05:00
Daylin Morgan	610d339b59	use "host" instead path	2024-05-07 09:51:15 -05:00
Daylin Morgan	4171629934	flake.lock: Update Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=fa69de8ab6cc17bb763a1586c55847c5d5a82a83' (2024-05-06) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=ec092bd601d9d351ff6ca34bd97f12055b2a4dd9' (2024-05-07) • Updated input 'hyprland/hyprwayland-scanner': 'github:hyprwm/hyprwayland-scanner/1270ebaa539e56d61b708c24b072b09cbbd3a828' (2024-05-03) → 'github:hyprwm/hyprwayland-scanner/6119dc2a965fd30ffa45c50a8398d5da3150df4c' (2024-05-07) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d' (2024-05-05) → 'github:nixos/nixpkgs/ad7efee13e0d216bf29992311536fce1d3eefbef' (2024-05-06) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/05dbf637618396834607a9844660e2bf85f3051c' (2024-05-06) → 'github:nix-community/nixpkgs-wayland/ccf2fce3be282a544ebe141c6a09103a0fb0d923' (2024-05-07) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/e9be42459999a253a9f92559b1f5b72e1b44c13d' (2024-05-03) → 'github:nixos/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05) • Updated input 'stable': 'github:nixos/nixpkgs/651b4702e27a388f0f18e1b970534162dec09aff' (2024-05-04) → 'github:nixos/nixpkgs/27c13997bf450a01219899f5a83bd6ffbfc70d3c' (2024-05-06) • Updated input 'zls': 'github:zigtools/zls/f6817ed3ca4d70c2181f96fbbf84cb533cd7205e' (2024-05-03) → 'github:zigtools/zls/a660910dcb0a12067983de8e230e2a581e6edbbd' (2024-05-07) • Updated input 'zls/zig-overlay': 'github:mitchellh/zig-overlay/751dd89e227c60e89c6362fc5cdd5cb814e3f1ba' (2024-04-26) → 'github:mitchellh/zig-overlay/48bcb35d1d59509010af9a3da06af8750ab9593b' (2024-05-07)	2024-05-07 09:39:11 -05:00