Upgrade nix to 24.11

This commit is contained in:
marc
2024-12-03 15:22:42 +01:00
parent 39cdbaa430
commit c62acaa77f
7 changed files with 160 additions and 42 deletions

View File

@@ -11,9 +11,9 @@
system.stateVersion = "22.05";
nix = {
package = pkgs.nixFlakes;
package = pkgs.nixVersions.stable;
extraOptions = lib.optionalString (config.nix.package == pkgs.nixFlakes)
extraOptions = lib.optionalString (config.nix.package == pkgs.nixVersions.stable)
"experimental-features = nix-command flakes";
gc = {

View File

@@ -34,13 +34,9 @@ in
# - Audio ------------------------------------
sound.enable = true;
hardware = {
pulseaudio = {
services = {
pipewire = {
enable = true;
support32Bit = true;
package = pkgs.pulseaudioFull;
};
};

View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ inputs, config, lib, pkgs, ... }:
let
cfg = config.samfelag.modules.desktop.hyprland;
@@ -19,8 +19,11 @@ in {
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
# Cursor
inputs.hyprcursor-rose-pine.packages.${pkgs.system}.default
# Wallpaper
hyprpaper
# Greeter
greetd.gtkgreet
cage
];
@@ -94,6 +97,10 @@ in {
layout = "hy3";
};
env = [
"HYPRCURSOR_THEME,rose-pine-hyprcursor"
];
input = {
kb_layout = cfg.kb_layout;
};
@@ -174,7 +181,7 @@ in {
", XF86AudioStop, exec, playerctl stop"
# - Keyboard ---------------------------
"${cfg.mod}, Escape, exec, hyprctl switchxkblayout kanata next"
"${cfg.mod}, Escape, exec, hyprctl switchxkblayout current next"
] ++ cfg.extraKeybindings;

View File

@@ -23,17 +23,21 @@ in
services.xserver.videoDrivers = [ "nvidia" ];
hardware.opengl.enable = true;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
hardware = {
graphics.enable = true;
nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.stable;
open = true;
prime = {
offload.enable = true;
hardware.nvidia.prime = {
offload.enable = true;
# Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
intelBusId = cfg.intelBusId;
# Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
intelBusId = cfg.intelBusId;
# Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
nvidiaBusId = cfg.nvidiaBusId;
# Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
nvidiaBusId = cfg.nvidiaBusId;
};
};
};
};
}