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

Configurations cleanup

Browse source 
Fix home state version
This commit is contained in:
Filippo Berto 2022-12-06 21:50:55 +01:00
parent c6c8c23058
commit abc9f50a30
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
6 changed files with 76 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hm_modules/__basic.nix
View file

@ -5,11 +5,13 @@
fd
file
htop
lf
mmv-go
neofetch
nixos-option
nix-tree
pv
ripgrep
unrar
unzip
wget

13
odin/common_configuration.nix
View file

@ -12,6 +12,19 @@ with lib; {
hardware.enableRedistributableFirmware = true;
# Enable opengl support
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
# Use same ACPI identifier as Dell Ubuntu
boot.kernelParams = [ "acpi_osi=Linux-Dell-Video" ];

33
odin/configuration-intel.nix
View file

@ -5,28 +5,23 @@
{ pkgs, ... }:
{
boot.initrd.kernelModules = [ "i915" ];
boot.kernelPackages = pkgs.linuxPackages_latest;
hardware.opengl.enable = true;
hardware.opengl.driSupport = true;
hardware.opengl.extraPackages = with pkgs; [
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
# services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.sddm = {
enable = true;
autoNumlock = true;
theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
boot = {
initrd.kernelModules = [ "i915" ];
kernelPackages = pkgs.linuxPackages_latest;
blacklistedKernelModules = [ "nouveau" "nvidia" ];
};
# This runs only Intel and nvidia does not drain power.
##### disable nvidia for a very nice battery life.
hardware.nvidiaOptimus.disable = true;
boot.blacklistedKernelModules = [ "nouveau" "nvidia" ];
services.xserver.videoDrivers = [ "intel" ];
hardware.opengl.driSupport32Bit = true;
services.xserver = {
videoDrivers = [ "intel" ];
displayManager.sddm = {
enable = true;
autoNumlock = true;
theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
};
};
}

43
odin/configuration-nvidia.nix
View file

@ -2,30 +2,29 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ pkgs, ... }: {
boot.initrd.kernelModules = [ "i915" ];
# boot.kernelPackages = pkgs.linuxPackages;
boot = {
initrd.kernelModules = [ "i915" ];
kernelPackages = pkgs.linuxPackages_latest;
};
hardware.nvidia = {
# modesetting.enable = true;
# package = pkgs.linuxPackages.nvidia_x11;
prime = {
offload.enable = false;
sync.enable = true;
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
};
services.xserver = {
videoDrivers = [ "nvidia" ];
# displayManager.gdm = {
# enable = true;
# wayland = false;
# };
displayManager.sddm = {
enable = true;
autoNumlock = true;
theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
};
};
services.xserver.displayManager.sddm = {
enable = true;
autoNumlock = true;
theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
};
hardware.nvidia.prime = {
offload.enable = false;
sync.enable = true;
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
# hardware.nvidia.modesetting.enable = true;
# hardware.nvidia.package = pkgs.linuxPackages.nvidia_x11;
hardware.opengl.driSupport32Bit = true;
}

38
odin/hm.nix
View file

@ -7,54 +7,45 @@
};
packages = with pkgs; [
arandr
authy
bitwarden
cava
discord
dmenu
docker-compose
docker-machine
droidcam
easyeffects
# element-desktop # matrix client
# evince
evince
evolution
unstable.firefox
# freecad
gallery-dl
gnome.eog
gnome.evince
gnome.file-roller
gnome.geary
gnome.gnome-boxes
# gnome.gnome-boxes
gnome.gnome-calendar
gnome.gnome-font-viewer
gnome.gnome-screenshot
# gnome.gnome-sound-recorder
gnome.gnome-sound-recorder
# gnome.gnome-sudoku
gnome.gnome-sudoku
# gnome.gnome-system-monitor
# gnome.gnome-tweaks
# gnome.nautilus
# gnome.quadrapassel
gnome.gnome-system-monitor
# gnome.seahorse
# gnome.sushi
gnome.totem
# gnome.vinagre
(google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; })
# (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; })
gucharmap
handbrake
httpie
# hyperspace-cli
inkscape
jetbrains.datagrip
# keepassxc
krita
lutris
# lutris
meld
mendeley
# minecraft
# mycrypto
nix-prefetch-scripts
obsidian
openvpn
p7zip
pavucontrol
@ -65,19 +56,16 @@
# pulseaudio
pulseaudio
# retroarchFull
ripgrep
shotwell
# signal-desktop
skypeforlinux
# slack
spotify
teams
tex2nix
transmission-gtk
authy
discord
obsidian
tdesktop
teams
thunderbird
transmission-gtk
unstable.firefox
virt-manager
virt-viewer
# wineFull
@ -160,5 +148,5 @@
../hm_modules/zathura.nix
];
home.stateVersion = "21.11";
home.stateVersion = "22.05";
}

29
thor/hm.nix
View file

@ -7,8 +7,8 @@
};
packages = with pkgs; [
arandr
authy
bitwarden
catgirl # IRC
discord
dmenu
docker-compose
@ -17,27 +17,26 @@
easyeffects
# electrum
# element-desktop # matrix client
evince
evolution
filelight
unstable.firefox
# freecad
gallery-dl
gnome.eog
gnome.evince
gnome.file-roller
gnome.geary
gnome.gnome-boxes
# gnome.gnome-boxes
gnome.gnome-calendar
gnome.gnome-font-viewer
gnome.gnome-screenshot
gnome.gnome-sound-recorder
# gnome.gnome-system-monitor
# gnome.gnome-sound-recorder
gnome.gnome-system-monitor
# gnome.seahorse
gnome.totem
# (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; })
gucharmap
handbrake
httpie
# hyperspace-cli
inkscape
jetbrains.datagrip
krita
@ -45,13 +44,13 @@
meld
mendeley
# minecraft
mycrypto
# mycrypto
nix-prefetch-scripts
okular
obsidian
openvpn
p7zip
pavucontrol
pcmanfm
# pcmanfm
pcsx2
pentablet-driver
postman
@ -59,18 +58,16 @@
# pulseaudio
pulseaudio
retroarchFull
ripgrep
shotwell
# signal-desktop
skypeforlinux
# slack
spotify
tdesktop
teams
transmission-gtk
authy
obsidian
spotify
thunderbird
transmission-gtk
unstable.firefox
virt-manager
virt-viewer
# wineFull
@ -140,5 +137,5 @@
../hm_modules/zathura.nix
];
home.stateVersion = "21.05";
home.stateVersion = "22.05";
}