update config

This commit is contained in:
Andreas Zweili 2021-11-20 17:16:43 +01:00
parent ee9392c42e
commit 991ea9ac50
19 changed files with 377 additions and 4 deletions

View File

@ -1,6 +1,26 @@
# nixos
## Install home-manager
## Base installation
1. run `scripts/add-home-manager-channel.sh`
2. run `scripts/install-home-manager.sh`
```
parted /dev/sda -- mklabel gpt
parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
parted /dev/sda -- set 1 esp on
parted /dev/sda -- mkpart primary 512MiB 100%
cryptsetup luksFormat --type luks1 /dev/sda2
cryptsetup open /dev/sda2 cryptlvm
pvcreate /dev/mapper/cryptlvm
vgcreate MainGroup /dev/mapper/cryptlvm
lvcreate -L 8G MainGroup -n swap
lvcreate -l 100%FREE MainGroup -n root
mkfs.ext4 -L nixos /dev/MainGroup/root
mkswap -L swap /dev/MainGroup/swap
mkfs.fat -F 32 -n BOOT /dev/sda1
```
1. `link-NAME.sh`
2. `scripts/add-home-manager-channel.sh`
3. `scripts/install-home-manager.sh`

View File

@ -0,0 +1,138 @@
# 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
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Set your time zone.
time.timeZone = "Europe/Zurich";
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
networking.useDHCP = false;
networking.interfaces.enp0s3.useDHCP = true;
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.displayManager.lightdm.enable = true;
services.xserver.displayManager.defaultSession = "none+qtile";
services.xserver.windowManager = {
qtile.enable = true;
};
services.autorandr.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
services.xserver.xkbOptions = "compose:ralt";
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable keyring
security.pam.services.lightdm.enableGnomeKeyring = true;
services.gnome.gnome-keyring.enable = true;
# Enable sound.
sound.enable = true;
hardware.pulseaudio.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.andreas = {
isNormalUser = true;
initialPassword = "password";
extraGroups = [ "wheel" ]; # Enable sudo for the user.
};
# List packages installed in system profile. To search, run:
# $ nix search wget
# allow non-free packages
nixpkgs.config.allowUnfree = true;
# enable steam
programs.steam.enable = true;
hardware.steam-hardware.enable = true;
environment.shellAliases = {
nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
};
environment.variables = {
EDITOR = "vim";
HIGHLIGHT_STYLE = "solarized-light";
ZWEILI_HARDWARE = "asus";
ZWEILI_ENVIRONMENT = "desktop";
};
environment.systemPackages = with pkgs; [
arc-theme
celluloid
firefox
git
highlight
htop
ncdu
nitrogen
ranger
rofi
terminator
vim
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 = [ 22 ];
# 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. Its 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 = "21.05"; # Did you read the comment?
}

View File

@ -88,6 +88,8 @@
environment.variables = {
EDITOR = "vim";
HIGHLIGHT_STYLE = "solarized-light";
ZWEILI_HARDWARE = "vm";
ZWEILI_ENVIRONMENT = "desktop";
};
environment.systemPackages = with pkgs; [
arc-theme

View File

@ -0,0 +1,29 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [ ];
boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-label/swap"; }
];
virtualisation.virtualbox.guest.enable = true;
}

View File

@ -0,0 +1,138 @@
# 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
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Set your time zone.
time.timeZone = "Europe/Zurich";
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
networking.useDHCP = false;
networking.interfaces.enp0s3.useDHCP = true;
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.displayManager.lightdm.enable = true;
services.xserver.displayManager.defaultSession = "none+qtile";
services.xserver.windowManager = {
qtile.enable = true;
};
services.autorandr.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
services.xserver.xkbOptions = "compose:ralt";
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable keyring
security.pam.services.lightdm.enableGnomeKeyring = true;
services.gnome.gnome-keyring.enable = true;
# Enable sound.
sound.enable = true;
hardware.pulseaudio.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.andreas = {
isNormalUser = true;
initialPassword = "password";
extraGroups = [ "wheel" ]; # Enable sudo for the user.
};
# List packages installed in system profile. To search, run:
# $ nix search wget
# allow non-free packages
nixpkgs.config.allowUnfree = true;
# enable steam
programs.steam.enable = true;
hardware.steam-hardware.enable = true;
environment.shellAliases = {
nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
};
environment.variables = {
EDITOR = "vim";
HIGHLIGHT_STYLE = "solarized-light";
ZWEILI_HARDWARE = "xps5530";
ZWEILI_ENVIRONMENT = "desktop";
};
environment.systemPackages = with pkgs; [
arc-theme
celluloid
firefox
git
highlight
htop
ncdu
nitrogen
ranger
rofi
terminator
vim
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 = [ 22 ];
# 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. Its 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 = "21.05"; # Did you read the comment?
}

View File

@ -0,0 +1,29 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [ ];
boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-label/swap"; }
];
virtualisation.virtualbox.guest.enable = true;
}

View File

@ -3,6 +3,6 @@
imports = [
./personal-desktop.nix
];
programs.bash.enable = true;
#programs.bash.enable = true;
targets.genericLinux.enable = true;
}

View File

@ -1,3 +1,5 @@
nix-shell '<home-manager>' -A install
rm ~/.config/nixpkgs/home.nix
rm -r ~/.config/qtile
ln -s $(pwd)/home-manager/$ZWEILI_ENVIRONMENT.nix /home/$USER/.config/nixpkgs/home.nix
home-manager switch

5
scripts/link-asus.sh Normal file
View File

@ -0,0 +1,5 @@
rm /mnt/etc/nixos/configuration.nix
rm /mnt/etc/nixos/hardware-configuration.nix
ln -s $(pwd)/hardware/asus/configuration.nix /mnt/etc/nixos/configuration.nix

6
scripts/link-vm.sh Normal file
View File

@ -0,0 +1,6 @@
rm /mnt/etc/nixos/configuration.nix
rm /mnt/etc/nixos/hardware-configuration.nix
ln -s $(pwd)/hardware/vm/configuration.nix /mnt/etc/nixos/configuration.nix

4
scripts/link-xps5530.sh Normal file
View File

@ -0,0 +1,4 @@
rm /mnt/etc/nixos/configuration.nix
rm /mnt/etc/nixos/hardware-configuration.nix
ln -s $(pwd)/hardware/xps5530/configuration.nix /mnt/etc/nixos/configuration.nix