chore: remove apollo configuration
Remove the configuraton for my `apollo` laptop as I don't use it regularly and I want to simplify my configuration before I refactor it.
This commit is contained in:
parent
212b62e164
commit
8f4aa7bbfc
13
flake.nix
13
flake.nix
|
@ -18,19 +18,6 @@
|
||||||
|
|
||||||
flake = {
|
flake = {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
apollo = nixpkgs.lib.nixosSystem {
|
|
||||||
modules = [
|
|
||||||
./system/nixos/apollo/configuration.nix
|
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.opdavies = import ./home-manager/apollo.nix;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
nixedo = nixpkgs.lib.nixosSystem {
|
nixedo = nixpkgs.lib.nixosSystem {
|
||||||
modules = [
|
modules = [
|
||||||
./system/nixos/nixedo/configuration.nix
|
./system/nixos/nixedo/configuration.nix
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
{ 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";
|
|
||||||
|
|
||||||
programs.alacritty = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
settings = {
|
|
||||||
window.padding = {
|
|
||||||
x = 15;
|
|
||||||
y = 15;
|
|
||||||
};
|
|
||||||
|
|
||||||
font = {
|
|
||||||
size = 12.0;
|
|
||||||
|
|
||||||
normal.family = "JetBrainsMono Nerd Font";
|
|
||||||
|
|
||||||
offset.y = 12;
|
|
||||||
glyph_offset.y = 6;
|
|
||||||
};
|
|
||||||
|
|
||||||
shell = { program = "zsh"; };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,172 +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, ... }:
|
|
||||||
|
|
||||||
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
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
|
||||||
|
|
||||||
# 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";
|
|
||||||
|
|
||||||
services.xserver = {
|
|
||||||
enable = true;
|
|
||||||
layout = "gb";
|
|
||||||
xkbVariant = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.xserver.displayManager.sddm.enable = true;
|
|
||||||
services.xserver.desktopManager.plasma5.enable = true;
|
|
||||||
|
|
||||||
# Enable Bluetooth.
|
|
||||||
services.blueman.enable = true;
|
|
||||||
|
|
||||||
# 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
|
|
||||||
chromium
|
|
||||||
copyq
|
|
||||||
discord
|
|
||||||
firefox
|
|
||||||
flameshot
|
|
||||||
gimp
|
|
||||||
github-desktop
|
|
||||||
kdenlive
|
|
||||||
slack
|
|
||||||
vlc
|
|
||||||
zoom-us
|
|
||||||
|
|
||||||
gnomeExtensions.caffeine
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour ])
|
|
||||||
++ (with pkgs.gnome; [
|
|
||||||
atomix
|
|
||||||
cheese
|
|
||||||
evince
|
|
||||||
geary
|
|
||||||
gedit
|
|
||||||
gnome-characters
|
|
||||||
gnome-music
|
|
||||||
gnome-terminal
|
|
||||||
hitori
|
|
||||||
iagno
|
|
||||||
tali
|
|
||||||
totem
|
|
||||||
]);
|
|
||||||
|
|
||||||
# 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;
|
|
||||||
|
|
||||||
users.defaultUserShell = "/etc/profiles/per-user/opdavies/bin/zsh";
|
|
||||||
|
|
||||||
fonts.fonts = with pkgs;
|
|
||||||
[ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ];
|
|
||||||
|
|
||||||
services.cron = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
systemCronJobs = [
|
|
||||||
"0 9 * * * opdavies find ~/Downloads -daystart -mtime +2 -delete -print >> /tmp/cron.log"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
{ 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
|
|
||||||
];
|
|
||||||
|
|
||||||
home.packages = with pkgs; [ docker docker-compose ];
|
|
||||||
}
|
|
|
@ -1,41 +0,0 @@
|
||||||
# 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;
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
}
|
|
Loading…
Reference in a new issue