Switch to lix
This commit is contained in:
parent
764a05c73c
commit
d0c6f19a09
22 changed files with 544 additions and 632 deletions
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
security.rtkit.enable = true;
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings = {
|
||||
General.Experimental = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
];
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
{
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
sbctl
|
||||
];
|
||||
|
||||
boot.bootspec.enable = true;
|
||||
|
||||
boot.initrd = {
|
||||
availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"thunderbolt"
|
||||
"nvme"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelModules = [ ];
|
||||
systemd.enable = true;
|
||||
};
|
||||
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
|
||||
boot.lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/var/lib/sbctl";
|
||||
};
|
||||
|
||||
boot.loader.efi = {
|
||||
canTouchEfiVariables = true;
|
||||
efiSysMountPoint = "efi";
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot = {
|
||||
enable = lib.mkForce false;
|
||||
xbootldrMountPoint = "/boot";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -1,116 +1,13 @@
|
|||
{
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ self, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./bootloader.nix
|
||||
./filesystems.nix
|
||||
./gpu.nix
|
||||
./cpu.nix
|
||||
./audio.nix
|
||||
./bluetooth.nix
|
||||
./networking.nix
|
||||
./hardware.nix
|
||||
./fonts.nix
|
||||
environment.systemPackages = [
|
||||
pkgs.vim
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_17;
|
||||
nix.settings.experimental-features = "nix-command flakes";
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
system.stateVersion = 6;
|
||||
|
||||
time.timeZone = "Europe/Paris";
|
||||
console = {
|
||||
keyMap = "us";
|
||||
font = "${pkgs.terminus_font}/share/consolefonts/ter-v28b.psf.gz";
|
||||
};
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
nix.settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
substituters = [ "https://cache.nixos-cuda.org" ];
|
||||
trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ];
|
||||
};
|
||||
|
||||
# Enable required services for Wayland
|
||||
security.polkit.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
|
||||
# List packages installed in system profile.
|
||||
# You can use https://search.nixos.org/ to find more packages (and options).
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
firefox
|
||||
adwaita-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
programs._1password.enable = true;
|
||||
programs._1password-gui = {
|
||||
enable = true;
|
||||
# Certain features, including CLI integration and system authentication support,
|
||||
# require enabling PolKit integration on some desktop environments (e.g. Plasma).
|
||||
polkitPolicyOwners = [ "pml" ];
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"1password/custom_allowed_browsers" = {
|
||||
text = ''
|
||||
firefox
|
||||
'';
|
||||
mode = "0755";
|
||||
};
|
||||
};
|
||||
|
||||
# Enable greetd
|
||||
# services.greetd = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# default_session = {
|
||||
# command = "${pkgs.niri}/bin/niri --config /etc/greetd/niri.kdl";
|
||||
# user = "greeter";
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
|
||||
# Enable regreet
|
||||
programs.regreet = {
|
||||
enable = true;
|
||||
font.name = "SF Pro";
|
||||
font.size = 16;
|
||||
font.package = inputs.apple-fonts.packages."${pkgs.stdenv.hostPlatform.system}".sf-pro;
|
||||
settings = {
|
||||
GTK = {
|
||||
font_name = lib.mkForce "SF Pro 16";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Create the niri config for greetd
|
||||
# environment.etc."greetd/niri.kdl".text = ''
|
||||
# spawn-sh-at-startup "regreet; niri msg action quit --skip-confirmation"
|
||||
#
|
||||
# hotkey-overlay {
|
||||
# skip-at-startup
|
||||
# }
|
||||
#
|
||||
# cursor {
|
||||
# xcursor-theme "Adwaita"
|
||||
# xcursor-size 24
|
||||
# }
|
||||
# '';
|
||||
|
||||
# Optional: Enable niri for user sessions
|
||||
programs.niri.enable = true;
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
system.stateVersion = "25.05"; # Did you read the comment?
|
||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,91 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
let
|
||||
bootUUID = "4402ec25-129b-43f5-a043-185e99078f73";
|
||||
efiUUID = "268B-0081";
|
||||
luuksUUID = "fbd9a17b-42aa-4f41-aaf9-eaf9fc62340b";
|
||||
cryptrootUUID = "74224da5-7f95-48a7-9897-8ce6c2e1414d";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/${bootUUID}";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/efi" = {
|
||||
device = "/dev/disk/by-uuid/${efiUUID}";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0137"
|
||||
"dmask=0027"
|
||||
];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/${luuksUUID}";
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@root" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nix" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/cache" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@var_cache" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@var_log" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/spool" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@var_spool" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/tmp" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@var_tmp" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/lib/machines" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@var_lib_machines" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/lib/portables" = {
|
||||
device = "/dev/disk/by-uuid/${cryptrootUUID}";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@var_lib_portables" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
}
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
apple-fonts = inputs.apple-fonts.packages."${pkgs.stdenv.hostPlatform.system}";
|
||||
in
|
||||
{
|
||||
fonts.fontconfig = {
|
||||
enable = true;
|
||||
antialias = true;
|
||||
hinting = {
|
||||
enable = true;
|
||||
style = "slight";
|
||||
};
|
||||
subpixel = {
|
||||
rgba = "rgb";
|
||||
lcdfilter = "default";
|
||||
};
|
||||
defaultFonts = {
|
||||
serif = [
|
||||
"SF Pro"
|
||||
"DejaVu Serif"
|
||||
];
|
||||
sansSerif = [
|
||||
"SF Pro"
|
||||
"DejaVu Sans"
|
||||
];
|
||||
monospace = [
|
||||
"Iosevka Cavalier"
|
||||
"DejaVu Sans Mono"
|
||||
];
|
||||
emoji = [ "Noto Color Emoji" ];
|
||||
};
|
||||
};
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
apple-fonts.sf-pro
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-color-emoji
|
||||
(iosevka.override {
|
||||
set = "cavalier";
|
||||
|
||||
privateBuildPlan = {
|
||||
family = "Iosevka Cavalier";
|
||||
spacing = "normal";
|
||||
serifs = "sans";
|
||||
noCvSs = false;
|
||||
exportGlyphNames = true;
|
||||
|
||||
variants.inherits = "ss08";
|
||||
|
||||
variants.weights.Regular = {
|
||||
shape = 400;
|
||||
menu = 400;
|
||||
css = 400;
|
||||
};
|
||||
|
||||
variants.weights.Bold = {
|
||||
shape = 700;
|
||||
menu = 700;
|
||||
css = 700;
|
||||
};
|
||||
|
||||
variants.weights.Italic = {
|
||||
angle = 9.4;
|
||||
shape = "italic";
|
||||
menu = "italic";
|
||||
css = "italic";
|
||||
};
|
||||
|
||||
variants.weights.Upright = {
|
||||
angle = 0;
|
||||
shape = "upright";
|
||||
menu = "upright";
|
||||
css = "upright";
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
libva-utils
|
||||
vdpauinfo
|
||||
];
|
||||
|
||||
boot.kernelParams = [ "i915.enable_guc=3" ];
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
vpl-gpu-rt
|
||||
];
|
||||
};
|
||||
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
open = true;
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
|
||||
hardware.nvidia.prime = {
|
||||
intelBusId = "PCI:0:2:0";
|
||||
nvidiaBusId = "PCI:2:0:0";
|
||||
};
|
||||
|
||||
services.xserver.videoDrivers = [
|
||||
"modesetting"
|
||||
"nvidia"
|
||||
];
|
||||
|
||||
environment.sessionVariables = {
|
||||
LIBVA_DRIVER_NAME = "iHD";
|
||||
VDPAU_DRIVER = "va_gl";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# I2C
|
||||
environment.systemPackages = with pkgs; [
|
||||
i2c-tools
|
||||
lm_sensors
|
||||
];
|
||||
|
||||
boot.kernelModules = [ "i2c-dev" ];
|
||||
boot.blacklistedKernelModules = [
|
||||
# The spd5118 driver is in conflict with openrgb by holding onto I2C adresses when using Kingston Fury DRAM.
|
||||
# On boot, I need to access those i2c regions in other to poweroff the RGB lighting.
|
||||
# Then, I manually enable the kernel module in any script.
|
||||
# It's possible to let this module disabled, but I lose the ability to get temperature values for the DIMMs.
|
||||
# https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/2557
|
||||
"spd5118"
|
||||
];
|
||||
|
||||
hardware.i2c.enable = true;
|
||||
|
||||
# OpenRGB
|
||||
services.udev.packages = [ pkgs.openrgb ];
|
||||
services.hardware.openrgb = {
|
||||
enable = true;
|
||||
startupProfile = "off";
|
||||
};
|
||||
|
||||
system.activationScripts.openrgbOff = ''
|
||||
mkdir -p /var/lib/OpenRGB
|
||||
cp ${./off.orp} /var/lib/OpenRGB/off.orp
|
||||
chmod 0644 /var/lib/OpenRGB/off.orp
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
|
||||
networking.hostName = "hermes";
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
networking.wireless.iwd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
General = {
|
||||
EnableNetworkConfiguration = false; # Let dhcpcd handle this
|
||||
};
|
||||
Network = {
|
||||
EnableIPv6 = true;
|
||||
NameResolvingService = "systemd";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.dhcpcd = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
nohook resolv.conf # Don't let dhcpcd manage resolv.conf
|
||||
'';
|
||||
};
|
||||
|
||||
networking.resolvconf.enable = false;
|
||||
|
||||
services.avahi.enable = true;
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
|
||||
dnssec = "true";
|
||||
domains = [ "~." ];
|
||||
fallbackDns = [
|
||||
"9.9.9.9#dns.quad9.net"
|
||||
"149.112.112.112#dns.quad9.net"
|
||||
"2620:fe::fe#dns.quad9.net"
|
||||
"2620:fe::9#dns.quad9.net"
|
||||
];
|
||||
|
||||
extraConfig = ''
|
||||
DNSOverTLS=yes
|
||||
'';
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
}
|
||||
Binary file not shown.
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/OpenRGB.pro b/OpenRGB.pro
|
||||
index df7082b6..0022e5fa 100644
|
||||
--- a/OpenRGB.pro
|
||||
+++ b/OpenRGB.pro
|
||||
@@ -588,9 +588,9 @@ contains(QMAKE_PLATFORM, linux) {
|
||||
icon.files+=qt/org.openrgb.OpenRGB.png
|
||||
metainfo.path=$$PREFIX/share/metainfo/
|
||||
metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
|
||||
- systemd_service.path=/etc/systemd/system
|
||||
- systemd_service.files+=qt/openrgb.service
|
||||
- INSTALLS += target desktop icon metainfo udev_rules systemd_service
|
||||
+ # systemd_service.path=/etc/systemd/system
|
||||
+ # systemd_service.files+=qt/openrgb.service
|
||||
+ INSTALLS += target desktop icon metainfo udev_rules # systemd_service
|
||||
}
|
||||
|
||||
#-----------------------------------------------------------------------------------------------#
|
||||
Loading…
Add table
Add a link
Reference in a new issue