This commit is contained in:
Gabriel Ebner 2020-05-22 11:17:53 +02:00
parent 37d3d4ac55
commit e14b9ffc8d
4 changed files with 16 additions and 16 deletions

@ -17,14 +17,13 @@
issue_discards = 1 issue_discards = 1
} }
''; '';
boot.initrd.luks.devices = [ boot.initrd.luks.devices = {
{ sda2_crypt = {
name = "sda2_crypt";
device = "/dev/disk/by-uuid/2e2e2824-e357-4a75-bddc-8cf386cd0f53"; device = "/dev/disk/by-uuid/2e2e2824-e357-4a75-bddc-8cf386cd0f53";
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
} };
]; };
networking.hostName = "archachatina"; # Define your hostname. networking.hostName = "archachatina"; # Define your hostname.
networking.hostId = "cc7ea3ba"; networking.hostId = "cc7ea3ba";
@ -91,6 +90,7 @@
#boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest; #boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest;
# boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages; # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
# boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_5_4;
services.xserver = { services.xserver = {
videoDrivers = [ "amdgpu" ]; videoDrivers = [ "amdgpu" ];
@ -114,4 +114,8 @@
system.stateVersion = "18.03"; system.stateVersion = "18.03";
programs.x2goserver = {
enable = true;
};
} }

@ -80,7 +80,7 @@
password = if config.virtualisation != null then "" else null; password = if config.virtualisation != null then "" else null;
}; };
services.nscd.enable = false; # services.nscd.enable = false;
system.fsPackages = with pkgs; [ system.fsPackages = with pkgs; [
ntfs3g ntfs3g

14
i3.nix

@ -81,10 +81,11 @@
lightdm.enable = true; lightdm.enable = true;
# startx.enable = true; # startx.enable = true;
# sddm.enable = true; # sddm.enable = true;
defaultSession = "i3wm";
}; };
desktopManager = { desktopManager = {
default = "i3wm";
xterm.enable = false; xterm.enable = false;
session = [ { session = [ {
@ -104,11 +105,6 @@
updateDbusEnvironment = true; updateDbusEnvironment = true;
windowManager = {
default = "none";
# i3.enable = true;
};
layout = "us"; layout = "us";
xkbVariant = "altgr-intl"; xkbVariant = "altgr-intl";
xkbOptions = "caps:ctrl_modifier"; xkbOptions = "caps:ctrl_modifier";
@ -124,14 +120,14 @@
services.geoclue2.enable = true; services.geoclue2.enable = true;
services.gnome3.at-spi2-core.enable = true; services.gnome3.at-spi2-core.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;
services.gnome3.gvfs.enable = true; services.gvfs.enable = true;
services.gnome3.seahorse.enable = true; programs.seahorse.enable = true;
services.gnome3.sushi.enable = true; services.gnome3.sushi.enable = true;
services.telepathy.enable = true; services.telepathy.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;
programs.dconf.enable = true; programs.dconf.enable = true;
services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
# Needed for themes and backgrounds # Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
environment.variables.GIO_EXTRA_MODULES = with pkgs.gnome3; [ environment.variables.GIO_EXTRA_MODULES = with pkgs.gnome3; [

@ -16,7 +16,7 @@
vscode vscode
cquery cquery
stack # stack
elan elan
# coq # coq