Switch from SDDM to LightDM and fix Wireguard

This commit is contained in:
coolneng 2020-05-11 06:39:22 +02:00
parent 4bcfb6a660
commit 3147727b77
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
3 changed files with 22 additions and 20 deletions

View File

@ -5,7 +5,7 @@
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager = { services.xserver.displayManager = {
defaultSession = "sway"; defaultSession = "sway";
sddm = { lightdm = {
enable = true; enable = true;
autoLogin = { autoLogin = {
enable = true; enable = true;
@ -34,8 +34,6 @@
kitty kitty
]; ];
extraSessionCommands = '' extraSessionCommands = ''
export MOZ_ENABLE_WAYLAND=1
export MOZ_DBUS_REMOTE=1
export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export QT_QPA_PLATFORM=wayland export QT_QPA_PLATFORM=wayland
@ -48,21 +46,21 @@
programs.light.enable = true; programs.light.enable = true;
# Blue light filter # Blue light filter
location = {
latitude = 35.89;
longitude = -5.32;
provider = "manual";
};
services.redshift = { services.redshift = {
package = pkgs.redshift-wlr; package = pkgs.redshift-wlr;
enable = true; enable = true;
temperature = { temperature = {
day = 6500; day = 6500;
night = 5000; night = 5300;
}; };
}; };
location = {
latitude = 35.89;
longitude = -5.32;
provider = "manual";
};
# Bar # Bar
programs.waybar.enable = true; programs.waybar.enable = true;

View File

@ -1,18 +1,13 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ avahi wireguard ];
avahi
wireguard
];
# Set hostname and hostid # Set hostname and hostid
networking = { networking = {
hostName = "panacea"; hostName = "panacea";
hostId = "8feb0bb8"; hostId = "8feb0bb8";
wireless = { wireless.enable = true;
enable = true;
};
}; };
# Enable zeroconf # Enable zeroconf
@ -22,10 +17,11 @@
}; };
# Wireguard setup # Wireguard setup
networking.wireguard.interfaces = { networking.wg-quick.interfaces = {
wg0 = { wg0 = {
ips = [ "10.8.0.4/32" ]; address = [ "10.8.0.4/32" ];
privateKeyFile = "/home/coolneng/.wg/keys/privatekey"; privateKeyFile = "/home/coolneng/.wg/keys/privatekey";
dns = [ "198.100.148.224" "151.80.222.79" ];
peers = [ peers = [
# zion # zion
{ {

View File

@ -11,7 +11,7 @@
passff-host passff-host
gitAndTools.pass-git-helper gitAndTools.pass-git-helper
# Browsers # Browsers
(firefox.override { extraNativeMessagingHosts = [ passff-host ]; }) (firefox-wayland.override { extraNativeMessagingHosts = [ passff-host ]; })
chromium chromium
# LaTeX # LaTeX
texlive.combined.scheme-full texlive.combined.scheme-full
@ -33,8 +33,16 @@
lorri lorri
nixfmt nixfmt
# Rice # Rice
gtk_engines
adapta-gtk-theme adapta-gtk-theme
paper-icon-theme paper-icon-theme
# Audio
mopidy
ncmpcpp
# Productivity
fff
zathura
libreoffice
]; ];
# Fonts declaration # Fonts declaration