Merge branch 'myputer'

hosts/lolcathost/default.nix

@@ -4,13 +4,9 @@
   lib,
   ...
 }: let
-  #home-manager = builtins.fetchTarball {
-  #  url = "https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz";
-  #  sha256 = "00wp0s9b5nm5rsbwpc1wzfrkyxxmqjwsc1kcibjdbfkh69arcpsn";
-  #};
   home-manager = builtins.fetchTarball {
-    url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-    sha256 = "19w63qccz78v0spx03911z98w1bvlxvd07hb0ma14a4vdzi4ninj";
+    url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
+    sha256 = "15k41il0mvmwyv6jns4z8k6khhmb22jk5gpcqs1paym3l01g6abn";
   };
 in {
   imports = [
@@ -32,7 +28,6 @@ in {
     #colorScheme = "mocha";
   };
 
-  # Use the systemd-boot EFI boot loader.
   boot.loader = {
     efi = {
       canTouchEfiVariables = true;
@@ -42,11 +37,12 @@ in {
       efiSupport = true;
       #efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work on this system
       device = "nodev";
+      useOSProber = true;
     };
     # GitHub: vinceliuice/grub2-themes
     grub2-theme = {
       enable = true;
-      theme = "whitesur"; # sylish, vimix, or whitesur
+      theme = "whitesur"; # stylish, vimix, or whitesur
       footer = true;
       customResolution = "1920x1080"; # Optional: Set a custom resolution
     };
@@ -92,13 +88,12 @@ in {
     #hardware.pulseaudio.enable = false;
     pipewire = {
       enable = true;
+      wireplumber.enable = true;
 
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
       jack.enable = true;
-
-      wireplumber.enable = true;
     };
 
     # Enable touchpad support
@@ -107,7 +102,7 @@ in {
     tumbler.enable = true; # Thunar image thumbnail support
     gvfs.enable = true; # Thunar mount, trash, and other functionality
   };
-  security.rtkit.enable = true;
+  security.rtkit.enable = true; # I *think* this is for pipewire
 
   # allow wheel group to use passwordless sudo
   users = {
@@ -179,12 +174,10 @@ in {
   environment.systemPackages = with pkgs; [
     # User Environment
     inputs.swww.packages.${pkgs.system}.swww
-    #vesktop
     helvum
     easyeffects
     ani-cli
     wl-clipboard # clipboard for wayland
-
     pavucontrol
 
     (callPackage ./sddm-theme-corners.nix {}).sddm-theme-corners
@@ -276,6 +269,7 @@ in {
       texlivePackages.noto-emoji
     ];
 
+    # TODO: change my default fonts
     fontconfig = {
       defaultFonts = {
         serif = ["Iosevka"]; # TODO: package Iosevka Etoile since Iosevka isn't a serif font

hosts/lolcathost/sddm-theme-corners.nix

@@ -1,17 +0,0 @@
-{pkgs}: {
-  sddm-theme-corners = pkgs.stdenv.mkDerivation rec {
-    name = "sddm-theme-corners";
-    #version = "1.0";
-    #dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/share/sddm/themes
-      cp -ar $src/corners $out/share/sddm/themes/
-    '';
-    src = pkgs.fetchFromGitHub {
-      owner = "aczw";
-      repo = "sddm-theme-corners";
-      rev = "6ff0ff455261badcae36cd7d151a34479f157a3c";
-      sha256 = "0iiasrbl7ciyhq3z02la636as915zk9ph063ac7vm5iwny8vgwh8";
-    };
-  };
-}