mirror of
https://github.com/TheWanderingCrow/CrOS.git
synced 2026-01-10 17:34:05 -05:00
add iamb to crow comms
This commit is contained in:
TheWanderingCrow
parent
d171a3e449
commit
a505c76621
3 changed files with 190 additions and 77 deletions
129
flake.lock
generated
129
flake.lock
generated
|
|
@ -175,6 +175,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1761827175,
|
||||
|
|
@ -211,6 +229,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"iamb-flake": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1753247963,
|
||||
"narHash": "sha256-hXYxEwwC5taNnCE1KuM4XcGFf7aaTnZNF5A8/MuIK8w=",
|
||||
"owner": "ulyssa",
|
||||
"repo": "iamb",
|
||||
"rev": "e9cdb3371abb60d74e2a3949b6e0adcd073165ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ulyssa",
|
||||
"ref": "v0.0.11-alpha.1",
|
||||
"repo": "iamb",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"impermanence": {
|
||||
"locked": {
|
||||
"lastModified": 1737831083,
|
||||
|
|
@ -271,7 +310,7 @@
|
|||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
|
|
@ -345,7 +384,7 @@
|
|||
},
|
||||
"nix-secrets": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761156521,
|
||||
|
|
@ -469,6 +508,38 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1736883708,
|
||||
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1736320768,
|
||||
"narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1761373498,
|
||||
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
|
||||
|
|
@ -484,7 +555,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1750605355,
|
||||
"narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=",
|
||||
|
|
@ -498,7 +569,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1761597516,
|
||||
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
|
||||
|
|
@ -514,7 +585,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1757745802,
|
||||
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
|
||||
|
|
@ -530,7 +601,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1756696532,
|
||||
"narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=",
|
||||
|
|
@ -546,7 +617,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1739214665,
|
||||
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
|
||||
|
|
@ -567,8 +638,8 @@
|
|||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"mnw": "mnw",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"systems": "systems_2"
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1757773905,
|
||||
|
|
@ -586,7 +657,7 @@
|
|||
},
|
||||
"nvix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nvf": "nvf"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -659,11 +730,12 @@
|
|||
"disko": "disko",
|
||||
"hardware": "hardware",
|
||||
"home-manager": "home-manager",
|
||||
"iamb-flake": "iamb-flake",
|
||||
"impermanence": "impermanence",
|
||||
"niri-flake": "niri-flake",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nix-secrets": "nix-secrets",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-darwin": "nixpkgs-darwin",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
|
|
@ -672,6 +744,24 @@
|
|||
"the-nest": "the-nest"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736994333,
|
||||
"narHash": "sha256-v4Jrok5yXsZ6dwj2+2uo5cSyUi9fBTurHqHvNHLT1XA=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "848db855cb9e88785996e961951659570fc58814",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -722,10 +812,25 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"the-nest": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_3",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745340936,
|
||||
|
|
|
|||
129
flake.nix
129
flake.nix
|
|
@ -1,72 +1,76 @@
|
|||
{
|
||||
description = "CrOS Ecosystem";
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
...
|
||||
} @ inputs: let
|
||||
inherit (self) outputs;
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
inherit (self) outputs;
|
||||
|
||||
# Architectures
|
||||
forAllSystems = nixpkgs.lib.genAttrs [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
# Extend lib with lib.custom
|
||||
lib = nixpkgs.lib.extend (self: super: {custom = import ./lib {inherit (nixpkgs) lib;};});
|
||||
in {
|
||||
# Overlays
|
||||
overlays = import ./overlays {inherit inputs;};
|
||||
# Architectures
|
||||
forAllSystems = nixpkgs.lib.genAttrs [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
# Extend lib with lib.custom
|
||||
lib = nixpkgs.lib.extend (self: super: { custom = import ./lib { inherit (nixpkgs) lib; }; });
|
||||
in
|
||||
{
|
||||
# Overlays
|
||||
overlays = import ./overlays { inherit inputs; };
|
||||
|
||||
# Host Configurations
|
||||
nixosConfigurations = builtins.listToAttrs (
|
||||
map (host: {
|
||||
name = host;
|
||||
value = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs lib;
|
||||
isDarwin = false;
|
||||
# Host Configurations
|
||||
nixosConfigurations = builtins.listToAttrs (
|
||||
map (host: {
|
||||
name = host;
|
||||
value = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs lib;
|
||||
isDarwin = false;
|
||||
};
|
||||
modules = [ ./hosts/nixos/${host} ];
|
||||
};
|
||||
modules = [./hosts/nixos/${host}];
|
||||
};
|
||||
}) (builtins.attrNames (builtins.readDir ./hosts/nixos))
|
||||
);
|
||||
}) (builtins.attrNames (builtins.readDir ./hosts/nixos))
|
||||
);
|
||||
|
||||
# For later, to enable if we get any darwin hosts
|
||||
# darwinConfigurations = builtins.listToAttrs (
|
||||
# map (host: {
|
||||
# name = host;
|
||||
# value = nix-darwin.lib.darwinSystem {
|
||||
# specialArgs = {
|
||||
# inherit inputs outputs lib;
|
||||
# isDarwin = true;
|
||||
# };
|
||||
# modules = [ ./hosts/darwin/${host} ];
|
||||
# };
|
||||
# }) (builtins.attrNames (builtins.readDir ./hosts/darwin))
|
||||
# );
|
||||
# For later, to enable if we get any darwin hosts
|
||||
# darwinConfigurations = builtins.listToAttrs (
|
||||
# map (host: {
|
||||
# name = host;
|
||||
# value = nix-darwin.lib.darwinSystem {
|
||||
# specialArgs = {
|
||||
# inherit inputs outputs lib;
|
||||
# isDarwin = true;
|
||||
# };
|
||||
# modules = [ ./hosts/darwin/${host} ];
|
||||
# };
|
||||
# }) (builtins.attrNames (builtins.readDir ./hosts/darwin))
|
||||
# );
|
||||
|
||||
#packages = forAllSystems (
|
||||
# system: let
|
||||
# pkgs = import nixpkgs {
|
||||
# inherit system;
|
||||
# overlays = [self.overlays.default];
|
||||
# };
|
||||
# in
|
||||
# nixpkgs.lib.packagesFromDirectoryRecursive {
|
||||
# callPackage = nixpkgs.lib.callPackageWith pkgs;
|
||||
# directory = ./pkgs/common;
|
||||
# }
|
||||
#);
|
||||
#packages = forAllSystems (
|
||||
# system: let
|
||||
# pkgs = import nixpkgs {
|
||||
# inherit system;
|
||||
# overlays = [self.overlays.default];
|
||||
# };
|
||||
# in
|
||||
# nixpkgs.lib.packagesFromDirectoryRecursive {
|
||||
# callPackage = nixpkgs.lib.callPackageWith pkgs;
|
||||
# directory = ./pkgs/common;
|
||||
# }
|
||||
#);
|
||||
|
||||
devShells = forAllSystems (
|
||||
system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
#overlays = [self.overlays.default];
|
||||
};
|
||||
in
|
||||
devShells = forAllSystems (
|
||||
system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
#overlays = [self.overlays.default];
|
||||
};
|
||||
in
|
||||
builtins.listToAttrs (
|
||||
map (name: {
|
||||
inherit name;
|
||||
|
|
@ -75,8 +79,8 @@
|
|||
};
|
||||
}) (builtins.attrNames (builtins.readDir ./devshells))
|
||||
)
|
||||
);
|
||||
};
|
||||
);
|
||||
};
|
||||
|
||||
inputs = {
|
||||
# Official inputs
|
||||
|
|
@ -112,6 +116,7 @@
|
|||
|
||||
niri-flake.url = "github:sodiboo/niri-flake";
|
||||
authentik-nix.url = "github:nix-community/authentik-nix";
|
||||
iamb-flake.url = "github:ulyssa/iamb/v0.0.11-alpha.1";
|
||||
|
||||
# CrOS inputs
|
||||
nix-secrets.url = "git+ssh://git@github.com/TheWanderingCrow/nix-secrets";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{pkgs, ...}: {
|
||||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
home.packages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
ferdium
|
||||
discord
|
||||
mattermost
|
||||
slack
|
||||
zoom
|
||||
;
|
||||
inherit (inputs.iamb-flake.packages.${pkgs.system})
|
||||
default
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue