fix: update NixOS configuration
A new NixOS installation was performed on an older laptop (now known as sparrow) so the NixOS configuration has been updated. Notable changes: - Disable X11 in favour of Wayland. - Remove the MATE Desktop Environment in favour of the River Window Manager. - Install system packages that I commonly use. - Define more environment variables. - Define shell aliases here. - Add font installation. - Go is now installed locally. - Enable the GNUPG Agent. - Disable nano. - Update the garbage collection.
This commit is contained in:
parent
f985112c8b
commit
96bdadecf3
1 changed files with 152 additions and 95 deletions
|
@ -1,6 +1,6 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running 'nixos-help').
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
@ -8,27 +8,18 @@
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
<home-manager/nixos>
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.grub.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.grub.device = "/dev/vda";
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.loader.grub.useOSProber = true;
|
|
||||||
|
|
||||||
networking.hostName = "nixos-wayland-vm"; # Define your hostname.
|
networking.hostName = "nixos-sparrow-lt";
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# 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
|
# Enable networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
# Enable network manager applet
|
|
||||||
programs.nm-applet.enable = true;
|
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "Europe/London";
|
time.timeZone = "Europe/London";
|
||||||
|
|
||||||
|
@ -47,24 +38,17 @@
|
||||||
LC_TIME = "en_GB.UTF-8";
|
LC_TIME = "en_GB.UTF-8";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
|
||||||
|
|
||||||
# Enable the MATE Desktop Environment.
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
services.xserver.desktopManager.mate.enable = true;
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
services.xserver = {
|
services.xserver.xkb = {
|
||||||
layout = "gb";
|
layout = "gb";
|
||||||
xkbVariant = "";
|
variant = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Configure console keymap
|
# Configure console keymap
|
||||||
console.keyMap = "uk";
|
console.keyMap = "uk";
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Allow unfree packages
|
||||||
services.printing.enable = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
|
@ -75,88 +59,161 @@
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
alsa.support32Bit = true;
|
alsa.support32Bit = true;
|
||||||
pulse.enable = 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;
|
|
||||||
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment = {
|
||||||
|
systemPackages = with pkgs; [
|
||||||
curl
|
curl
|
||||||
docker
|
distrobox
|
||||||
|
firefox
|
||||||
gcc
|
gcc
|
||||||
git
|
git
|
||||||
gnumake
|
gnumake
|
||||||
|
htop
|
||||||
jq
|
jq
|
||||||
|
lesspipe
|
||||||
|
mage
|
||||||
|
pwgen
|
||||||
tmux
|
tmux
|
||||||
vim
|
vim
|
||||||
|
xdg-user-dirs
|
||||||
];
|
];
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
variables = {
|
||||||
|
# Tools
|
||||||
|
BROWSER = "firefox";
|
||||||
|
EDITOR = "nvim";
|
||||||
|
MANPAGER = "nvim +Man!";
|
||||||
|
|
||||||
|
# XDG Home Directories
|
||||||
|
XDG_CACHE_HOME = "$HOME/.local/cache";
|
||||||
|
XDG_CONFIG_HOME = "$HOME/.local/config";
|
||||||
|
XDG_DATA_HOME = "$HOME/.local/data";
|
||||||
|
XDG_STATE_HOME = "$HOME/.local/state";
|
||||||
|
LOG_HOME = "$HOME/.local/state/logs";
|
||||||
|
|
||||||
|
# Bash history configuration
|
||||||
|
HISTFILE = "$HOME/.local/state/bash/history";
|
||||||
|
HISTCONTROL = "ignoreboth";
|
||||||
|
HISTFILESIZE = "10000";
|
||||||
|
HISTSIZE = "1000";
|
||||||
|
HISTTIMEFORMAT = "%d/%m/%y %T: ";
|
||||||
|
|
||||||
|
# Less history configuration
|
||||||
|
LESSHISTFILE = "$HOME/.local/state/less/history";
|
||||||
|
|
||||||
|
# GNUPG Configuration
|
||||||
|
GNUPGHOME = "$HOME/.local/data/gnupg";
|
||||||
|
|
||||||
|
# Go configuration
|
||||||
|
GOPATH = "$HOME/.local/data/go";
|
||||||
|
GOROOT = "$HOME/.local/opt/go";
|
||||||
|
GOBIN = "$HOME/.local/goblin";
|
||||||
|
GOOS = "linux";
|
||||||
|
GOARCH = "amd64";
|
||||||
|
CGO_ENABLED = "0";
|
||||||
|
|
||||||
|
# Magefile configuration
|
||||||
|
MAGEFILE_CACHE = "$HOME/.local/cache/magefile";
|
||||||
|
MAGEFILE_ENABLE_COLOR = "true";
|
||||||
|
|
||||||
|
# Docker environment variables
|
||||||
|
DOCKER_CONFIG = "$HOME/.local/config/docker";
|
||||||
|
};
|
||||||
|
|
||||||
|
localBinInPath = true;
|
||||||
|
|
||||||
|
shellAliases = {
|
||||||
|
ls = "ls --color=auto";
|
||||||
|
ll = "ls -laF";
|
||||||
|
la = "ls -A";
|
||||||
|
l = "ls -CF";
|
||||||
|
|
||||||
|
rm = "rm -i";
|
||||||
|
mv = "mv -i";
|
||||||
|
cp = "cp -i";
|
||||||
|
|
||||||
|
grep = "grep --color=auto";
|
||||||
|
fgrep = "fgrep --color=auto";
|
||||||
|
egrep = "egrep --color=auto";
|
||||||
|
|
||||||
|
systemctl = "sudo systemctl";
|
||||||
|
journalctl = "sudo journalctl";
|
||||||
|
|
||||||
|
vim = "nvim";
|
||||||
|
view = "nvim -R";
|
||||||
|
vimdiff = "nvim -d";
|
||||||
|
|
||||||
|
pwgen = "pwgen -s -c -n";
|
||||||
|
g = "git";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Font configuration
|
||||||
|
fonts = {
|
||||||
|
enableDefaultPackages = true;
|
||||||
|
packages = with pkgs; [
|
||||||
|
noto-fonts
|
||||||
|
(nerdfonts.override { fonts = [ "SourceCodePro" ]; })
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with 'passwd'.
|
||||||
users.users.dananglin = {
|
users.users.dananglin = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Dan Anglin";
|
description = "Dan Anglin";
|
||||||
extraGroups = [ "networkmanager" "wheel" "docker"];
|
extraGroups = [ "networkmanager" "wheel" "docker"];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
firefox
|
|
||||||
go
|
|
||||||
neovim
|
neovim
|
||||||
lf
|
lf
|
||||||
htop
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.sessionVariables = rec {
|
nix = {
|
||||||
XDG_CACHE_HOME = "$HOME/.local/cache";
|
gc = {
|
||||||
XDG_CONFIG_HOME = "$HOME/.local/config";
|
automatic = true;
|
||||||
XDG_DATA_HOME = "$HOME/.local/data";
|
dates = "weekly";
|
||||||
XDG_STATE_HOME = "$HOME/.local/state";
|
options = "--delete-older-than 30d";
|
||||||
XDG_BIN_HOME = "$HOME/.local/bin";
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
pinentryPackage = pkgs.pinentry-curses;
|
||||||
|
};
|
||||||
|
|
||||||
|
nano = {
|
||||||
|
enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
river = {
|
||||||
|
enable = true;
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
foot
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
virtualisation = {
|
||||||
|
docker = {
|
||||||
|
enable = true;
|
||||||
|
enableOnBoot = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
# programs.mtr.enable = true;
|
# 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
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# 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.
|
# this value at the release version of the first install of this system.
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "23.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
|
|
||||||
nix.gc = {
|
|
||||||
automatic = true;
|
|
||||||
dates = "weekly";
|
|
||||||
options = "--delete-older-than 2d";
|
|
||||||
};
|
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue