minor cleanup
This commit is contained in:
@@ -8,6 +8,7 @@
|
|||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
# using channel right now, convert to flake???
|
||||||
#./apple-silicon-support
|
#./apple-silicon-support
|
||||||
<apple-silicon-support/apple-silicon-support>
|
<apple-silicon-support/apple-silicon-support>
|
||||||
../default.nix
|
../default.nix
|
||||||
@@ -20,53 +21,39 @@
|
|||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
|
|
||||||
|
apps.discover-wrapped.enable = true;
|
||||||
|
|
||||||
boot.extraModprobeConfig = ''
|
boot.extraModprobeConfig = ''
|
||||||
options hid_apple iso_layout=0
|
options hid_apple iso_layout=0
|
||||||
'';
|
'';
|
||||||
|
|
||||||
networking.hostName = "mac-nixos"; # Define your hostname.
|
networking.hostName = "mac-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.
|
services = {
|
||||||
time.timeZone = "America/Chicago";
|
|
||||||
|
|
||||||
# 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.
|
|
||||||
# };
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
# services.xserver.enable = true;
|
xserver = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
services.xserver.enable = true;
|
# Enable the Plasma 6 Desktop Environment.
|
||||||
# services.xserver.desktopManager.plasma5.enable = true;
|
displayManager = {
|
||||||
services.xserver.displayManager.sddm.enable = true;
|
sddm.enable = true;
|
||||||
# services.xserver.displayManager.defaultSession = "plasmawayland";
|
defaultSession = "plasma";
|
||||||
services.desktopManager.plasma6.enable = true;
|
};
|
||||||
services.xserver.displayManager.defaultSession = "plasma";
|
};
|
||||||
|
|
||||||
# Configure keymap in X11
|
desktopManager.plasma6.enable = true;
|
||||||
# services.xserver.xkb.layout = "us";
|
|
||||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# enable auto discovery of printers
|
||||||
# services.printing.enable = true;
|
avahi = {
|
||||||
|
enable = true;
|
||||||
|
nssmdns4 = true;
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Enable sound.
|
# Enable Flatpak
|
||||||
# sound.enable = true;
|
flatpak.enable = true;
|
||||||
# hardware.pulseaudio.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’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
users.users.matt = {
|
users.users.matt = {
|
||||||
@@ -77,9 +64,14 @@
|
|||||||
tree
|
tree
|
||||||
neofetch
|
neofetch
|
||||||
git
|
git
|
||||||
|
box64
|
||||||
|
#minecraft
|
||||||
|
prismlauncher
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.java.enable = 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; [
|
||||||
@@ -87,25 +79,6 @@
|
|||||||
wget
|
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;
|
|
||||||
|
|
||||||
# Copy the NixOS configuration file and link it from the resulting system
|
# Copy the NixOS configuration file and link it from the resulting system
|
||||||
# (/run/current-system/configuration.nix). This is useful in case you
|
# (/run/current-system/configuration.nix). This is useful in case you
|
||||||
# accidentally delete configuration.nix.
|
# accidentally delete configuration.nix.
|
||||||
|
|||||||
Reference in New Issue
Block a user