From 3fafdd7cc7149f7c6670200436050ebc49e73081 Mon Sep 17 00:00:00 2001 From: NullBite Date: Thu, 28 Dec 2023 00:20:55 -0500 Subject: [PATCH] Remove redundant configuration-migrate.nix --- flake.nix | 2 +- hosts/slab/configuration-migrate.nix | 81 ------------------- hosts/slab/configuration.nix | 112 +++++++++++++-------------- 3 files changed, 57 insertions(+), 138 deletions(-) delete mode 100644 hosts/slab/configuration-migrate.nix diff --git a/flake.nix b/flake.nix index d3f81ee..652bf71 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ slab = lib.nixosSystem { system = "x86_64-linux"; modules = [ - ./hosts/slab/configuration-migrate.nix + ./hosts/slab/configuration.nix ./roles/base.nix ./roles/desktop.nix ./roles/remote.nix diff --git a/hosts/slab/configuration-migrate.nix b/hosts/slab/configuration-migrate.nix deleted file mode 100644 index 3f663e1..0000000 --- a/hosts/slab/configuration-migrate.nix +++ /dev/null @@ -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? - -} - diff --git a/hosts/slab/configuration.nix b/hosts/slab/configuration.nix index f40d0fe..62ddaa3 100644 --- a/hosts/slab/configuration.nix +++ b/hosts/slab/configuration.nix @@ -6,7 +6,7 @@ { config, lib, pkgs, ... }: { - nix.settings.experimental-features = ["nix-command" "flakes" ]; + # nix.settings.experimental-features = ["nix-command" "flakes" ]; imports = [ # Include the results of the hardware scan. @@ -25,10 +25,10 @@ # networking.hostName = "nixos"; # Define your hostname. # Pick only one of the below networking options. # 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. - time.timeZone = "America/New_York"; + time.timeZone = "America/New_York"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -43,14 +43,14 @@ # }; # Enable the X11 windowing system. - services.xserver.enable = true; + # services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + # services.xserver.displayManager.sddm.enable = true; + # services.xserver.desktopManager.plasma5.enable = true; # Enable flatpak - services.flatpak.enable = true; + # services.flatpak.enable = true; # Configure keymap in X11 @@ -58,19 +58,19 @@ # services.xserver.xkb.options = "eurosign:e,caps:escape"; # Enable CUPS to print documents. - services.printing.enable = true; + # services.printing.enable = true; # Enable sound. # sound.enable = true; # hardware.pulseaudio.enable = true; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; + # security.rtkit.enable = true; + # services.pipewire = { + # enable = true; + # alsa.enable = true; + # alsa.support32Bit = true; + # pulse.enable = true; + # jack.enable = true; + # }; # Enable touchpad support (enabled default in most desktopManager). @@ -86,66 +86,66 @@ # ]; # }; - users.users.nullbite = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - packages = with pkgs; [ - firefox - keychain - ]; - initialPassword = "changeme"; - shell = pkgs.zsh; - }; + # users.users.nullbite = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; + # packages = with pkgs; [ + # firefox + # keychain + # ]; + # initialPassword = "changeme"; + # shell = pkgs.zsh; + # }; # shell config - programs.zsh.enable = true; - programs.fzf = { - keybindings = true; - fuzzyCompletion = true; - }; + # programs.zsh.enable = true; + # programs.fzf = { + # keybindings = true; + # fuzzyCompletion = true; + # }; # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ - neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - wget - curl - git - stow - zsh - ntfs3g + # environment.systemPackages = with pkgs; [ + # neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # curl + # git + # stow + # zsh + # ntfs3g - fd - ripgrep - sbctl - comma - ]; + # fd + # ripgrep + # sbctl + # comma + # ]; # Allow unfree packages - nixpkgs.config.allowUnfree = true; + # nixpkgs.config.allowUnfree = 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; - }; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; # List services that you want to enable: # Enable the OpenSSH daemon. # services.openssh.enable = true; - services.openssh = { - enable = true; - openFirewall = true; - settings = { + # services.openssh = { + # enable = true; + # openFirewall = true; + # settings = { - }; - }; + # }; + # }; - services.tailscale.enable = true; + # services.tailscale.enable = true; # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ 22 ];