bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test Wayland nvidia 470

Browse source
This commit is contained in:
Filippo Berto 2021-08-15 09:44:37 +02:00
parent 5ec00909bc
commit 3e2b0669a2
1 changed files with 45 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

89
nixos/base.nix
View file

@ -1,6 +1,5 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
@ -47,7 +46,6 @@
# firewall.enable = false; # firewall.enable = false;
}; };
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Rome"; time.timeZone = "Europe/Rome";
@ -58,25 +56,28 @@
keyMap = "it"; keyMap = "it";
}; };
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the GNOME 3 Desktop Environment. # X11 windowing system.
# services.xserver.displayManager.gdm = { services.xserver = {
# enable = true;
# wayland = true;
# nvidiaWayland = true;
# };
services.xserver.desktopManager.gnome.enable = true;
services.xserver.displayManager.sddm = {
enable = true; enable = true;
autoNumlock = true; # Enable the GNOME 3 Desktop Environment.
}; # displayManager.gdm = {
services.xserver.windowManager.bspwm.enable = true; # enable = true;
# wayland = true;
# nvidiaWayland = true;
# };
desktopManager.gnome.enable = true;
displayManager.sddm = {
enable = true;
autoNumlock = true;
};
windowManager.bspwm.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver.layout = "it"; layout = "it";
services.xserver.xkbOptions = "eurosign:e;"; xkbOptions = "eurosign:e;";
libinput.enable = true;
};
# Enable CUPS to print documents. # Enable CUPS to print documents.
# services.printing.enable = true; # services.printing.enable = true;
@ -107,9 +108,6 @@
# daemon.enable = true; # daemon.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’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.bertof = { users.users.bertof = {
isNormalUser = true; isNormalUser = true;
@ -164,51 +162,43 @@
TIMELINE_CREATE=yes TIMELINE_CREATE=yes
TIMELINE_CLEANUP=yes TIMELINE_CLEANUP=yes
''; '';
common = {
extraConfig = bertofExtraConfig;
};
in in
{ {
bertof_home = { bertof_home = common // {
subvolume = "/home/bertof"; subvolume = "/home/bertof";
extraConfig = bertofExtraConfig;
}; };
bertof_music = { bertof_music = common // {
subvolume = "/home/bertof/Musica"; subvolume = "/home/bertof/Musica";
extraConfig = bertofExtraConfig;
}; };
bertof_downloads = { bertof_downloads = common // {
subvolume = "/home/bertof/Scaricati"; subvolume = "/home/bertof/Scaricati";
extraConfig = bertofExtraConfig;
}; };
bertof_images = { bertof_images = common // {
subvolume = "/home/bertof/Immagini"; subvolume = "/home/bertof/Immagini";
extraConfig = bertofExtraConfig;
}; };
bertof_videos = { bertof_videos = common // {
subvolume = "/home/bertof/Video"; subvolume = "/home/bertof/Video";
extraConfig = bertofExtraConfig;
}; };
bertof_documents = { bertof_documents = common // {
subvolume = "/home/bertof/Documenti"; subvolume = "/home/bertof/Documenti";
extraConfig = bertofExtraConfig;
}; };
bertof_games_ssd = { bertof_games_ssd = common // {
subvolume = "/home/bertof/Giochi/SSD"; subvolume = "/home/bertof/Giochi/SSD";
extraConfig = bertofExtraConfig;
}; };
bertof_games_hdd = { bertof_games_hdd = common // {
subvolume = "/home/bertof/Giochi/HDD"; subvolume = "/home/bertof/Giochi/HDD";
extraConfig = bertofExtraConfig;
}; };
bertof_git = { bertof_git = common // {
subvolume = "/home/bertof/Documenti/Git"; subvolume = "/home/bertof/Documenti/Git";
extraConfig = bertofExtraConfig;
}; };
bertof_virt_ssd = { bertof_virt_ssd = common // {
subvolume = "/home/bertof/Documenti/VirtManager/SSD"; subvolume = "/home/bertof/Documenti/VirtManager/SSD";
extraConfig = bertofExtraConfig;
}; };
bertof_virt_hdd = { bertof_virt_hdd = common // {
subvolume = "/home/bertof/Documenti/VirtManager/HDD"; subvolume = "/home/bertof/Documenti/VirtManager/HDD";
extraConfig = bertofExtraConfig;
}; };
}; };
}; };
@ -218,8 +208,19 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; }; services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
services.gvfs.enable = true; services.gvfs = {
enable = true;
package = lib.mkForce pkgs.gnome3.gvfs;
};
services.tlp.enable = false; services.tlp.enable = false;
services.avahi = {
enable = true;
nssmdns = true;
# publish = {
# enable = true;
# addresses = true;
# };
};
# Clamav # Clamav
services.clamav = { daemon.enable = true; updater.enable = true; }; services.clamav = { daemon.enable = true; updater.enable = true; };