feat(nixos): use nur-ctp-plymouth, latest kernel, add docker group

This commit is contained in:
winston 2023-02-14 06:21:45 +01:00
parent b603a9740e
commit cf16fd1144
Signed by: winston
GPG key ID: 3786770EDBC2B481
2 changed files with 6 additions and 27 deletions

View file

@ -189,11 +189,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1676255131, "lastModified": 1676351500,
"narHash": "sha256-jzhKpaBsiQVUU+Ts0XVuafWg2r+3kc60YVxTdEYvBZM=", "narHash": "sha256-hqoge5a3xQwtmKkhDKyEbbD7mqZ40ag12LzrwFtXEDk=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "nur", "repo": "nur",
"rev": "3850740fc65e52715cefb1c3eb02dd6e7e5c1a62", "rev": "b56911487277ebc9f8ea36e175cc6a91f1edb68b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,35 +4,14 @@
... ...
}: let }: let
mainUser = "winston"; mainUser = "winston";
plymouthPkg = pkgs.stdenv.mkDerivation {
name = "plymouth-theme-catppuccin";
src = pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "plymouth";
rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
sha256 = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
};
installPhase = ''
mkdir -p "$out/share/plymouth/themes/"
cp -r "themes/"* "$out/share/plymouth/themes/"
themes=("mocha" "macchiato" "frappe" "latte")
for dir in "''${themes[@]}"; do
cat "themes/catppuccin-''${dir}/catppuccin-''${dir}.plymouth" | sed "s@\/usr\/@''${out}\/@" > "''${out}/share/plymouth/themes/catppuccin-''${dir}/catppuccin-''${dir}.plymouth"
done
'';
};
in { in {
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = ["nix-command" "flakes"];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
imports = [./hardware.nix]; imports = [./hardware.nix];
environment.systemPackages = with pkgs; [xarchiver];
boot = { boot = {
kernelPackages = pkgs.linuxPackages_6_1; kernelPackages = pkgs.linuxPackages_latest;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
@ -43,7 +22,7 @@ in {
plymouth = { plymouth = {
enable = true; enable = true;
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
themePackages = [plymouthPkg]; themePackages = [pkgs.nur.repos.nekowinston.plymouth-theme-catppuccin];
}; };
kernelParams = ["quiet" "splash" "vt.global_cursor_default=0"]; kernelParams = ["quiet" "splash" "vt.global_cursor_default=0"];
initrd.systemd.enable = true; initrd.systemd.enable = true;
@ -130,7 +109,7 @@ in {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
users.users."${mainUser}" = { users.users."${mainUser}" = {
extraGroups = ["wheel"]; extraGroups = ["wheel" "docker"];
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILm0O46zW/XfVOSwz0okRWYeOAg+wCVkCtCAoVTpZsOh"]; openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILm0O46zW/XfVOSwz0okRWYeOAg+wCVkCtCAoVTpZsOh"];
shell = pkgs.zsh; shell = pkgs.zsh;