diff --git a/flake.nix b/flake.nix index de07100..702e809 100644 --- a/flake.nix +++ b/flake.nix @@ -282,6 +282,7 @@ modules = commonModules ++ [ ./instances/sif/hardware-configuration.nix inputs.nixos-hardware.nixosModules.common-cpu-intel + inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-pc-ssd ./instances/sif/configuration.nix diff --git a/instances/sif/configuration.nix b/instances/sif/configuration.nix index 6de71b5..2369702 100644 --- a/instances/sif/configuration.nix +++ b/instances/sif/configuration.nix @@ -5,19 +5,22 @@ }: { age.secrets = { - ntfy-sif = { - file = ../../secrets/ntfy-odin.age; - owner = "bertof"; - }; - sif.file = ../../secrets/odin_wg_priv.age; + # ntfy-sif = { + # file = ../../secrets/ntfy-odin.age; + # owner = "bertof"; + # }; + # sif.file = ../../secrets/odin_wg_priv.age; }; # Use the systemd-boot EFI boot loader. boot = { - # kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_6_7_hardened; # kernelPackages = pkgs.linuxPackages_6_8; - kernelParams = [ "acpi_osi=Linux-Dell-Video" ]; + kernelParams = [ ]; + + initrd.kernelModules = [ "i915" ]; + initrd.checkJournalingFS = true; # Use same ACPI identifier as Dell Ubuntu loader = { systemd-boot = { @@ -36,9 +39,13 @@ }; hardware = { - enableRedistributableFirmware = true; - graphics.enable = true; + graphics = { + enable = true; + extraPackages = with pkgs; [ vpl-gpu-rt ]; + }; + + enableRedistributableFirmware = true; pulseaudio.enable = false; @@ -109,6 +116,7 @@ enable = true; # Enable the GNOME 3 Desktop Environment. desktopManager.gnome.enable = true; + videoDrivers = [ "intel" ]; # desktopManager.plasma5 = { # enable = true; # runUsingSystemd = true; @@ -116,7 +124,7 @@ # windowManager.bspwm.enable = true; xkb = { - layout = "it,us"; + layout = "us,it"; options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; }; diff --git a/instances/sif/hardware-configuration.nix b/instances/sif/hardware-configuration.nix index 4b88719..ee7de0b 100644 --- a/instances/sif/hardware-configuration.nix +++ b/instances/sif/hardware-configuration.nix @@ -1,7 +1,11 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, modulesPath, ... }: +{ config +, lib +, modulesPath +, ... +}: { imports = [ @@ -9,7 +13,13 @@ ]; boot = { initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + "usb_storage" + "sd_mod" + ]; kernelModules = [ ]; }; kernelModules = [ "kvm-intel" ]; @@ -17,24 +27,27 @@ }; fileSystems = { "/" = { - device = "/dev/disk/by-uuid/6a17608f-cf0e-4fb4-ae73-c38569fc0577"; + device = "/dev/disk/by-uuid/80a5d8d9-c083-43cf-b7f9-8afdbc26628e"; fsType = "btrfs"; options = [ "subvol=@root" ]; }; "/nix" = { - device = "/dev/disk/by-uuid/6a17608f-cf0e-4fb4-ae73-c38569fc0577"; + device = "/dev/disk/by-uuid/80a5d8d9-c083-43cf-b7f9-8afdbc26628e"; fsType = "btrfs"; options = [ "subvol=@nix" ]; }; "/home" = { - device = "/dev/disk/by-uuid/6a17608f-cf0e-4fb4-ae73-c38569fc0577"; + device = "/dev/disk/by-uuid/80a5d8d9-c083-43cf-b7f9-8afdbc26628e"; fsType = "btrfs"; options = [ "subvol=@home" ]; }; "/boot" = { device = "/dev/disk/by-uuid/5BD2-463F"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; }; diff --git a/instances/sif/hm.nix b/instances/sif/hm.nix index 2e3e676..99f3795 100644 --- a/instances/sif/hm.nix +++ b/instances/sif/hm.nix @@ -54,7 +54,8 @@ # transmission_4 # wireguard-tools xournalpp - proton-pass; + proton-pass + ; }; }; diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix index ac117aa..d6d71be 100644 --- a/modules/hm/hyprland.nix +++ b/modules/hm/hyprland.nix @@ -52,7 +52,7 @@ in enable = true; settings = { input = { - kb_layout = if nixosConfig.networking.hostName == "thor" then "us,it,us" else "it,us,us"; + kb_layout = if (nixosConfig.networking.hostName == "thor") or (nixosConfig.networking.hostName == "sif") then "us,it,us" else "it,us,us"; kb_options = "grp:menu_toggle,compose:rctrl"; kb_variant = ",,colemak"; kb_model = ""; @@ -62,8 +62,9 @@ in touchpad.natural_scroll = true; }; - exec = lib.lists.optionals (nixosConfig.networking.hostName == "thor") [ + exec = (lib.lists.optionals (nixosConfig.networking.hostName == "thor") [ "xrandr --output DP-3 --primary" + ]) ++ [ "noti -t 'Hyprland' -m 'New config loaded\!'" ]; exec-once = [