weda config/default cleanup
This commit is contained in:
parent
98b3fde12c
commit
86325bb11d
59
flake.nix
59
flake.nix
|
|
@ -16,25 +16,11 @@
|
|||
}: {
|
||||
|
||||
nixosConfigurations = {
|
||||
weda = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./hosts/local/weda/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix;
|
||||
}
|
||||
|
||||
hyprland.nixosModules.default
|
||||
{programs.hyprland.enable = true;}
|
||||
];
|
||||
};
|
||||
|
||||
frija = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
# Common Resources
|
||||
./common/amd.nix
|
||||
./common/CUPS.nix
|
||||
./common/gnome.nix
|
||||
|
|
@ -59,6 +45,7 @@
|
|||
|
||||
# User Specific
|
||||
#./users/aspire/syncthing.nix
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
@ -94,6 +81,48 @@
|
|||
];
|
||||
};
|
||||
|
||||
weda = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
|
||||
# Common Resources
|
||||
./common/amd.nix
|
||||
./common/CUPS.nix
|
||||
./common/gnome.nix
|
||||
./common/pipewire.nix
|
||||
./common/time.nix
|
||||
./common/docker.nix
|
||||
./common/flakeinit.nix
|
||||
./common/flatpak.nix
|
||||
./common/gaming.nix
|
||||
./common/hyperland.nix
|
||||
./common/insecure.nix
|
||||
./common/networking.nix
|
||||
./common/unfree.nix
|
||||
./common/waydroid.nix
|
||||
./common/x11.nix
|
||||
|
||||
# Host Specific
|
||||
./hosts/local/weda/default.nix
|
||||
./hosts/local/weda/hardware-configuration.nix
|
||||
./hosts/local/weda/packages.nix
|
||||
./users/weda/home-manager.nix
|
||||
|
||||
# User Specific
|
||||
#./users/aspire/syncthing.nix
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix;
|
||||
}
|
||||
|
||||
hyprland.nixosModules.default
|
||||
{programs.hyprland.enable = true;}
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,8 @@
|
|||
# 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, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
#./hardware-configuration.nix
|
||||
#./packages.nix
|
||||
#../../../common/amd.nix
|
||||
#../../../common/docker.nix
|
||||
#../../../common/flakeinit.nix
|
||||
#../../../common/flatpak.nix
|
||||
#../../../common/gaming.nix
|
||||
#../../../common/hyperland.nix
|
||||
#../../../common/insecure.nix
|
||||
#../../../common/waydroid.nix
|
||||
#../../../users/aspire/home-manager.nix
|
||||
#../../../users/aspire/syncthing.nix
|
||||
[
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
|
|
@ -40,70 +24,7 @@
|
|||
boot.initrd.luks.devices."luks-bfce34cb-65e4-4ba0-939d-e3f0ff903338".keyFile = "/crypto_keyfile.bin";
|
||||
|
||||
networking.hostName = "frija"; # 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 = "America/Chicago";
|
||||
|
||||
# Select internationalisation properties.
|
||||
#i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
#i18n.extraLocaleSettings = {
|
||||
#LC_ADDRESS = "en_US.UTF-8";
|
||||
#LC_IDENTIFICATION = "en_US.UTF-8";
|
||||
#LC_MEASUREMENT = "en_US.UTF-8";
|
||||
#LC_MONETARY = "en_US.UTF-8";
|
||||
#LC_NAME = "en_US.UTF-8";
|
||||
#LC_NUMERIC = "en_US.UTF-8";
|
||||
#LC_PAPER = "en_US.UTF-8";
|
||||
#LC_TELEPHONE = "en_US.UTF-8";
|
||||
#LC_TIME = "en_US.UTF-8";
|
||||
#};
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
#services.xserver.enable = true;
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
#services.xserver.displayManager.gdm.enable = true;
|
||||
#services.xserver.desktopManager.gnome.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
#services.xserver = {
|
||||
#layout = "us";
|
||||
#xkbVariant = "";
|
||||
#};
|
||||
|
||||
# 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.aspire = {
|
||||
isNormalUser = true;
|
||||
description = "Aspire";
|
||||
|
|
@ -120,41 +41,6 @@
|
|||
systemd.services."getty@tty1".enable = false;
|
||||
systemd.services."autovt@tty1".enable = false;
|
||||
|
||||
# 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.11"; # Did you read the comment?
|
||||
|
||||
# DO NOT EDIT
|
||||
system.stateVersion = "22.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,18 +7,14 @@
|
|||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./packages.nix
|
||||
../../../common/amd.nix
|
||||
../../../common/docker.nix
|
||||
../../../common/flakeinit.nix
|
||||
../../../common/flatpak.nix
|
||||
../../../common/gaming.nix
|
||||
#../../../common/hyperland.nix
|
||||
../../../common/insecure.nix
|
||||
../../../common/waydroid.nix
|
||||
../../../users/zonsopkomst/home-manager.nix
|
||||
../../../users/zonsopkomst/syncthing.nix
|
||||
##../../../common/flakeinit.nix
|
||||
##../../../common/flatpak.nix
|
||||
##../../../common/gaming.nix
|
||||
##../../../common/hyperland.nix
|
||||
##../../../common/insecure.nix
|
||||
##../../../common/waydroid.nix
|
||||
##../../../users/zonsopkomst/home-manager.nix
|
||||
##../../../users/zonsopkomst/syncthing.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
|
|
@ -43,52 +39,52 @@
|
|||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
##networking.networkmanager.enable = true;
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/Chicago";
|
||||
##time.timeZone = "America/Chicago";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
##i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "en_US.UTF-8";
|
||||
LC_IDENTIFICATION = "en_US.UTF-8";
|
||||
LC_MEASUREMENT = "en_US.UTF-8";
|
||||
LC_MONETARY = "en_US.UTF-8";
|
||||
LC_NAME = "en_US.UTF-8";
|
||||
LC_NUMERIC = "en_US.UTF-8";
|
||||
LC_PAPER = "en_US.UTF-8";
|
||||
LC_TELEPHONE = "en_US.UTF-8";
|
||||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
##i18n.extraLocaleSettings = {
|
||||
##LC_ADDRESS = "en_US.UTF-8";
|
||||
##LC_IDENTIFICATION = "en_US.UTF-8";
|
||||
##LC_MEASUREMENT = "en_US.UTF-8";
|
||||
##LC_MONETARY = "en_US.UTF-8";
|
||||
##LC_NAME = "en_US.UTF-8";
|
||||
##LC_NUMERIC = "en_US.UTF-8";
|
||||
##LC_PAPER = "en_US.UTF-8";
|
||||
##LC_TELEPHONE = "en_US.UTF-8";
|
||||
##LC_TIME = "en_US.UTF-8";
|
||||
##};
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
##services.xserver.enable = true;
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver = {
|
||||
layout = "us";
|
||||
xkbVariant = "";
|
||||
};
|
||||
##services.xserver = {
|
||||
##layout = "us";
|
||||
##xkbVariant = "";
|
||||
##};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
services.printing.drivers = [ pkgs.hplip ];
|
||||
##services.printing.enable = true;
|
||||
##services.printing.drivers = [ pkgs.hplip ];
|
||||
|
||||
# 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;
|
||||
##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;
|
||||
|
||||
|
|
@ -106,13 +102,11 @@
|
|||
description = "Zonsopkomst";
|
||||
extraGroups = [ "docker" "networkmanager" "wheel" ];
|
||||
packages = with pkgs; [
|
||||
# firefox
|
||||
# thunderbird
|
||||
];
|
||||
};
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
##nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
Loading…
Reference in New Issue