mir/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make galvatron and default configuration.nix more similar

Browse Source
This commit is contained in:
mir 2024-02-28 14:38:42 -09:00
parent 95f5dd2c8b
commit 579dd400d7
3 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configuration.nix
View File

@ -5,26 +5,15 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
# imports =
# [ # Include the results of the hardware scan.
# # ./hardware-configuration.nix
# # (import "${home-manager}/nixos")
# # <home-manager>/nixos
# ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# networking.hostName = "starscream"; # 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 # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.wireless.iwd = {
enable = true;
settings.General.EnableNetworkConfiguration = true;
};
# Set your time zone. # Set your time zone.
time.timeZone = "America/Anchorage"; time.timeZone = "America/Anchorage";
@ -135,6 +124,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget # wget
vim
emacs29-pgtk emacs29-pgtk
]; ];

2
flake.nix
View File

@ -32,6 +32,7 @@
modules = [ modules = [
./configuration.nix { ./configuration.nix {
networking.hostName = "starscream"; networking.hostName = "starscream";
boot.loader.efi.canTouchEfiVariables = true;
} }
./hardware/starscream-hw.nix ./hardware/starscream-hw.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -48,6 +49,7 @@
modules = [ modules = [
./configuration.nix { ./configuration.nix {
networking.hostName = "knockout"; networking.hostName = "knockout";
boot.loader.efi.canTouchEfiVariables = true;
} }
./hardware/knockout-hw.nix ./hardware/knockout-hw.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager

20
galvatron/configuration.nix
View File

@ -5,23 +5,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
# imports =
# [ # Include the results of the hardware scan.
# # ./hardware-configuration.nix
# # ./apple-silicon-support
# ];
# asahi shit
# hardware.asahi.peripheralFirmwareDirectory = ./firmware;
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# boot.loader.efi.canTouchEfiVariables = false;
# networking.hostName = "galvatron"; # Define your hostname. # Enable networking
# Pick only one of the below networking options. networking.networkmanager.enable = true;
# 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.wireless.iwd = { networking.wireless.iwd = {
enable = true; enable = true;
settings.General.EnableNetworkConfiguration = true; settings.General.EnableNetworkConfiguration = true;
@ -30,10 +18,6 @@
# Set your time zone. # Set your time zone.
time.timeZone = "America/Anchorage"; time.timeZone = "America/Anchorage";
# 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. # Select internationalisation properties.
# i18n.defaultLocale = "en_US.UTF-8"; # i18n.defaultLocale = "en_US.UTF-8";
# console = { # console = {