big update, see desc

update default branch to 24.05
update lockfile
rgb keyboard support for yaseen
got enry working again
kernel 6.6
This commit is contained in:
Tasia Iso 2024-05-30 17:28:31 +02:00
parent 6feb2d3c61
commit 2cc169a202
Signed by: tasiaiso
SSH key fingerprint: SHA256:KiRjUay5C9i6objsEOIycygBHn54pDBB3Lj7fyJ0Elw
7 changed files with 38 additions and 25 deletions

View file

@ -74,6 +74,8 @@
]; ];
}; };
boot.kernelPackages = pkgs.linuxPackages_6_6;
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
programs.mtr.enable = true; programs.mtr.enable = true;

View file

@ -2,12 +2,16 @@
# Raspberry PI 3 B+ # Raspberry PI 3 B+
# Disable systemd-boot # Disable systemd-boot
boot.loader = { boot = {
systemd-boot = { loader = {
enable = false; grub.enable = false;
};
efi.canTouchEfiVariables = false; systemd-boot = {
enable = lib.mkForce false;
};
efi.canTouchEfiVariables = false;
};
}; };
# Enables the generation of /boot/extlinux/extlinux.conf # Enables the generation of /boot/extlinux/extlinux.conf

View file

@ -40,16 +40,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716509168, "lastModified": 1716966868,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfb7a882678e518398ce9a31a881538679f6f092", "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -82,16 +82,16 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1716633019, "lastModified": 1716966868,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -103,16 +103,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716729592, "lastModified": 1716736833,
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"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"
} }

View file

@ -2,9 +2,9 @@
description = "My NixOS config"; description = "My NixOS config";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
stable.url = "github:nixos/nixpkgs/nixos-23.11"; stable.url = "github:nixos/nixpkgs/nixos-24.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
@ -13,7 +13,7 @@
}; };
stable-home-manager = { stable-home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "stable"; inputs.nixpkgs.follows = "stable";
}; };
@ -65,7 +65,7 @@
# NixOS configuration entrypoint # NixOS configuration entrypoint
# Available through 'nixos-rebuild build --flake .#phoenix' # Available through 'nixos-rebuild build --flake .#phoenix'
nixosConfigurations = { nixosConfigurations = {
phoenix = unstable.lib.nixosSystem { phoenix = stable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
@ -81,7 +81,7 @@
]; ];
}; };
theseus = unstable.lib.nixosSystem { theseus = stable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
@ -105,7 +105,7 @@
]; ];
}; };
yaseen = unstable.lib.nixosSystem { yaseen = stable.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
modules = [ modules = [

View file

@ -4,7 +4,7 @@
... ...
}: { }: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.stable-home-manager.nixosModules.home-manager
]; ];
users.users.tasia = { users.users.tasia = {
isNormalUser = true; isNormalUser = true;

View file

@ -24,7 +24,6 @@ in {
extraGroups = ["networkmanager" "wheel" "dialout"]; extraGroups = ["networkmanager" "wheel" "dialout"];
initialPassword = "correcthorsebatterystaple"; initialPassword = "correcthorsebatterystaple";
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
sshKeys.tasia.phoenix
sshKeys.tasia.yaseen sshKeys.tasia.yaseen
]; ];
}; };

View file

@ -2,6 +2,7 @@
pkgs, pkgs,
lib, lib,
inputs, inputs,
config,
... ...
}: let }: let
sshKeys = import ../../crypto/ssh-keys.nix; sshKeys = import ../../crypto/ssh-keys.nix;
@ -43,6 +44,13 @@ in {
../../modules/nixos/tildefriends.nix ../../modules/nixos/tildefriends.nix
]; ];
# RGB Keyboard backight
boot.extraModulePackages = with config.boot.kernelPackages; [hid-ite8291r3];
services.udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="leds", DEVPATH=="*:kbd_backlight", TEST=="color", ATTR{color}="fc4f05"
'';
networking = { networking = {
hostName = "yaseen"; hostName = "yaseen";