reorganize files

This commit is contained in:
Noah Masur
2022-07-25 23:15:26 -04:00
parent 2a4a8efa48
commit 6353ac188e
35 changed files with 61 additions and 68 deletions

View File

@ -1,6 +1,11 @@
{ config, lib, pkgs, ... }: {
imports = [ ../modules/shell ../modules/editor ../modules/mail/himalaya.nix ];
imports = [
../modules/shell
../modules/neovim
../modules/repositories/notes.nix
../modules/repositories/dotfiles.nix
];
options = with lib; {
user = mkOption {
@ -50,7 +55,8 @@
};
};
config = {
config = let stateVersion = "22.11";
in {
# Enable features in Nix commands
nix.extraOptions = "experimental-features = nix-command flakes";
@ -69,10 +75,9 @@
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) config.unfreePackages;
# Set a variable for dotfiles repo, not necessary but convenient
home-manager.users.${config.user} = {
home.sessionVariables = { DOTS = config.dotfilesPath; };
};
# Pin a state version to prevent warnings
home-manager.users.${config.user}.home.stateVersion = stateVersion;
home-manager.users.root.home.stateVersion = stateVersion;
};

View File

@ -27,10 +27,11 @@ nixpkgs.lib.nixosSystem {
./hardware-configuration.nix
../common.nix
../../modules/hardware
../../modules/system
../../modules/nixos
../../modules/graphical
../../modules/gaming
../../modules/applications
../../modules/mail/himalaya.nix
../../modules/services/keybase.nix
../../modules/services/gnupg.nix
../../modules/services/mullvad.nix

View File

@ -17,6 +17,7 @@ darwin.lib.darwinSystem {
../../modules/darwin
../../modules/applications/alacritty.nix
../../modules/applications/discord.nix
../../modules/mail/himalaya.nix
../../modules/programming/nix.nix
../../modules/programming/terraform.nix
../../modules/programming/python.nix

View File

@ -6,7 +6,6 @@ nixpkgs.lib.nixosSystem {
specialArgs = { };
modules = [
globals
home-manager.nixosModules.home-manager
wsl.nixosModules.wsl
home-manager.nixosModules.home-manager
{
@ -20,14 +19,15 @@ nixpkgs.lib.nixosSystem {
automountPath = "/mnt";
defaultUser = globals.user;
startMenuLaunchers = true;
wslConf.network.generateResolvConf = true; # Turn off if breaking VPN
wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
interop.includePath =
false; # Including Windows PATH will slow down Neovim
false; # Including Windows PATH will slow down Neovim command mode
};
}
../common.nix
../../modules/wsl
../../modules/system
../../modules/nixos
../../modules/mail/himalaya.nix
../../modules/programming/nix.nix
../../modules/programming/lua.nix
];