Remove redundant configuration-migrate.nix

This commit is contained in:
NullBite 2023-12-28 00:20:55 -05:00
parent 2684a64632
commit 3fafdd7cc7
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
3 changed files with 57 additions and 138 deletions

View File

@ -14,7 +14,7 @@
slab = lib.nixosSystem { slab = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/slab/configuration-migrate.nix ./hosts/slab/configuration.nix
./roles/base.nix ./roles/base.nix
./roles/desktop.nix ./roles/desktop.nix
./roles/remote.nix ./roles/remote.nix

View File

@ -1,81 +0,0 @@
# vim: set ts=2 sw=2 et:
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
# manually defined device specific configuration
./host-configuration.nix
];
# Use the systemd-boot EFI boot loader.
# boot.loader.systemd-boot.enable = true;
# boot.loader.efi.canTouchEfiVariables = true;
# see custom-hardware-configuration.nix
# Set your time zone.
time.timeZone = "America/New_York";
# 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";
# useXkbConfig = true; # use xkb.options in tty.
# };
# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
# 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.alice = {
# isNormalUser = true;
# extraGroups = [ "wheel" ]; # Enable sudo for the user.
# packages = with pkgs; [
# firefox
# tree
# ];
# };
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# List services that you want to enable:
# Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22 ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
# 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 = "23.11"; # Did you read the comment?
}

View File

@ -6,7 +6,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
nix.settings.experimental-features = ["nix-command" "flakes" ]; # nix.settings.experimental-features = ["nix-command" "flakes" ];
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
@ -25,10 +25,10 @@
# networking.hostName = "nixos"; # Define your hostname. # networking.hostName = "nixos"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
# Set your time zone. # Set your time zone.
time.timeZone = "America/New_York"; time.timeZone = "America/New_York";
# Configure network proxy if necessary # Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
@ -43,14 +43,14 @@
# }; # };
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; # services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true; # services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; # services.xserver.desktopManager.plasma5.enable = true;
# Enable flatpak # Enable flatpak
services.flatpak.enable = true; # services.flatpak.enable = true;
# Configure keymap in X11 # Configure keymap in X11
@ -58,19 +58,19 @@
# services.xserver.xkb.options = "eurosign:e,caps:escape"; # services.xserver.xkb.options = "eurosign:e,caps:escape";
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; # services.printing.enable = true;
# Enable sound. # Enable sound.
# sound.enable = true; # sound.enable = true;
# hardware.pulseaudio.enable = true; # hardware.pulseaudio.enable = true;
security.rtkit.enable = true; # security.rtkit.enable = true;
services.pipewire = { # services.pipewire = {
enable = true; # enable = true;
alsa.enable = true; # alsa.enable = true;
alsa.support32Bit = true; # alsa.support32Bit = true;
pulse.enable = true; # pulse.enable = true;
jack.enable = true; # jack.enable = true;
}; # };
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
@ -86,66 +86,66 @@
# ]; # ];
# }; # };
users.users.nullbite = { # users.users.nullbite = {
isNormalUser = true; # isNormalUser = true;
extraGroups = [ "wheel" ]; # extraGroups = [ "wheel" ];
packages = with pkgs; [ # packages = with pkgs; [
firefox # firefox
keychain # keychain
]; # ];
initialPassword = "changeme"; # initialPassword = "changeme";
shell = pkgs.zsh; # shell = pkgs.zsh;
}; # };
# shell config # shell config
programs.zsh.enable = true; # programs.zsh.enable = true;
programs.fzf = { # programs.fzf = {
keybindings = true; # keybindings = true;
fuzzyCompletion = true; # fuzzyCompletion = 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; [
neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget # wget
curl # curl
git # git
stow # stow
zsh # zsh
ntfs3g # ntfs3g
fd # fd
ripgrep # ripgrep
sbctl # sbctl
comma # comma
]; # ];
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; # nixpkgs.config.allowUnfree = 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 = { # programs.gnupg.agent = {
enable = true; # enable = true;
enableSSHSupport = true; # enableSSHSupport = true;
}; # };
# List services that you want to enable: # List services that you want to enable:
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
# services.openssh.enable = true; # services.openssh.enable = true;
services.openssh = { # services.openssh = {
enable = true; # enable = true;
openFirewall = true; # openFirewall = true;
settings = { # settings = {
}; # };
}; # };
services.tailscale.enable = true; # services.tailscale.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22 ]; networking.firewall.allowedTCPPorts = [ 22 ];