From cf16fd1144af8d30d18c69f81a5e157d57d78a02 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 14 Feb 2023 06:21:45 +0100
Subject: [PATCH] feat(nixos): use nur-ctp-plymouth, latest kernel, add docker
 group

---
 flake.lock                    |  6 +++---
 machines/futomaki/default.nix | 27 +++------------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index bdbd809..0622be2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -189,11 +189,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1676255131,
-        "narHash": "sha256-jzhKpaBsiQVUU+Ts0XVuafWg2r+3kc60YVxTdEYvBZM=",
+        "lastModified": 1676351500,
+        "narHash": "sha256-hqoge5a3xQwtmKkhDKyEbbD7mqZ40ag12LzrwFtXEDk=",
         "owner": "nekowinston",
         "repo": "nur",
-        "rev": "3850740fc65e52715cefb1c3eb02dd6e7e5c1a62",
+        "rev": "b56911487277ebc9f8ea36e175cc6a91f1edb68b",
         "type": "github"
       },
       "original": {
diff --git a/machines/futomaki/default.nix b/machines/futomaki/default.nix
index c1a84cb..db2cbcf 100644
--- a/machines/futomaki/default.nix
+++ b/machines/futomaki/default.nix
@@ -4,35 +4,14 @@
   ...
 }: let
   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 {
   nix.settings.experimental-features = ["nix-command" "flakes"];
   nixpkgs.config.allowUnfree = true;
 
   imports = [./hardware.nix];
-  environment.systemPackages = with pkgs; [xarchiver];
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_1;
+    kernelPackages = pkgs.linuxPackages_latest;
     loader.efi.canTouchEfiVariables = true;
     loader.systemd-boot.enable = true;
 
@@ -43,7 +22,7 @@ in {
     plymouth = {
       enable = true;
       theme = "catppuccin-mocha";
-      themePackages = [plymouthPkg];
+      themePackages = [pkgs.nur.repos.nekowinston.plymouth-theme-catppuccin];
     };
     kernelParams = ["quiet" "splash" "vt.global_cursor_default=0"];
     initrd.systemd.enable = true;
@@ -130,7 +109,7 @@ in {
   virtualisation.docker.enable = true;
 
   users.users."${mainUser}" = {
-    extraGroups = ["wheel"];
+    extraGroups = ["wheel" "docker"];
     isNormalUser = true;
     openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILm0O46zW/XfVOSwz0okRWYeOAg+wCVkCtCAoVTpZsOh"];
     shell = pkgs.zsh;