genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 09:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #395 from genebean/24.05

Browse source 
Upgrade to nix 24.05, add plasma 6 to laptop
This commit is contained in:
Gene Liverman 2024-06-06 22:33:10 -04:00 • committed by GitHub
commit 2dbef7058a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 173 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

107
flake.lock generated
View file

@ -3,16 +3,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711985568, "lastModified": 1716195221,
"narHash": "sha256-VLeP9HGQwfkiuHDp648PXGCkogr3ktYm0q9Yj+i0lGQ=", "narHash": "sha256-u+zjC7efKD3gBD9aKXsUTEhRhBQhYlP+KPFp1QbsgOo=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "bd1155be8f50998429a795c15a69c8fe75250510", "rev": "e0bc557e7b991cb23583679e1cf1c8a92b793aeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "4.2.16", "ref": "4.3.1",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@ -24,11 +24,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715222527, "lastModified": 1717354014,
"narHash": "sha256-bRmQjmjgle7ENv3gWwQMuL48DU2EZd4xkauiXQIXzas=", "narHash": "sha256-WwQo3TGnEbpp3tPqHHqqiXK3jXD9oykdhKaxrv9UzKs=",
"owner": "aksiksi", "owner": "aksiksi",
"repo": "compose2nix", "repo": "compose2nix",
"rev": "d20f7ace1e8d51b537ea02b67a0ff02b9c6f26ff", "rev": "3cc5f141667c1dd434570ab6cb2dbac5739edc52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716168343, "lastModified": 1717637172,
"narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=", "narHash": "sha256-geTO9YL1V9zYGxupuZvKFWxh6II9sH2bjI1dmEVhVYQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901", "rev": "713aa3df481782719aed4d8c20ad31a9effe3564",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +97,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1687709756, "lastModified": 1710146030,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,16 +133,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715381426, "lastModified": 1717527182,
"narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "rev": "845a5c4c073f74105022533907703441e0464bc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716204319, "lastModified": 1716993688,
"narHash": "sha256-3KL5dRGk89SUaeODFO6B9lxymCVav3UzqsNxOzAbwVY=", "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e1cacc63e6e324ae95e65e8aaea62dec74686208", "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,11 +172,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1688307440, "lastModified": 1716329735,
"narHash": "sha256-7PTjbN+/+b799YN7Tk2SS5Vh8A0L3gBo8hmB7Y0VXug=", "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "b06bab83bdf285ea0ae3c8e145a081eb95959047", "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1712182779, "lastModified": 1716838497,
"narHash": "sha256-DchWIKi4c7Jl7CJXVzOxVetxy+SqnlAY3QuUNy8z+aE=", "narHash": "sha256-tkceXNn87z+uC08gvQCl7olSCS782EWdflgq0FkSKiw=",
"owner": "zhaofengli-wip", "owner": "zhaofengli-wip",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "445f7989e096fb90902eed4256b04d8b57c8b358", "rev": "31e9c8105a3ffdc03829c8c195d385500760d309",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,6 +221,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"locked": {
"lastModified": 1717574423,
"narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1687274257, "lastModified": 1687274257,
@ -254,11 +270,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1716061101, "lastModified": 1717265169,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,11 +297,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1715707461, "lastModified": 1717095070,
"narHash": "sha256-I/zNUXjd+3UmKG8qFRFrpXpWUTlIeqN8Tp5/e3aQccs=", "narHash": "sha256-KCPHcPHmt0RaZ0NBJBYacWtNV62/REd7HrPsrw6DTTI=",
"owner": "stackbuilders", "owner": "stackbuilders",
"repo": "nixpkgs-terraform", "repo": "nixpkgs-terraform",
"rev": "8d7d08686e54bd75d86642b3abe1d6c7ef41a0e9", "rev": "437209631ec33193afdffcf41a657cde5e68f35f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +312,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1716190602, "lastModified": 1717646450,
"narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", "narHash": "sha256-KE+UmfSVk5PG8jdKdclPVcMrUB8yVZHbsjo7ZT1Bm3c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a5ac83292c7842072318f57d68a48474f8bd34d", "rev": "818dbe2f96df233d2041739d6079bb616d3e5597",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,11 +328,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1688049487, "lastModified": 1716330097,
"narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,16 +344,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1716218643, "lastModified": 1717555607,
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -351,6 +367,7 @@
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-homebrew": "nix-homebrew", "nix-homebrew": "nix-homebrew",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-terraform": "nixpkgs-terraform", "nixpkgs-terraform": "nixpkgs-terraform",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
@ -365,11 +382,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1716087663, "lastModified": 1717455931,
"narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0",
"type": "github" "type": "github"
}, },
"original": { "original": {

96
flake.nix
View file

@ -3,7 +3,7 @@
inputs = { inputs = {
# Where we get most of our software. Giant mono repo with recipes # Where we get most of our software. Giant mono repo with recipes
# called derivations that say how to build software. # called derivations that say how to build software.
nixpkgs.url = "github:nixos/nixpkgs/release-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
compose2nix = { compose2nix = {
@ -25,7 +25,7 @@
# Manages things in home directory # Manages things in home directory
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -41,6 +41,8 @@
# Manage Homebrew itself # Manage Homebrew itself
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs-terraform = { nixpkgs-terraform = {
url = "github:stackbuilders/nixpkgs-terraform"; url = "github:stackbuilders/nixpkgs-terraform";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -56,10 +58,10 @@
}; # end inputs }; # end inputs
outputs = inputs@{ outputs = inputs@{
self, nixpkgs, nixpkgs-unstable, compose2nix, disko, genebean-omp-themes, self, nixpkgs, nixpkgs-unstable, compose2nix, disko, genebean-omp-themes,
home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixpkgs-terraform, sops-nix, ... }: let home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-hardware, nixpkgs-terraform, sops-nix, ... }: let
# creates a macOS system config # creates a macOS system config
darwinHostConfig = system: hostname: username: nix-darwin.lib.darwinSystem { darwinHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nix-darwin.lib.darwinSystem {
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config = { config = {
@ -68,7 +70,7 @@
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ nixpkgs-terraform.overlays.default ];
}; };
specialArgs = { inherit inputs hostname username; }; specialArgs = { inherit inputs hostname username; } // additionalSpecialArgs;
modules = [ modules = [
nix-homebrew.darwinModules.nix-homebrew { nix-homebrew.darwinModules.nix-homebrew {
nix-homebrew = { nix-homebrew = {
@ -92,11 +94,11 @@
./modules/system/common/all-darwin.nix # system-wide stuff ./modules/system/common/all-darwin.nix # system-wide stuff
./modules/hosts/darwin/${hostname} # host specific stuff ./modules/hosts/darwin/${hostname} # host specific stuff
]; # end modules ] ++ additionalModules; # end modules
}; # end darwinSystem }; # end darwinSystem
# creates a nixos system config # creates a nixos system config
nixosHostConfig = system: hostname: username: nixpkgs.lib.nixosSystem { nixosHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs compose2nix hostname username; specialArgs = { inherit inputs compose2nix hostname username;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -106,7 +108,7 @@
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ nixpkgs-terraform.overlays.default ];
}; };
}; } // additionalSpecialArgs;
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko
@ -126,10 +128,10 @@
sops-nix.nixosModules.sops # system wide secrets management sops-nix.nixosModules.sops # system wide secrets management
./modules/system/common/all-nixos.nix # system-wide stuff ./modules/system/common/all-nixos.nix # system-wide stuff
./modules/hosts/nixos/${hostname} # host specific stuff ./modules/hosts/nixos/${hostname} # host specific stuff
]; ] ++ additionalModules;
}; # end nixosSystem }; # end nixosSystem
linuxHomeConfig = system: hostname: username: home-manager.lib.homeManagerConfiguration { linuxHomeConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = { inherit genebean-omp-themes hostname username; extraSpecialArgs = { inherit genebean-omp-themes hostname username;
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -139,7 +141,7 @@
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ nixpkgs-terraform.overlays.default ];
}; };
}; } // additionalSpecialArgs;
modules = [ modules = [
./modules/home-manager/hosts/${hostname}/${username}.nix ./modules/home-manager/hosts/${hostname}/${username}.nix
{ {
@ -149,24 +151,80 @@
}; };
} }
sops-nix.homeManagerModules.sops sops-nix.homeManagerModules.sops
]; ] ++ additionalModules;
}; # end homeManagerConfiguration }; # end homeManagerConfiguration
in { in {
# Darwin (macOS) hosts
darwinConfigurations = { darwinConfigurations = {
AirPuppet = darwinHostConfig "x86_64-darwin" "AirPuppet" "gene"; AirPuppet = darwinHostConfig {
Blue-Rock = darwinHostConfig "x86_64-darwin" "Blue-Rock" "gene.liverman"; system = "x86_64-darwin";
mightymac = darwinHostConfig "aarch64-darwin" "mightymac" "gene.liverman"; hostname = "AirPuppet";
username = "gene";
additionalModules = [];
additionalSpecialArgs = {};
}; };
Blue-Rock = darwinHostConfig {
system = "x86_64-darwin";
hostname = "Blue-Rock";
username = "gene.liverman";
additionalModules = [];
additionalSpecialArgs = {};
};
mightymac = darwinHostConfig {
system = "aarch64-darwin";
hostname = "mightymac";
username = "gene.liverman";
additionalModules = [];
additionalSpecialArgs = {};
};
}; # end darwinConfigurations
# NixOS hosts
nixosConfigurations = { nixosConfigurations = {
hetznix01 = nixosHostConfig "aarch64-linux" "hetznix01" "gene"; # bigboy = nixosHostConfig {
nixnuc = nixosHostConfig "x86_64-linux" "nixnuc" "gene"; # system = "x86_64-linux";
rainbow-planet = nixosHostConfig "x86_64-linux" "rainbow-planet" "gene"; # hostname = "bigbox";
# username = "gene";
# additionalModules = [
# nixos-hardware.nixosModules.lenovo-thinkpad-p52
# ];
# additionalSpecialArgs = {};
# };
hetznix01 = nixosHostConfig {
system = "aarch64-linux";
hostname = "hetznix01";
username = "gene";
additionalModules = [];
additionalSpecialArgs = {};
}; };
nixnuc = nixosHostConfig {
system = "x86_64-linux";
hostname = "nixnuc";
username = "gene";
additionalModules = [];
additionalSpecialArgs = {};
};
rainbow-planet = nixosHostConfig {
system = "x86_64-linux";
hostname = "rainbow-planet";
username = "gene";
additionalModules = [
nixos-hardware.nixosModules.dell-xps-13-9360
];
additionalSpecialArgs = {};
};
}; # end nixosConfigurations
# Home Manager (only) users
homeConfigurations = { homeConfigurations = {
gene = linuxHomeConfig "x86_64-linux" "mini-watcher" "gene"; gene = linuxHomeConfig {
system = "x86_64-linux";
hostname = "mini-watcher";
username = "gene";
additionalModules = [];
additionalSpecialArgs = {};
}; };
}; # end homeConfigurations
}; };
} }

2
modules/home-manager/common/all-cli.nix
View file

@ -247,7 +247,7 @@ in {
zsh = { zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableAutosuggestions = true; autosuggestion.enable = true;
history.save = 1000000; history.save = 1000000;
history.size = 1000000; history.size = 1000000;
initExtra = '' initExtra = ''

3
modules/hosts/darwin/mightymac/default.nix
View file

@ -27,7 +27,10 @@
"kind" "kind"
"kubernetes-cli" "kubernetes-cli"
"lima" "lima"
"opentofu"
"node_exporter"
"podman" "podman"
"telegraf"
]; ];
casks = [ casks = [
"asana" "asana"

26
modules/hosts/nixos/rainbow-planet/default.nix
View file

@ -14,6 +14,8 @@
}; };
}; };
environment.sessionVariables.NIXOS_OZONE_WL = "1";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# host specific apps # host specific apps
boinc boinc
@ -64,6 +66,8 @@
}; };
hyprland.enable = true; hyprland.enable = true;
ssh.askPassword = "ssh-askpass";
# common programs that really should be in another file # common programs that really should be in another file
# required for setting to be picked up by xfce4-terminal # required for setting to be picked up by xfce4-terminal
xfconf.enable = true; xfconf.enable = true;
@ -71,6 +75,11 @@
services = { services = {
boinc.enable = true; boinc.enable = true;
desktopManager.plasma6.enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
fwupd.enable = true; fwupd.enable = true;
gnome.gnome-keyring.enable = true; # Provides secret storage gnome.gnome-keyring.enable = true; # Provides secret storage
gvfs.enable = true; # Used by Nautilus gvfs.enable = true; # Used by Nautilus
@ -85,19 +94,22 @@
]; ];
useRoutingFeatures = "client"; useRoutingFeatures = "client";
}; };
thermald.enable = true;
xserver = { xserver = {
enable = true; # Enable the X11 windowing system. enable = true; # Enable the X11 windowing system.
# Configure keymap in X11 # Configure keymap in X11
xkb = {
layout = "us"; layout = "us";
xkbVariant = ""; variant = "";
};
displayManager = { # displayManager = {
gdm = { # gdm = {
enable = true; # enable = true;
wayland = true; # wayland = true;
}; # };
}; # };
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
}; };
}; };

4
modules/hosts/nixos/rainbow-planet/hardware-configuration.nix
View file

@ -11,6 +11,10 @@
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.kernelParams = [
"i915.enable_fbc=1"
"i915.enable_psr=2"
];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =

2
modules/system/common/all-nixos.nix
View file

@ -24,7 +24,7 @@
]; ];
}; };
fonts.fontDir.enable = false; fonts.fontDir.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
font-awesome font-awesome
(nerdfonts.override { (nerdfonts.override {