updating and adding some better nix management

This commit is contained in:
Chris Cochrun 2024-10-29 13:48:32 -05:00
parent 12c6e36a11
commit 9f406deb53
10 changed files with 436 additions and 607 deletions

View file

@ -21,21 +21,11 @@
quickemu = {
url = "https://flakehub.com/f/quickemu-project/quickemu/4.9.6.tar.gz";
};
# hyprland = {
# radicle = {
# type = "git";
# url = "https://github.com/hyprwm/Hyprland";
# submodules = true;
# inputs.nixpkgs.follows = "nixpkgs-stable";
# url = "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
# inputs.nixpkgs.follows = "nixpkgs";
# };
# hyprland-plugins = {
# url = "github:hyprwm/hyprland-plugins";
# inputs.hyprland.follows = "hyprland";
# };
radicle = {
type = "git";
url = "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
inputs.nixpkgs.follows = "nixpkgs";
};
eww = {
url = "github:elkowar/eww";
inputs.nixpkgs.follows = "nixpkgs";
@ -54,38 +44,28 @@
simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11";
};
# anyrun = {
# url = "github:Kirottu/anyrun";
# inputs.nixpkgs.follows = "nixpkgs";
# };
libre-presenter = {
url = "gitlab:chriscochrun/lumina";
};
# nixified-ai = {
# url = "github:nixified-ai/flake";
# inputs.nixpkgs.follows = "nixpkgs";
# };
rust-overlay = {
url = "github:oxalica/rust-overlay";
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};
# rust-overlay = {
# url = "github:oxalica/rust-overlay";
# inputs.nixpkgs.follows = "nixpkgs";
# };
};
outputs = { nixpkgs,
outputs = inputs @ { nixpkgs,
nixpkgs-stable,
home-manager,
plasma-manager,
# hyprland,
nixos-cosmic,
quickemu,
nixos-hardware,
emacs,
nix-bitcoin,
libre-presenter,
eww,
ags,
stylix,
radicle,
rust-overlay, ... }:
stylix, ... }:
let
system = "x86_64-linux";
username = "chris";
@ -99,7 +79,7 @@
config = { allowUnfree = true; };
overlays = [
emacs.overlays.default
rust-overlay.overlays.default
# rust-overlay.overlays.default
eww.overlays.default
];
};
@ -107,23 +87,24 @@
lib = nixpkgs.lib;
in {
devShell = pkgsForSystem.mkShell {
name = "devy";
nativeBuildInputs = [];
buildInputs = with pkgsForSystem; [
cargo
rustc
clippy
rustfmt
rust-analyzer
];
};
# devShell = pkgsForSystem.mkShell {
# name = "devy";
# nativeBuildInputs = [];
# buildInputs = with pkgsForSystem; [
# cargo
# rustc
# clippy
# rustfmt
# rust-analyzer
# ];
# };
nixosConfigurations = {
syl = lib.nixosSystem {
inherit system;
pkgs = pkgsForSystem;
specialArgs = {
stable = stable;
inherit inputs;
};
modules = [
./systems/syl/configuration.nix
@ -131,6 +112,7 @@
# hyprland.nixosModules.default
# stylix.nixosModules.stylix
nixos-hardware.nixosModules.framework-11th-gen-intel
nixos-cosmic.nixosModules.default
# libre-presenter.defaultPackage
{
home-manager.useGlobalPkgs = true;
@ -144,12 +126,13 @@
kaladin = lib.nixosSystem {
inherit system;
pkgs = pkgsForSystem;
specialArgs = { inherit inputs; };
modules = [
./systems/kaladin/configuration.nix
home-manager.nixosModules.home-manager
# hyprland.nixosModules.default
# stylix.nixosModules.stylix
nixos-cosmic.nixosModules.default
nixos-hardware.nixosModules.common-gpu-amd
{
home-manager.useGlobalPkgs = true;