noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-10 02:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

move system to hosts directory

Browse Source
This commit is contained in:
Noah Masur 2022-05-08 16:02:13 -04:00
parent 446fc5d5c1
commit ed2b61b03f
2 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
flake.nix
View File

@ -1,18 +1,28 @@
{ {
description = "My system"; description = "My system";
# Other flakes that we want to pull from
inputs = { inputs = {
# Used for system packages
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Used for user packages
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows =
"nixpkgs"; # Use system packages list where available
}; };
# Community packages; used for Firefox extensions
nur.url = "github:nix-community/nur"; nur.url = "github:nix-community/nur";
}; };
outputs = { self, nixpkgs, home-manager, nur }: outputs = { self, nixpkgs, home-manager, nur }:
let let
# Global configuration for my systems
globals = { globals = {
user = "noah"; user = "noah";
fullName = "Noah Masur"; fullName = "Noah Masur";
@ -25,38 +35,16 @@
gtkTheme = "Adwaita-dark"; gtkTheme = "Adwaita-dark";
}; };
}; };
in { in {
# Define my systems
nixosConfigurations = { nixosConfigurations = {
desktop = nixpkgs.lib.nixosSystem { desktop =
system = "x86_64-linux"; import ./hosts/desktop { inherit nixpkgs home-manager nur globals; };
specialArgs = { };
modules = [
globals
{
networking.hostName = "desktop";
gui.enable = true;
gui.compositor.enable = true;
}
home-manager.nixosModules.home-manager
{ nixpkgs.overlays = [ nur.overlay ]; }
./hosts/desktop/hardware-configuration.nix
./hosts/common.nix
./modules/hardware
./modules/system
./modules/desktop
./modules/shell
./modules/gaming
./modules/services/keybase.nix
./modules/applications/firefox.nix
./modules/applications/alacritty.nix
./modules/applications/media.nix
./modules/applications/1password.nix
./modules/applications/discord.nix
./modules/editor/neovim
./modules/editor/notes.nix
];
};
}; };
# Used to run commands and editing in this repo
devShells.x86_64-linux = devShells.x86_64-linux =
let pkgs = import nixpkgs { system = "x86_64-linux"; }; let pkgs = import nixpkgs { system = "x86_64-linux"; };
in { in {

31
hosts/desktop/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ nixpkgs, home-manager, nur, globals, ... }:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { };
modules = [
globals
{
networking.hostName = "desktop";
gui.enable = true;
gui.compositor.enable = true;
}
home-manager.nixosModules.home-manager
{ nixpkgs.overlays = [ nur.overlay ]; }
./hardware-configuration.nix
../common.nix
../../modules/hardware
../../modules/system
../../modules/desktop
../../modules/shell
../../modules/gaming
../../modules/services/keybase.nix
../../modules/applications/firefox.nix
../../modules/applications/alacritty.nix
../../modules/applications/media.nix
../../modules/applications/1password.nix
../../modules/applications/discord.nix
../../modules/editor/neovim
../../modules/editor/notes.nix
];
}