BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

framework-2024-11-19-16-38-25

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-11-19 16:38:25 +01:00
parent 6ef21edd8f
commit 8b71c25cd2
4 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/user-gui.nix
View File

@ -64,6 +64,8 @@
vorta vorta
kitty kitty
lan-mouse_git
]; ];
home-manager.users.alex = {pkgs, ...}: { home-manager.users.alex = {pkgs, ...}: {

9
flake.nix
View File

@ -19,11 +19,6 @@
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
# apple-fonts = {
# url = "github:Lyndeno/apple-fonts.nix";
# inputs.nixpkgs.follows = "nixpkgs-unstable";
# };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -73,7 +68,7 @@
modules = [ modules = [
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
# stylix.nixosModules.stylix # stylix.nixosModules.stylix
chaotic.nixosModules.default # OUR DEFAULT MODULE chaotic.nixosModules.default
nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower nixos-hardware.nixosModules.common-cpu-amd-zenpower
@ -89,7 +84,7 @@
modules = [ modules = [
fw-fanctrl.nixosModules.default fw-fanctrl.nixosModules.default
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
chaotic.nixosModules.default # OUR DEFAULT MODULE chaotic.nixosModules.default
inputs.nixos-hardware.nixosModules.framework-12th-gen-intel inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
./machine/framework/configuration.nix ./machine/framework/configuration.nix

20
machine/desktop/configuration.nix
View File

@ -53,8 +53,6 @@ in {
}; };
}; };
# stylix.enable = true;
nix.settings = { nix.settings = {
system-features = [ system-features = [
"nixos-test" "nixos-test"
@ -155,11 +153,18 @@ in {
networking = { networking = {
hostName = "desktop"; hostName = "desktop";
useDHCP = false;
}; };
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
programs = {
coolercontrol.enable = true;
corectrl = {
enable = true;
gpuOverclock.enable = true;
};
};
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
lact lact
@ -182,7 +187,6 @@ in {
directories = [ directories = [
"/etc/coolercontrol" "/etc/coolercontrol"
"/etc/NetworkManager/system-connections" "/etc/NetworkManager/system-connections"
"/etc/nixos"
"/var/lib/bluetooth" "/var/lib/bluetooth"
"/var/lib/docker" "/var/lib/docker"
"/var/lib/nixos" "/var/lib/nixos"
@ -217,14 +221,6 @@ in {
pulseaudio.enable = false; pulseaudio.enable = false;
}; };
programs = {
coolercontrol.enable = true;
corectrl = {
enable = true;
gpuOverclock.enable = true;
};
};
# powerManagement = { # powerManagement = {
# enable = true; # enable = true;
# powertop.enable = true; # powertop.enable = true;

45
machine/framework/configuration.nix
View File

@ -55,20 +55,35 @@ in {
}; };
}; };
nix.settings.system-features = [
"nixos-test"
"benchmark"
"big-parallel"
"kvm"
"gccarch-alderlake"
];
# nixpkgs.localSystem = {
# gcc.arch = "alderlake";
# gcc.tune = "alderlake";
# system = "x86_64-linux";
# };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
# initrd.systemd.enable = true;
loader = { loader = {
grub = { grub = {
enable = true; enable = true;
efiSupport = true; efiSupport = true;
device = "nodev"; device = "nodev";
configurationLimit = 5; configurationLimit = 5;
enableCryptodisk = true; # enableCryptodisk = true;
}; };
efi = {canTouchEfiVariables = true;}; efi = {canTouchEfiVariables = true;};
}; };
tmp.useTmpfs = false;
supportedFilesystems = ["btrfs"]; supportedFilesystems = ["btrfs"];
kernelPackages = pkgs.linuxPackages_cachyos;
initrd = { initrd = {
luks.devices = { luks.devices = {
@ -118,24 +133,8 @@ in {
umount /mnt umount /mnt
''; '';
}; };
tmp.useTmpfs = false;
}; };
# nixpkgs.localSystem = {
# gcc.arch = "alderlake";
# gcc.tune = "alderlake";
# system = "x86_64-linux";
# };
nix.settings.system-features = [
"nixos-test"
"benchmark"
"big-parallel"
"kvm"
"gccarch-alderlake"
];
networking = { networking = {
hostName = "framework"; hostName = "framework";
}; };
@ -262,7 +261,7 @@ in {
sessionVariables = {LIBVA_DRIVER_NAME = "iHD";}; # Force intel-media-driver sessionVariables = {LIBVA_DRIVER_NAME = "iHD";}; # Force intel-media-driver
systemPackages = with pkgs; [ systemPackages = with pkgs; [
# psensor # psensor
mission-center # mission-center
resources resources
gnumake gnumake
@ -307,12 +306,6 @@ in {
}; };
}; };
# Set up deep sleep + hibernation
# swapDevices = [{
# device = "/swapfile";
# size = 64 * 1024;
# }];
# Partition swapfile is on (after LUKS decryption) # Partition swapfile is on (after LUKS decryption)
boot.resumeDevice = "/dev/disk/by-uuid/9f90bae0-287b-480c-9aa1-de108b4b4626"; boot.resumeDevice = "/dev/disk/by-uuid/9f90bae0-287b-480c-9aa1-de108b4b4626";