aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

General: pin Lix to stable; General: run nix fmt; Shura: work around build error with the LQX kernel

Browse source
This commit is contained in:
Aires 2024-12-06 15:21:21 -05:00
parent c1506c5118
commit f6a4a172f0
5 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -185,16 +185,16 @@
}, },
"flatpak": { "flatpak": {
"locked": { "locked": {
"lastModified": 1732285094, "lastModified": 1733228754,
"narHash": "sha256-OD9tu/QN71OnEWtgvm9pXuQs+SGQtKnLHOGVRG5f9CU=", "narHash": "sha256-Jbt4imHmz5Z0jdaW7RrwAO1HYCmPs3XCt4j86jkG0b4=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "d3a763532be5d223bb3474642f089667a8091cdf", "rev": "2880dc44fc8c450b4ffe1609a4bccd19ef759f5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gmodena", "owner": "gmodena",
"ref": "v0.5.0", "ref": "v0.5.1",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"type": "github" "type": "github"
} }
@ -279,14 +279,14 @@
"locked": { "locked": {
"lastModified": 1732605668, "lastModified": 1732605668,
"narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
"ref": "release-2.91", "ref": "stable",
"rev": "96824d606a6656650bbe436366bc89d5ee3a6573", "rev": "96824d606a6656650bbe436366bc89d5ee3a6573",
"revCount": 113, "revCount": 113,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
"original": { "original": {
"ref": "release-2.91", "ref": "stable",
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
} }
@ -371,11 +371,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733261153, "lastModified": 1733412085,
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -17,7 +17,7 @@
}; };
# Flatpak support # Flatpak support
flatpak.url = "github:gmodena/nix-flatpak/v0.5.0"; flatpak.url = "github:gmodena/nix-flatpak/v0.5.1";
# Home-manager support # Home-manager support
home-manager = { home-manager = {
@ -32,7 +32,7 @@
# If you'd rather use regular Nix, remove `lix-module.nixosModules.default` from the `modules` section below. # If you'd rather use regular Nix, remove `lix-module.nixosModules.default` from the `modules` section below.
# To learn more about Lix, see https://lix.systems/ # To learn more about Lix, see https://lix.systems/
lix = { lix = {
url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.91"; url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -46,6 +46,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Code formatter
treefmt = { treefmt = {
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

3
modules/nixos/ui/desktops/budgie/default.nix
View file

@ -10,7 +10,8 @@ let
in in
{ {
options = { options = {
${namespace}.ui.desktops.budgie.enable = lib.mkEnableOption "Enables the Budgie desktop environment."; ${namespace}.ui.desktops.budgie.enable =
lib.mkEnableOption "Enables the Budgie desktop environment.";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {

3
modules/nixos/ui/desktops/hyprland/default.nix
View file

@ -10,7 +10,8 @@ let
in in
{ {
options = { options = {
${namespace}.ui.desktops.hyprland.enable = lib.mkEnableOption "Enables the Hyprland desktop environment."; ${namespace}.ui.desktops.hyprland.enable =
lib.mkEnableOption "Enables the Hyprland desktop environment.";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {

3
systems/x86_64-linux/Shura/hardware-configuration.nix
View file

@ -14,8 +14,7 @@ in
# Configure the kernel. # Configure the kernel.
boot = { boot = {
#kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxKernel.packages.linux_zen;
kernelPackages = pkgs.linuxKernel.packages.linux_lqx;
# Hardware defaults detected by nixos-generate-configuration # Hardware defaults detected by nixos-generate-configuration
initrd = { initrd = {