kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sorted some stuff in configuration

Browse source
This commit is contained in:
Aleksandr Lebedev 2024-12-19 01:09:26 +01:00
parent 6599e23992
commit 5e05a1e5c1
36 changed files with 210 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

198
flake.nix
View file

@ -1,20 +1,20 @@
{
description = "NixOS config";
description = "NixOS config";
inputs = {
nixpkgs = {
url = "github:nixos/nixpkgs?ref=nixos-unstable";
};
nixvim = {
inputs = {
nixpkgs = {
url = "github:nixos/nixpkgs?ref=nixos-unstable";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "github:hyprwm/Hyprland";
stylix.url = "github:danth/stylix";
#nix-flatpak.url = "github:GermanBread/declarative-flatpak/stable-v3";
#nix-flatpak.url = "github:GermanBread/declarative-flatpak/stable-v3";
apple-silicon-support.url = "github:tpwrules/nixos-apple-silicon";
#nur.url = "github:nix-community/NUR";
#nur.url = "github:nix-community/NUR";
sops-nix.url = "github:Mic92/sops-nix";
home-manager = {
@ -22,106 +22,102 @@
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
impermanence.url = "github:nix-community/impermanence";
};
outputs = { self, nixpkgs, stylix, nixvim, ... }@inputs:
let
#systems = ["aarch64-linux" "x86_64-linux" ];
#forAllSystems = nixpkgs.lib.genAttrs systems;
#pkgs = import nixpkgs {
# inherit system;
# config = {
# allowUnfree = true;
# };
#};
arm = "aarch64-linux";
x86 = "x86_64-linux";
username = "kylekrein";
let
#systems = ["aarch64-linux" "x86_64-linux" ];
#forAllSystems = nixpkgs.lib.genAttrs systems;
#pkgs = import nixpkgs {
# inherit system;
# config = {
# allowUnfree = true;
# };
#};
arm = "aarch64-linux";
x86 = "x86_64-linux";
general-modules = [
inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.default
stylix.nixosModules.stylix
inputs.nixos-facter-modules.nixosModules.facter
];
general-modules = [
inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.default
stylix.nixosModules.stylix
inputs.nixos-facter-modules.nixosModules.facter
];
first-nixos-install = "1729112485"; #stat -c %W /
in
{
nixosConfigurations = {
"${username}-homepc" = nixpkgs.lib.nixosSystem {
specialArgs = {
hwconfig = {
hostname = "${username}-homepc";
isLaptop = false;
system = x86;
useImpermanence = true;
};
inherit username;
inherit first-nixos-install;
inherit inputs; };
system = x86;
#pkgs = import nixpkgs {
# system = x86;
# config = {
# allowBroken = true;
# allowUnfree = true;
# };
# };
modules = [
inputs.impermanence.nixosModules.impermanence
inputs.disko.nixosModules.default
(import ./nixos/modules/disko/impermanence-disko.nix { device = "/dev/nvme0n1"; } )
./nixos/modules/impermanence
#nur.nixosModules.nur
./nixos/configuration.nix
./nixos/nvidia.nix
#./nixos/homepc-hardware-conf.nix
./nixos/libvirt.nix
#nix-flatpak.nixosModules.default
] ++ general-modules;
};
"${username}-mac" = nixpkgs.lib.nixosSystem {
specialArgs = {
hwconfig = {
hostname = "${username}-mac";
isLaptop = true;
system = arm;
useImpermanence = true;
};
inherit username;
inherit first-nixos-install;
inherit inputs; };
system = arm;
#pkgs = import nixpkgs {
# system = arm;
# overlays = [
# (import ./nixos/macos/widevine.nix)
# ];
# config = {
# allowBroken = true;
# allowUnfree = true;
# };
# };
modules = [
inputs.impermanence.nixosModules.impermanence
./nixos/configuration.nix
./nixos/modules/impermanence
inputs.apple-silicon-support.nixosModules.default
./nixos/mac-hardware-conf.nix
./nixos/macos/configuration.nix
] ++ general-modules;
};
first-nixos-install = "1729112485"; #stat -c %W /
in
{
nixosConfigurations = {
"kylekrein-homepc" = nixpkgs.lib.nixosSystem {
specialArgs = {
hwconfig = {
hostname = "kylekrein-homepc";
isLaptop = false;
system = x86;
useImpermanence = true;
};
inherit first-nixos-install;
inherit inputs; };
system = x86;
#pkgs = import nixpkgs {
# system = x86;
# config = {
# allowBroken = true;
# allowUnfree = true;
# };
# };
modules = [
inputs.impermanence.nixosModules.impermanence
inputs.disko.nixosModules.default
(import ./nixos/modules/disko/impermanence-disko.nix { device = "/dev/nvme0n1"; } )
./nixos/modules/impermanence
#nur.nixosModules.nur
./nixos/configuration.nix
./nixos/hardware/nvidia.nix
#./nixos/homepc-hardware-conf.nix
#nix-flatpak.nixosModules.default
] ++ general-modules;
};
"kylekrein-mac" = nixpkgs.lib.nixosSystem {
specialArgs = {
hwconfig = {
hostname = "kylekrein-mac";
isLaptop = true;
system = arm;
useImpermanence = true;
};
inherit first-nixos-install;
inherit inputs; };
system = arm;
#pkgs = import nixpkgs {
# system = arm;
# overlays = [
# (import ./nixos/macos/widevine.nix)
# ];
# config = {
# allowBroken = true;
# allowUnfree = true;
# };
# };
modules = [
inputs.impermanence.nixosModules.impermanence
./nixos/configuration.nix
./nixos/modules/impermanence
inputs.apple-silicon-support.nixosModules.default
./nixos/hosts/kylekrein-mac/mac-hardware-conf.nix
./nixos/hardware/macos/configuration.nix
] ++ general-modules;
};
};
};
};
}