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

Odin: unstable

Browse source
This commit is contained in:
Filippo Berto 2024-09-16 16:33:50 +02:00
parent c272cf2394
commit 7df5a68565
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
5 changed files with 36 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -290,15 +290,15 @@
{ home-manager.users.bertof.imports = [ ./modules/hm/hyprland.nix ]; }
./modules/nixos/musa.nix
] ++ homeManagerModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; }];
] ++ homeManagerUModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; }];
in
rec {
odin-nvidia = nixpkgs.lib.nixosSystem {
odin-nvidia = nixpkgs-u.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-nvidia.nix ];
};
odin-intel = nixpkgs.lib.nixosSystem {
odin-intel = nixpkgs-u.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ odinCommonModules ++ [ ./instances/odin/configuration-intel.nix ];
};

18
instances/odin/common_configuration.nix
View file

@ -39,22 +39,9 @@
hardware = {
enableRedistributableFirmware = true;
pulseaudio.enable = false;
graphics.enable = true;
# Enable opengl support
opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = builtins.attrValues {
inherit (pkgs)
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
;
};
};
pulseaudio.enable = false;
# Tablet
opentabletdriver = {
@ -332,7 +319,6 @@
security = {
rtkit.enable = true;
pam.services = {
login.fprintAuth = true;
xscreensaver.fprintAuth = true;
};
};

21
instances/odin/configuration-nvidia.nix
View file

@ -11,17 +11,18 @@
kernelPackages = pkgs.unstable_pkgs.linuxPackages;
};
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";
hardware.nvidia =
{
# modesetting.enable = true;
# package = pkgs.linuxPackages.nvidia_x11;
open = false;
prime = {
offload.enable = false;
sync.enable = true;
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
};
};
programs.gamemode = {
enable = true;

44
instances/odin/hm.nix
View file

@ -13,56 +13,50 @@
};
packages = builtins.attrValues {
inherit (pkgs)
# element-desktop # matrix client
# evolution
# freecad
# krita
# minecraft
# mycrypto
# pcmanfm
# pulseaudio
# retroarchFull
# shotwell
# signal-desktop
# slack
# wineFull
authenticator
brave
cava
discord
droidcam
# element-desktop # matrix client
eog
evince
# evolution
# freecad
file-roller
gallery-dl
gnome-font-viewer
gnome-screenshot
gnome-system-monitor
gucharmap
inkscape
keyboard-switch
# krita
# minecraft
# mycrypto
openvpn
p7zip
pavucontrol
# pcmanfm
procps
# pulseaudio
pulseaudio
# retroarchFull
# shotwell
# signal-desktop
skypeforlinux
# slack
spotify
tdesktop
teams-for-linux
thunderbird
totem
transmission-gtk
# wineFull
wireguard-tools
xournalpp
zoom-us
;
inherit (pkgs.gnome)
# geary
# gnome-calendar
# gnome-sound-recorder
# seahorse
eog
file-roller
gnome-font-viewer
gnome-screenshot
gnome-system-monitor
totem
;
inherit (pkgs.unstable_pkgs)
# heroic
proton-pass;

2
modules/nixos/hyprland.nix
View file

@ -14,7 +14,7 @@
hardware = {
brillo.enable = true;
opengl.enable = true;
graphics.enable = true;
nvidia.modesetting.enable = builtins.elem "nvidia" config.services.xserver.videoDrivers;
};