feat: add NixOS config for Apollo laptop
This commit is contained in:
parent
60b0e1f824
commit
47ca17f781
14
flake.nix
14
flake.nix
|
|
@ -11,6 +11,20 @@
|
||||||
let
|
let
|
||||||
overlays = [ neovim-nightly.overlay ];
|
overlays = [ neovim-nightly.overlay ];
|
||||||
in {
|
in {
|
||||||
|
nixosConfigurations = {
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
./nixpkgs/nixos/apollo/configuration.nix
|
||||||
|
home-manager.nixosModules.home-manager {
|
||||||
|
home-manager.useGlobalPkgs = true;
|
||||||
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.users.opdavies = import ./nixpkgs/home-manager/apollo.nix;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
pop-os = home-manager.lib.homeManagerConfiguration {
|
pop-os = home-manager.lib.homeManagerConfiguration {
|
||||||
modules = [
|
modules = [
|
||||||
|
|
|
||||||
3
justfile
3
justfile
|
|
@ -1,6 +1,9 @@
|
||||||
default:
|
default:
|
||||||
just --list
|
just --list
|
||||||
|
|
||||||
|
apollo *args:
|
||||||
|
sudo nixos-rebuild switch --flake .#apollo {{ args }}
|
||||||
|
|
||||||
pop-os *args:
|
pop-os *args:
|
||||||
home-manager switch -f home-manager/home.nix --flake .#pop-os {{ args }}
|
home-manager switch -f home-manager/home.nix --flake .#pop-os {{ args }}
|
||||||
|
|
||||||
|
|
|
||||||
16
nixpkgs/home-manager/apollo.nix
Normal file
16
nixpkgs/home-manager/apollo.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./modules/common.nix
|
||||||
|
./modules/git.nix
|
||||||
|
./modules/home-manager.nix
|
||||||
|
./modules/tmux.nix
|
||||||
|
./modules/zsh.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
home.stateVersion = "22.05";
|
||||||
|
|
||||||
|
home.username = "opdavies";
|
||||||
|
home.homeDirectory = "/home/opdavies";
|
||||||
|
}
|
||||||
183
nixpkgs/nixos/apollo/configuration.nix
Normal file
183
nixpkgs/nixos/apollo/configuration.nix
Normal file
|
|
@ -0,0 +1,183 @@
|
||||||
|
# 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, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ # Include the results of the hardware scan.
|
||||||
|
./hardware-configuration.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
# Bootloader.
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
|
||||||
|
networking.hostName = "apollo"; # 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 = "Europe/London";
|
||||||
|
|
||||||
|
# Select internationalisation properties.
|
||||||
|
i18n.defaultLocale = "en_GB.utf8";
|
||||||
|
|
||||||
|
# Enable the X11 windowing system.
|
||||||
|
services.xserver.enable = true;
|
||||||
|
|
||||||
|
# Enable the GNOME Desktop Environment.
|
||||||
|
services.xserver.displayManager.gdm.enable = true;
|
||||||
|
services.xserver.desktopManager.gnome.enable = true;
|
||||||
|
|
||||||
|
# Configure keymap in X11
|
||||||
|
services.xserver = {
|
||||||
|
layout = "gb";
|
||||||
|
xkbVariant = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Configure console keymap
|
||||||
|
console.keyMap = "uk";
|
||||||
|
|
||||||
|
# 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.opdavies = {
|
||||||
|
isNormalUser = true;
|
||||||
|
description = "Oliver Davies";
|
||||||
|
extraGroups = [ "docker" "networkmanager" "wheel" ];
|
||||||
|
packages = with pkgs; [
|
||||||
|
alacritty
|
||||||
|
ansible
|
||||||
|
antibody
|
||||||
|
bat
|
||||||
|
bottom
|
||||||
|
cargo
|
||||||
|
chromium
|
||||||
|
copyq
|
||||||
|
ctop
|
||||||
|
delta
|
||||||
|
discord
|
||||||
|
docker
|
||||||
|
firefox
|
||||||
|
flameshot
|
||||||
|
fzf
|
||||||
|
gh
|
||||||
|
gimp
|
||||||
|
git
|
||||||
|
git-crypt
|
||||||
|
github-desktop
|
||||||
|
html-tidy
|
||||||
|
htop
|
||||||
|
jq
|
||||||
|
just
|
||||||
|
kdenlive
|
||||||
|
lua
|
||||||
|
neofetch
|
||||||
|
neovim
|
||||||
|
platformsh
|
||||||
|
pv
|
||||||
|
ripgrep
|
||||||
|
shellcheck
|
||||||
|
slack
|
||||||
|
stylua
|
||||||
|
sumneko-lua-language-server
|
||||||
|
teams
|
||||||
|
tldr
|
||||||
|
tmux
|
||||||
|
tmuxinator
|
||||||
|
tree
|
||||||
|
unzip
|
||||||
|
vim
|
||||||
|
vlc
|
||||||
|
wget
|
||||||
|
yt-dlp
|
||||||
|
zoom-us
|
||||||
|
zsh
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# 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 = "22.05"; # Did you read the comment?
|
||||||
|
|
||||||
|
virtualisation.docker.enable = true;
|
||||||
|
|
||||||
|
programs.zsh.enable = true;
|
||||||
|
programs.zsh.histSize = 5000;
|
||||||
|
|
||||||
|
programs.zsh.shellAliases = {
|
||||||
|
cat = "bat";
|
||||||
|
fetch = "git fetch --all --jobs=4 --progress --prune";
|
||||||
|
pull = "git pull --autostash --jobs=4 --summary origin";
|
||||||
|
rebase = "git rebase --autostash --stat";
|
||||||
|
update = "fetch && rebase";
|
||||||
|
};
|
||||||
|
|
||||||
|
users.defaultUserShell = "/etc/profiles/per-user/opdavies/bin/zsh";
|
||||||
|
}
|
||||||
21
nixpkgs/nixos/apollo/default.nix
Normal file
21
nixpkgs/nixos/apollo/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
# ./configuration.nix
|
||||||
|
|
||||||
|
# ../../../home-manager/modules/common.nix
|
||||||
|
# ../../../home-manager/modules/git.nix
|
||||||
|
# ../../../home-manager/modules/home-manager.nix
|
||||||
|
# ../../../home-manager/modules/tmux.nix
|
||||||
|
# ../../../home-manager/modules/zsh.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
fonts.fontconfig.enable = true;
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
docker
|
||||||
|
docker-compose
|
||||||
|
jetbrains-mono
|
||||||
|
];
|
||||||
|
}
|
||||||
40
nixpkgs/nixos/apollo/hardware-configuration.nix
Normal file
40
nixpkgs/nixos/apollo/hardware-configuration.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
# 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 =
|
||||||
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "/dev/disk/by-uuid/62b28eee-5b67-41af-9fcf-95e8171e1897";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot/efi" =
|
||||||
|
{ device = "/dev/disk/by-uuid/378D-387D";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices =
|
||||||
|
[ { device = "/dev/disk/by-uuid/f95ef42e-09d9-4198-b8f3-2e22ea8c4f9e"; }
|
||||||
|
];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp53s0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.wlp54s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue