jackmechem/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lots of changes...

Browse source 
Fix flake.nix merge conflict
This commit is contained in:
Jack Mechem 2026-04-03 15:10:55 -07:00
parent c165d5bbba
commit 99abfabc12
5 changed files with 280 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

106
flake.nix
View file

@ -1,58 +1,60 @@
{
description = "Nixos config flake";
description = "Nixos config flake";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
gtkapps.url = "github:JackMechem/gtkapps";
gtkbar.url = "github:JackMechem/gtkbar";
# midirun.url = "path:/home/jack/Projects/midirun";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
gtkapps.url = "github:JackMechem/gtkapps";
gtkbar.url = "github:JackMechem/gtkbar";
# midirun.url = "path:/home/jack/Projects/midirun";
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
# IMPORTANT: we're using "libgbm" and is only available in unstable so ensure
# to have it up-to-date or simply don't specify the nixpkgs input
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
server-dash = {
url = "path:/home/jack/Projects/server-dash";
};
server-dash-api = {
url = "path:/home/jack/Projects/server-dash-api";
};
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
# IMPORTANT: we're using "libgbm" and is only available in unstable so ensure
# to have it up-to-date or simply don't specify the nixpkgs input
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
server-dash = {
url = "path:/home/jack/Projects/server-dash";
};
server-dash-api = {
url = "path:/home/jack/Projects/server-dash-api";
};
rust-app-menu.url = "path:/home/jack/Projects/rust-app-menu";
rust-app-menu.inputs.nixpkgs.follows = "nixpkgs";
};
outputs =
{ self, nixpkgs, ... }@inputs:
{
# use "nixos", or your hostname as the name of the configuration
# it's a better practice than "default" shown in the video
nixosConfigurations.t480 = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/t480/configuration.nix
inputs.home-manager.nixosModules.default
];
};
nixosConfigurations.desktop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/desktop/configuration.nix
inputs.home-manager.nixosModules.default
#inputs.midirun.nixosModules.default
];
};
nixosConfigurations.dellserv = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/dellserv/configuration.nix
inputs.home-manager.nixosModules.default
inputs.server-dash.nixosModules.default
inputs.server-dash-api.nixosModules.default
];
};
};
outputs =
{ self, nixpkgs, ... }@inputs:
{
# use "nixos", or your hostname as the name of the configuration
# it's a better practice than "default" shown in the video
nixosConfigurations.t480 = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/t480/configuration.nix
inputs.home-manager.nixosModules.default
];
};
nixosConfigurations.desktop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/desktop/configuration.nix
inputs.home-manager.nixosModules.default
#inputs.midirun.nixosModules.default
];
};
nixosConfigurations.dellserv = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hosts/dellserv/configuration.nix
inputs.home-manager.nixosModules.default
inputs.server-dash.nixosModules.default
inputs.server-dash-api.nixosModules.default
];
};
};
}