Migrated to NixOS 20.03

This commit is contained in:
Craige McWhirter 2020-04-21 18:23:43 +10:00
parent a0224dae8c
commit fe6c5cf1ad
Signed by: sercanto
GPG key ID: 7DBA9F5689EFB6AA
5 changed files with 68 additions and 52 deletions

View file

@ -37,22 +37,33 @@
networking.networkmanager.enable = true; # Enables network support via NetworkManager. networking.networkmanager.enable = true; # Enables network support via NetworkManager.
# Enable common desktop services # Enable common desktop services
services.acpid.enable = true; services = {
services.blueman.enable = true; acpid.enable = true; # A daemon for delivering ACPI events to userspace programs
powerManagement.enable = true; blueman.enable = true; # GTK-based Bluetooth Manager
devmon.enable = true; # Enable external device automounting.`
services.udisks2.enable = true; # Enable udisks2 udev.packages = [
services.devmon.enable = true; # Enable external device automounting.`
services.udev.packages = [
pkgs.android-udev-rules # Android udev rules list pkgs.android-udev-rules # Android udev rules list
]; ];
udisks2.enable = true; # Enable udisks2
services.xserver.enable = true; xserver = {
services.xserver.libinput.enable = true; # Enable touchpad support. enable = true;
services.xserver.displayManager.sddm.enable = true; # Enable SDDM desktopManager = {
services.xserver.desktopManager.plasma5.enable = true; # Enable KDE gnome3.enable = true; # Enable GNOME desktop environment
};
displayManager = {
defaultSession = "gnome"; # Set GNOME as the default session
gdm.enable = true; # Enable the GNOME display manager
};
libinput.enable = true; # Enable touchpad support.
};
};
powerManagement.enable = true;
sound.enable = true; # Enable sound. sound.enable = true; # Enable sound.
# Configure common hardware settings
hardware = { hardware = {
pulseaudio = { pulseaudio = {
enable = true; enable = true;
@ -61,13 +72,14 @@
}; };
bluetooth = { bluetooth = {
enable = true; # Enable bluetooth enable = true; # Enable bluetooth
extraConfig = " config = {
[General] General = {
Enable=Source,Sink,Media,Socket Enable = "Source,Sink,Media,Socket";
};
[Policy] Policy = {
AutoEnable=true AutoEnable = "true";
"; };
};
}; };
opengl.enable = true; opengl.enable = true;
}; };

View file

@ -11,9 +11,13 @@
# Select internationalisation properties. # Select internationalisation properties.
i18n = { i18n = {
consoleFont = "ter-powerline-v16Rv"; defaultLocale = "en_AU.UTF-8"; # Set the default locale
consoleKeyMap = "us"; };
defaultLocale = "en_AU.UTF-8";
# Set the defaul console properties
console = {
keyMap = "us"; # Set the default console key map
font = "ter-powerline-v16Rv"; # Set the default console font
}; };
time.timeZone = "Australia/Brisbane"; # Set your preferred timezone: time.timeZone = "Australia/Brisbane"; # Set your preferred timezone:
@ -47,7 +51,7 @@
lsof # list open files lsof # list open files
direnv # A shell extension that manages your environment direnv # A shell extension that manages your environment
killall # kill processes by name killall # kill processes by name
openssl # A cryptographic library that implements the SSL and TLS protocols #openssl # A cryptographic library that implements the SSL and TLS protocols
( (
import ../roles/vim.nix import ../roles/vim.nix
) )

View file

@ -18,10 +18,6 @@
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
]; ];
imports = [
./crystal0.32.nix
];
# Set the system-wide environment # Set the system-wide environment
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
@ -31,7 +27,7 @@
freerdp # A Remote Desktop Protocol Client, xfreerdp freerdp # A Remote Desktop Protocol Client, xfreerdp
gnupg # GNU Privacy Guard, a GPL OpenPGP implementation gnupg # GNU Privacy Guard, a GPL OpenPGP implementation
go-jira # Simple command line client for Atlassian's Jira service written in Go go-jira # Simple command line client for Atlassian's Jira service written in Go
icr # Interactive console for the Crystal programming languag #icr # Interactive console for the Crystal programming languag
jq # A lightweight and flexible command-line JSON processor jq # A lightweight and flexible command-line JSON processor
scry # Code analysis server for the Crystal programming language scry # Code analysis server for the Crystal programming language
shards # Dependency manager for the Crystal language shards # Dependency manager for the Crystal language

View file

@ -9,7 +9,7 @@
enable = true; enable = true;
aggressiveResize = true; aggressiveResize = true;
clock24 = true; clock24 = true;
extraTmuxConf = '' extraConfig = ''
POWERLINE_COMMAND="/run/current-system/sw/bin/powerline" POWERLINE_COMMAND="/run/current-system/sw/bin/powerline"
POWERLINE_CONFIG_COMMAND="/run/current-system/sw/bin/powerline-config" POWERLINE_CONFIG_COMMAND="/run/current-system/sw/bin/powerline-config"
run-shell "/run/current-system/sw/bin/powerline-daemon -q" run-shell "/run/current-system/sw/bin/powerline-daemon -q"

View file

@ -4,10 +4,23 @@
{ {
services.xserver.enable = true; # Enable the X11 windowing system. services = {
services.xserver.layout = "us"; # Set your preferred keyboard layout. devmon.enable = true; # Enable external device automounting.
services.xserver.desktopManager.default = "none"; # Unset the default desktop manager. udisks2.enable = true; # Enable udisks2.
services.xserver.windowManager = { # Open configuration for the window manager.
xserver = {
enable = true; # Enable the X11 windowing system.
desktopManager = {
xterm.enable = false; # Disable NixOS default desktop manager.
gnome3.enable = true; # Enable GNOME desktop environment
};
displayManager = {
defaultSession = "none+xmonad"; # Set xmonad as the default window manager.
gdm.enable = true; # Enable the GNOME display manager
};
layout = "us"; # Set your preferred keyboard layout.
libinput.enable = true; # Enable touchpad support.
windowManager = { # Open configuration for the window manager.
xmonad.enable = true; # Enable xmonad. xmonad.enable = true; # Enable xmonad.
xmonad.enableContribAndExtras = true; # Enable xmonad contrib and extras. xmonad.enableContribAndExtras = true; # Enable xmonad contrib and extras.
xmonad.extraPackages = hpkgs: [ # Open configuration for additional Haskell packages. xmonad.extraPackages = hpkgs: [ # Open configuration for additional Haskell packages.
@ -15,18 +28,9 @@
hpkgs.xmonad-extras # Install xmonad-extras. hpkgs.xmonad-extras # Install xmonad-extras.
hpkgs.xmonad # Install xmonad itself. hpkgs.xmonad # Install xmonad itself.
]; ];
default = "xmonad"; # Set xmonad as the default window manager.
}; };
};
services.xserver.desktopManager.xterm.enable = false; # Disable NixOS default desktop manager. };
services.xserver.libinput.enable = true; # Enable touchpad support.
services.udisks2.enable = true; # Enable udisks2.
services.devmon.enable = true; # Enable external device automounting.
services.xserver.displayManager.gdm.enable = true; # Enable the GNOME display manager
services.xserver.desktopManager.gnome3.enable = true; # Enable GNOME desktop environment
sound = { sound = {
mediaKeys = { mediaKeys = {