diff --git a/configuration.nix b/configuration.nix index 6ca8f4b..f2d6b86 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,6 +1,6 @@ # 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’). +# and in the NixOS manual (accessible by running 'nixos-help'). { config, pkgs, ... }: @@ -8,27 +8,18 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ]; # Bootloader. - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/vda"; - boot.loader.grub.useOSProber = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "nixos-wayland-vm"; # Define your hostname. + networking.hostName = "nixos-sparrow-lt"; # 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; - # Enable network manager applet - programs.nm-applet.enable = true; - # Set your time zone. time.timeZone = "Europe/London"; @@ -36,35 +27,28 @@ i18n.defaultLocale = "en_GB.UTF-8"; i18n.extraLocaleSettings = { - LC_ADDRESS = "en_GB.UTF-8"; + LC_ADDRESS = "en_GB.UTF-8"; LC_IDENTIFICATION = "en_GB.UTF-8"; - LC_MEASUREMENT = "en_GB.UTF-8"; - LC_MONETARY = "en_GB.UTF-8"; - LC_NAME = "en_GB.UTF-8"; - LC_NUMERIC = "en_GB.UTF-8"; - LC_PAPER = "en_GB.UTF-8"; - LC_TELEPHONE = "en_GB.UTF-8"; - LC_TIME = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "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 - services.xserver = { + services.xserver.xkb = { layout = "gb"; - xkbVariant = ""; + variant = ""; }; # Configure console keymap console.keyMap = "uk"; - # Enable CUPS to print documents. - services.printing.enable = true; + # Allow unfree packages + nixpkgs.config.allowUnfree = true; # Enable sound with pipewire. sound.enable = true; @@ -75,88 +59,161 @@ 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; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ - curl - docker - gcc - git - gnumake - jq - tmux - vim - ]; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.dananglin = { - isNormalUser = true; - description = "Dan Anglin"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; - packages = with pkgs; [ + environment = { + systemPackages = with pkgs; [ + curl + distrobox firefox - go - neovim - lf + gcc + git + gnumake htop + jq + lesspipe + mage + pwgen + tmux + vim + xdg-user-dirs + ]; + + 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" ]; }) ]; }; - environment.sessionVariables = rec { - XDG_CACHE_HOME = "$HOME/.local/cache"; - XDG_CONFIG_HOME = "$HOME/.local/config"; - XDG_DATA_HOME = "$HOME/.local/data"; - XDG_STATE_HOME = "$HOME/.local/state"; - XDG_BIN_HOME = "$HOME/.local/bin"; + # Define a user account. Don't forget to set a password with 'passwd'. + users.users.dananglin = { + isNormalUser = true; + description = "Dan Anglin"; + extraGroups = [ "networkmanager" "wheel" "docker"]; + packages = with pkgs; [ + neovim + lf + ]; + }; + + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + }; + + 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 # 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 + # 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.05"; # Did you read the comment? - - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 2d"; - }; - - virtualisation.docker.enable = true; + system.stateVersion = "24.05"; # Did you read the comment? }