From ca59bf727c690df4634c68cd05429fb28dfb75e0 Mon Sep 17 00:00:00 2001
From: 4Lost <elias.schroeter@e.email>
Date: Fri, 1 Mar 2024 20:39:29 +0100
Subject: [PATCH] cleanup zsh config - change to unmutuble users

---
 configuration.nix                 | 58 ++++++++-----------------------
 home/programs/catppuccin-sddm.nix | 43 +++++++++++++++++++++++
 home/programs/wallpaper.nix       |  2 +-
 3 files changed, 59 insertions(+), 44 deletions(-)
 create mode 100644 home/programs/catppuccin-sddm.nix

diff --git a/configuration.nix b/configuration.nix
index 413a413..3f4ce46 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,18 +14,6 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  environment.systemPackages = with pkgs; [
-    #(callPackage ./pkgs/sddm-sugar-dark-theme.nix { })
-
-    git
-    neovim
-    wget
-    curl
-    alacritty
-    dmenu
-  ];
-
   networking.hostName = "eliasLaptop"; # Define your hostname.
   # Pick only one of the below networking options.
   #networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
@@ -34,10 +22,6 @@
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
@@ -45,23 +29,12 @@
     useXkbConfig = true; # use xkb.options in tty.
   };
 
-  # Enable the X11 windowing system.
-  #services.xserver = {
-  #  enable = true;
-    #displayManager = {
-    #  sddm = {
-    #    enable = true;
-    #    theme = "sddm-sugar-dark";
-    #  };
-    #  defaultSession = "none+xmonad";
-    #};
-  #};
   services.xserver = {
     enable = true;
     displayManager = {
       sddm = {
         enable = true;
-	      theme = "sddm-sugar-dark";
+        theme = "catppuccin-mocha";
       };
       defaultSession = "none+xmonad";
     };
@@ -73,6 +46,7 @@
     };
   };
 
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
@@ -95,25 +69,23 @@
       isNormalUser = true;
       home = "/home/elias";
       shell = pkgs.zsh;
-      extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+      extraGroups = [ "wheel" "networkmanager" ];
       hashedPassword = "$6$pdAJt1f0v7Zb13Ri$1WpKrErAp5JCb7eXs7EeeWYRMBLu5/WKDdMyGzJyYQDijG2NiywUXpAkl/8p1noxOOqYbb.MTw7JmTzhWGsT21";
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    #(libsForQt5.callPackage home/programs/catppuccin-sddm.nix { })
+
+    git
+    neovim
+    wget
+    curl
+    alacritty
+    dmenu
+  ];
+
   programs.zsh.enable = true;
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "23.11"; # Do not change!!!!
 }
 
diff --git a/home/programs/catppuccin-sddm.nix b/home/programs/catppuccin-sddm.nix
new file mode 100644
index 0000000..0b0b6d6
--- /dev/null
+++ b/home/programs/catppuccin-sddm.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, sddm
+, qtgraphicaleffects
+, qtquickcontrols2
+, qtsvg
+}:
+
+stdenv.mkDerivation rec {
+  pname = "catppuccin-sddm";
+  version = "unstable-2024-02-05";
+
+  src = fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "sddm";
+    rev = "f3db13cbe8e99a4ee7379a4e766bc8a4c2c6c3dd";
+    hash = "sha256-0zoJOTFjQq3gm5i3xCRbyk781kB7BqcWWNrrIkWf2Xk=";
+  };
+
+  buildInputs = [
+    sddm
+    qtgraphicaleffects
+    qtquickcontrols2
+    qtsvg
+  ];
+
+  dontWrapQtApps = true;
+
+  postInstall = ''
+    mkdir -p "$out/share/sddm/themes/"
+    mv src/* "$out/share/sddm/themes/."
+  '';
+
+  meta = {
+    description = "Soothing pastel theme for SDDM";
+    homepage = "https://github.com/catppuccin/sddm";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ einfischy ];
+    platforms = lib.platforms.linux;
+  };
+}
+
diff --git a/home/programs/wallpaper.nix b/home/programs/wallpaper.nix
index 4f1b360..83be94a 100644
--- a/home/programs/wallpaper.nix
+++ b/home/programs/wallpaper.nix
@@ -6,6 +6,6 @@
   };
 
   xsession.initExtra = ''
-    ${pkgs.feh}/bin/feh --bg-fill --no-fehbg "background_temp.jpeg"
+    ${pkgs.feh}/bin/feh --bg-fill --no-fehbg "/etc/nixos/home/programs/background_temp.jpeg"
     '';
 }