Cleanup and moving active config
This commit is contained in:
parent
5bcd8f5524
commit
2f8a45c405
1 changed files with 12 additions and 35 deletions
|
@ -8,16 +8,13 @@
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
#../../../common/cpu/intel
|
|
||||||
#../../../common/pc/laptop
|
|
||||||
# ./packages.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
{
|
|
||||||
nix = {
|
nix = {
|
||||||
nixPath = [
|
nixPath = [
|
||||||
"nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
|
"nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
|
||||||
"nixos-config=/home/paul/.nixos/hosts/latitude/configuration.nix"
|
"nixos-config=/home/paul/NixOS/hosts/latitude/configuration.nix"
|
||||||
"/nix/var/nix/profiles/per-user/root/channels"
|
"/nix/var/nix/profiles/per-user/root/channels"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -47,11 +44,6 @@
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.loader.systemd-boot.configurationLimit = 10; # Keep only the last 10 Generations.
|
boot.loader.systemd-boot.configurationLimit = 10; # Keep only the last 10 Generations.
|
||||||
networking.hostName = "latitude"; # Define your hostname.
|
networking.hostName = "latitude"; # 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;
|
||||||
|
@ -75,23 +67,17 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Experimental Features Enabled
|
# Experimental Features Enabled
|
||||||
# {pkgs, ...}: {
|
|
||||||
nix.settings.experimental-features = ["nix-command"];
|
nix.settings.experimental-features = ["nix-command"];
|
||||||
# }
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
|
||||||
# Enable Sway (wayland) Window Manager
|
|
||||||
#programs.sway.enable = true;
|
|
||||||
|
|
||||||
# Enable the KDE Plasma Desktop Environment.
|
# Enable the KDE Plasma Desktop Environment.
|
||||||
#services.xserver.displayManager.sddm.enable = true;
|
services.displayManager.sddm.wayland.enable = true; # Launch KDE in Wayland session
|
||||||
services.displayManager.sddm.wayland.enable = true;
|
|
||||||
services.displayManager.defaultSession = "plasma";
|
services.displayManager.defaultSession = "plasma";
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
# Launch KDE in Wayland session
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
services.xserver.xkb = {
|
services.xserver.xkb = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
|
@ -101,17 +87,9 @@
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
# Bluetooth
|
|
||||||
hardware.bluetooth = {
|
|
||||||
enable =true;
|
|
||||||
powerOnBoot = true;
|
|
||||||
|
|
||||||
};
|
|
||||||
#services.blueman.enable = true;
|
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
# sound.enable = true;
|
|
||||||
|
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -120,12 +98,14 @@
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
# If you want to use JACK applications, uncomment this
|
# If you want to use JACK applications, uncomment this
|
||||||
jack.enable = true;
|
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;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Bluetooth
|
||||||
|
hardware.bluetooth = {
|
||||||
|
enable =true;
|
||||||
|
powerOnBoot = true;
|
||||||
|
|
||||||
|
};
|
||||||
## Allow Bluetooth buttons to control media player
|
## Allow Bluetooth buttons to control media player
|
||||||
systemd.user.services.mpris-proxy = {
|
systemd.user.services.mpris-proxy = {
|
||||||
description = "Mpris proxy";
|
description = "Mpris proxy";
|
||||||
|
@ -147,9 +127,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# 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.paul = {
|
users.users.paul = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
|
|
Loading…
Reference in a new issue