Updated flake. Add catppuccin/nix & stable inputs. Redesign gtk approach. Minor fixes.

Author: exploitoverload

.gitignore

@@ -0,0 +1 @@
+result

README.md

@@ -109,11 +109,8 @@ At the first start of the service, the neo4j user's password for the service mus
 
 ## TODO
 
-- [x] Add IP Addresses for current interface to waybar. 
-- [x] Add click to copy IP in the network module of waybar.
-- [x] Add [NvChad](https://github.com/NvChad/NvChad) to the neovim configuration.
-- [x] Move waydroid to a module
-- [x] Move logitech wireless to a module
+- [ ] Create a separate flake and export all packages and options into it to add more modularity.
+- [ ] Add blue-team specific packages.
 
 For more detailed information and documentation, please refer to the [official NixOS manual](https://nixos.org/manual/nixos/stable/index.html).
 

flake.lock

@@ -3,18 +3,21 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; # In order to fix stability issues in packages or options.
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nur.url = "github:nix-community/NUR";
-    hypr-contrib.url = "github:hyprwm/contrib";
+    catppuccin.url = "github:catppuccin/nix"; # For theming.
   };
 
   outputs = {
     nixpkgs,
     home-manager,
     nur,
+    nixpkgs-stable,
+    catppuccin,
     ...
   } @ inputs: let
     system = "x86_64-linux";
@@ -40,15 +43,27 @@
             home-manager = {
               useUserPackages = true;
               useGlobalPkgs = true;
-              extraSpecialArgs = {inherit inputs user;};
+              extraSpecialArgs = {
+                inherit inputs user;
+                stable = import nixpkgs-stable {
+                  inherit system;
+                  config.allowUnFree = true;
+                };
+              };
               users.${user} = ./. + "/hosts/${hostname}/user.nix";
             };
             nixpkgs.overlays = [
               nur.overlay
             ];
           }
         ];
-        specialArgs = {inherit inputs user hostName;};
+        specialArgs = {
+          inherit inputs user hostName;
+          stable = import nixpkgs-stable {
+            inherit system;
+            config.allowUnFree = true;
+          };
+        };
       };
   in {
     nixosConfigurations = {

flake.nix

@@ -4,8 +4,9 @@
   config,
   ...
 }: {
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
   imports = [
+    inputs.catppuccin.homeManagerModules.catppuccin
     ./hyprland
     ./packages
     ./dunst

modules/default.nix

@@ -14,31 +14,28 @@ in {
       gtk-engine-murrine
       gnome.gnome-themes-extra
     ];
-    home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Mauve-Dark";
+
+    catppuccin = {
+      enable = true;
+      accent = "mauve";
+      flavor = "macchiato";
+      pointerCursor.enable = true;
+    };
+
+    programs.waybar.catppuccin.enable = false;
+
     gtk = {
       enable = true;
-      theme = {
-        name = "Catppuccin-Macchiato-Compact-Mauve-Dark";
-        package = pkgs.catppuccin-gtk.override {
-          accents = ["mauve"];
-          size = "compact";
-          tweaks = [];
-          variant = "macchiato";
+      catppuccin = {
+        enable = true;
+        flavor = "macchiato";
+        accent = "mauve";
+        gnomeShellTheme = true;
+        icon = {
+          enable = true;
+          flavor = "macchiato";
         };
       };
-      cursorTheme = {
-        name = "Catppuccin-Macchiato-Mauve-Cursors";
-        package = pkgs.catppuccin-cursors.macchiatoMauve;
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.catppuccin-papirus-folders;
-      };
-    };
-    home.pointerCursor = {
-      gtk.enable = true;
-      package = pkgs.catppuccin-cursors.macchiatoMauve;
-      name = "Catppuccin-Macchiato-Mauve-Cursors";
     };
   };
 }

modules/gtk/default.nix

@@ -16,7 +16,7 @@ in {
       libva-utils
     ];
 
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
       extraPackages = with pkgs; [
         intel-media-driver

modules/intel/default.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   pkgs,
+  stable,
   lib,
   config,
   python3,
@@ -42,7 +43,7 @@ in {
       playerctl
       gtklock
       brightnessctl
-      inputs.hypr-contrib.packages.${pkgs.system}.grimblast
+      grimblast
       openssl
       cifs-utils
       mlocate
@@ -84,7 +85,7 @@ in {
       keepassxc
       # Offensive Tools and Applications
       nmap
-      crackmapexec
+      netexec
       gobuster
       theharvester
       ffuf
@@ -102,7 +103,7 @@ in {
       john
       thc-hydra
       whatweb
-      evil-winrm
+      stable.evil-winrm # Issues with unstable, back to stable.
       crunch
       hashcat-utils
       cadaver

modules/packages/default.nix

@@ -50,8 +50,11 @@
 
   services.hardware.bolt.enable = true;
 
-  # Adding XWayland support
-  programs.hyprland.xwayland.enable = true;
+  # Adding Hyprland with XWayland support
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+  };
 
   virtualisation.libvirtd.enable = true; # For VMs using virt-manager.
 
@@ -179,24 +182,9 @@
     pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock";
   };
 
-  # Sound (PipeWire)
-  sound.enable = false;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  # Disable bluetooth, enable pulseaudio, enable opengl (for Wayland)
+  # Enable Bluetooth
   hardware = {
     bluetooth.enable = true;
-    opengl = {
-      enable = true;
-      driSupport = true;
-    };
   };
 
   # Kerberos
@@ -205,5 +193,5 @@
   services.blueman.enable = true;
 
   # Do not touch
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 }

modules/system/configuration.nix

@@ -25,7 +25,7 @@ in {
       dotDir = ".config/zsh";
 
       enableCompletion = true;
-      enableAutosuggestions = true;
+      autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
 
       initExtra = ''