Gabe/nix-config
1
0
Fork 0
Code Issues 15 Pull requests Packages Projects Releases Wiki Activity

IN PROGRESS COMMIT. does not currently build.

Browse source 
Attempting to make nixos config that incorperates a non-nixos HM config.
This commit is contained in:
Gabe Venberg 2024-04-03 17:50:53 -05:00
parent be670ea374
commit fe1ed3e1be
14 changed files with 237 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.nix
View file

@ -48,26 +48,12 @@
}
];
};
workstation-vm = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
# > Our main nixos configuration file <
modules = [
./hosts/workstation-vm/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.gabe = import ./hosts/workstation-vm/home.nix;
home-manager.extraSpecialArgs = {inherit inputs outputs;};
}
];
};
workstation-vm = import ./hosts/workstation-vm {inherit inputs outputs;};
};
# Standalone home-manager configuration entrypoint
# Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = {
homeConfiguration = {
"gabe@archlaptop" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs;};

137
hosts/workstation-vm/configuration.nix
View file

@ -1,137 +0,0 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{
config,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "workstation-vm"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "America/Chicago";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
nix = {
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';
};
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the Cinnamon Desktop Environment.
services.xserver.displayManager.lightdm.enable = true;
services.xserver.desktopManager.cinnamon.enable = true;
# Configure keymap in X11
services.xserver = {
xkb.layout = "us";
xkb.variant = "";
};
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.gabe = {
isNormalUser = true;
description = "Gabe Venberg";
shell = pkgs.nushell;
extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; [
firefox
# thunderbird
];
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
}

110
hosts/workstation-vm/default.nix Normal file
View file

@ -0,0 +1,110 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{
inputs,
outputs,
...
}:
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
# > Our main nixos configuration file <
modules = [
inputs.home-manager.nixosModules.home-manager
./hardware-configuration.nix
./home.nix
../../modules/commonopts.nix
../../modules/nixos/common.nix
../../modules/nixos/printing.nix
../../modules/both/sound.nix
../../modules/both/networking.nix
({
config,
pkgs,
...
}: {
host = {
enable-speech = true;
user = "gabe";
gui.enable = true;
nvim = {
enable-lsp = true;
enable-treesitter = true;
};
git = {
profile = {
name = "Gabe Venberg";
email = "gabevenberg@gmail.com";
};
workProfile.enable = false;
};
};
networking.hostName = "workstation-vm"; # Define your hostname.
# Set your time zone.
time.timeZone = "America/Chicago";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the Cinnamon Desktop Environment.
services.xserver.displayManager.lightdm.enable = true;
services.xserver.desktopManager.cinnamon.enable = true;
# Configure keymap in X11
services.xserver = {
xkb.layout = "us";
xkb.variant = "";
};
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.${config.host.user} = {
isNormalUser = true;
description = "Gabe Venberg";
shell = pkgs.nushell;
extraGroups = ["wheel"];
packages = with pkgs; [
firefox
# thunderbird
];
};
home-manager.users.${config.host.user} = import ./home.nix;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;};
# Enable the OpenSSH daemon.
services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
})
];
}

16
hosts/workstation-vm/home.nix
View file

@ -5,22 +5,6 @@
lib,
...
}: {
# machine specific options
host = {
enable-speech = true;
nvim = {
enable-lsp = true;
enable-treesitter = true;
};
git = {
profile = {
name = "Gabe Venberg";
email = "gabevenberg@gmail.com";
};
workProfile.enable = false;
};
};
imports = [
../../modules/home-manager/terminal
../../modules/home-manager/nvim

21
modules/both/i3/default.nix Normal file
View file

@ -0,0 +1,21 @@
{
config,
pkgs,
lib,
...
}: {
home.stateVersion = "23.11"; # Please read the comment before changing.
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
# enable flakes
nix =
lib.mkIf config.targets.genericLinux.enable
{
package = pkgs.nix;
settings.experimental-features = ["nix-command" "flakes"];
settings.max-jobs = "auto";
gc.automatic = true;
};
}

9
modules/both/networking.nix Normal file
View file

@ -0,0 +1,9 @@
{
config,
pkgs,
...
}: {
# Enable networking
networking.networkmanager.enable = true;
users.users.${config.host.user}.extraGroups = ["networkmanager"];
}

16
modules/both/sound.nix Normal file
View file

@ -0,0 +1,16 @@
{
config,
pkgs,
...
}: {
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
}

23
modules/commonopts.nix Normal file
View file

@ -0,0 +1,23 @@
{
config,
pkgs,
lib,
...
}: {
options = {
host = {
user = lib.mkOption {
type = lib.types.str;
description = "Primary human user";
};
fullName = lib.mkOption {
type = lib.types.str;
description = "Primary human users long name";
};
gui.enable = lib.mkEnableOption {
description = "enable GUI";
default = false;
};
};
};
}

6
modules/home-manager/default.nix
View file

@ -6,10 +6,10 @@
}: {
home.stateVersion = "23.11"; # Please read the comment before changing.
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
# Let Home Manager install and manage itself on non-nixos systems.
programs.home-manager.enable = config.targets.genericLinux.enable;
# enable flakes
# enable flakes on non-nixos systems
nix =
lib.mkIf config.targets.genericLinux.enable
{

7
modules/home-manager/i3/default.nix Normal file
View file

@ -0,0 +1,7 @@
{
config,
pkgs,
lib,
...
}: {
}

23
modules/nixos/common.nix Normal file
View file

@ -0,0 +1,23 @@
{
config,
pkgs,
...
}: {
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
nix = {
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# packages that should be on every system.
environment.systemPackages = with pkgs; [
vi # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
];
}

8
modules/nixos/printing.nix Normal file
View file

@ -0,0 +1,8 @@
{
config,
pkgs,
...
}: {
# Enable CUPS to print documents.
services.printing.enable = true;
}

8
modules/nixos/touchpad.nix Normal file
View file

@ -0,0 +1,8 @@
{
config,
pkgs,
...
}: {
# Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true;
}

7
modules/nixos/wireless.nix Normal file
View file

@ -0,0 +1,7 @@
{
config,
pkgs,
...
}: {
networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
}