diff --git a/common/base.nix b/common/base.nix index 8bd6cfa..495712d 100644 --- a/common/base.nix +++ b/common/base.nix @@ -74,6 +74,8 @@ ]; }; + boot.kernelPackages = pkgs.linuxPackages_6_6; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. programs.mtr.enable = true; diff --git a/common/hardware/raspberry-pi.nix b/common/hardware/raspberry-pi.nix index 1bc904e..85911f3 100644 --- a/common/hardware/raspberry-pi.nix +++ b/common/hardware/raspberry-pi.nix @@ -2,12 +2,16 @@ # Raspberry PI 3 B+ # Disable systemd-boot - boot.loader = { - systemd-boot = { - enable = false; - }; + boot = { + loader = { + grub.enable = false; - efi.canTouchEfiVariables = false; + systemd-boot = { + enable = lib.mkForce false; + }; + + efi.canTouchEfiVariables = false; + }; }; # Enables the generation of /boot/extlinux/extlinux.conf diff --git a/flake.lock b/flake.lock index 5f111ab..750d4df 100644 --- a/flake.lock +++ b/flake.lock @@ -40,16 +40,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716966868, + "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -82,16 +82,16 @@ }, "stable": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1716966868, + "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -103,16 +103,16 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index 634e9de..d771e19 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "My NixOS config"; 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"; home-manager = { @@ -13,7 +13,7 @@ }; 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"; }; @@ -65,7 +65,7 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild build --flake .#phoenix' nixosConfigurations = { - phoenix = unstable.lib.nixosSystem { + phoenix = stable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ @@ -81,7 +81,7 @@ ]; }; - theseus = unstable.lib.nixosSystem { + theseus = stable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ @@ -105,7 +105,7 @@ ]; }; - yaseen = unstable.lib.nixosSystem { + yaseen = stable.lib.nixosSystem { system = "aarch64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ diff --git a/home/tasia/home.nix b/home/tasia/home.nix index 8177bb6..0c96354 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.home-manager.nixosModules.home-manager + inputs.stable-home-manager.nixosModules.home-manager ]; users.users.tasia = { isNormalUser = true; diff --git a/hosts/enry/configuration.nix b/hosts/enry/configuration.nix index 6b2b5dc..c78114b 100644 --- a/hosts/enry/configuration.nix +++ b/hosts/enry/configuration.nix @@ -24,7 +24,6 @@ in { extraGroups = ["networkmanager" "wheel" "dialout"]; initialPassword = "correcthorsebatterystaple"; openssh.authorizedKeys.keys = [ - sshKeys.tasia.phoenix sshKeys.tasia.yaseen ]; }; diff --git a/hosts/yaseen/configuration.nix b/hosts/yaseen/configuration.nix index ee931a2..5885fcc 100644 --- a/hosts/yaseen/configuration.nix +++ b/hosts/yaseen/configuration.nix @@ -2,6 +2,7 @@ pkgs, lib, inputs, + config, ... }: let sshKeys = import ../../crypto/ssh-keys.nix; @@ -43,6 +44,13 @@ in { ../../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 = { hostName = "yaseen";