mir/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to Lix, re-indent

Browse Source
This commit is contained in:
Miranda Marquez 2024-05-05 21:28:20 -08:00
parent 8ada6bf851
commit b5efafcb45
4 changed files with 279 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
flake.lock
View File

@ -66,6 +66,39 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"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"
}
},
"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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -129,6 +162,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": 1714868057,
"narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
"ref": "refs/heads/main",
"rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
"revCount": 62,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"mir-home": {
"inputs": {
"home-manager": "home-manager_2",
@ -219,6 +294,8 @@
"emacs-config": "emacs-config",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"lix": "lix",
"lix-module": "lix-module",
"mir-home": "mir-home",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
@ -240,6 +317,21 @@
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

351
flake.nix
View File

@ -8,6 +8,15 @@
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
};
nur.url = github:nix-community/NUR;
home-manager = {
url = "github:nix-community/home-manager/release-23.11";
@ -30,175 +39,177 @@
};
};
outputs = inputs@{
self,
nixpkgs,
nixpkgs-unstable,
home-manager,
nur,
... }: {
nixosConfigurations = {
kremzeek = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" {
networking.wireless.enable = false;
}
./configuration.nix {
networking.hostName = "kremzeek";
boot.loader.efi.canTouchEfiVariables = true;
# sound.enable = true;
# hardware.pulseaudio.enable = true;
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
galvatron = # {{{
let
system = "aarch64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" ];
boot.binfmt.emulatedSystems = ["x86_64-linux"];
hardware.asahi = {
peripheralFirmwareDirectory = ./galvatron/firmware;
# useExperimentalGPUDriver = true;
# experimentalGPUInstallMode = "driver";
# experimentalGPUInstallMode = "overlay";
};
boot.loader.efi.canTouchEfiVariables = false;
networking = {
hostName = "galvatron";
hostId = "57184c38";
};
sound.enable = true; # only on unstable?
}
./hardware/galvatron-hw.nix
./modules/sound/pipewire.nix
inputs.apple-silicon.nixosModules.apple-silicon-support
inputs.home-manager-unstable.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
breakdown = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
networking = {
hostName = "breakdown";
hostId = "3ba70c47";
};
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./server/services.nix
# ./hardware/breakdown-hw.nix
./hardware/generic.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
starscream = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
networking.hostName = "starscream";
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/starscream-hw.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
knockout = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
# inputs.nur.nixosModules.nur
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
boot.loader.efi.canTouchEfiVariables = true;
networking = {
hostName = "knockout";
hostId = "499130bf";
};
sound.enable = true;
}
./modules/droidcam-obs.nix # only this machine
./hardware/knockout-hw.nix
./modules/sound/pipewire.nix
inputs.home-manager-unstable.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
inputs.nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
self,
nixpkgs,
nixpkgs-unstable,
lix-module,
home-manager,
nur,
... }: {
nixosConfigurations = {
kremzeek = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" {
networking.wireless.enable = false;
}
./configuration.nix {
networking.hostName = "kremzeek";
boot.loader.efi.canTouchEfiVariables = true;
# sound.enable = true;
# hardware.pulseaudio.enable = true;
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
galvatron = # {{{
let
system = "aarch64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" ];
boot.binfmt.emulatedSystems = ["x86_64-linux"];
hardware.asahi = {
peripheralFirmwareDirectory = ./galvatron/firmware;
# useExperimentalGPUDriver = true;
# experimentalGPUInstallMode = "driver";
# experimentalGPUInstallMode = "overlay";
};
boot.loader.efi.canTouchEfiVariables = false;
networking = {
hostName = "galvatron";
hostId = "57184c38";
};
sound.enable = true; # only on unstable?
}
./hardware/galvatron-hw.nix
./modules/sound/pipewire.nix
inputs.apple-silicon.nixosModules.apple-silicon-support
inputs.home-manager-unstable.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
breakdown = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
networking = {
hostName = "breakdown";
hostId = "3ba70c47";
};
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./server/services.nix
# ./hardware/breakdown-hw.nix
./hardware/generic.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
starscream = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
networking.hostName = "starscream";
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/starscream-hw.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
knockout = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
# inputs.nur.nixosModules.nur
lix-module.nixosModules.default
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
boot.loader.efi.canTouchEfiVariables = true;
networking = {
hostName = "knockout";
hostId = "499130bf";
};
sound.enable = true;
}
./modules/droidcam-obs.nix # only this machine
./hardware/knockout-hw.nix
./modules/sound/pipewire.nix
inputs.home-manager-unstable.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
inputs.nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
ravage = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
networking = {
hostName = "ravage";
hostId = "c53d3e32";
};
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/ravage-hw.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
};
};
ravage = # {{{
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
networking = {
hostName = "ravage";
hostId = "c53d3e32";
};
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/ravage-hw.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
};
};
}

1
home.nix
View File

@ -25,7 +25,6 @@ with lib.hm.gvariant;
pkgs.eza
pkgs.python3
pkgs.unzip
pkgs.devenv
# pkgs.gnupg
# pkgs.python3
# (pkgs.python3.withPackages(

6
modules/nix-settings.nix
View File

@ -4,6 +4,12 @@
nix.settings.extra-experimental-features = [ "nix-command" "flakes" ];
nix.settings.cores = 2;
nix.settings.max-jobs = 4;
nix.settings.extra-substituters = [
"https://cache.lix.systems"
];
nix.settings.trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
];
nix.buildMachines = [{
hostName = "unicron";
system = "x86_64-linux";