Further module cleanup

gunther/configuration.nix

@@ -185,9 +185,6 @@
         qpdfview
         swww
 
-        # greeter
-        greetd.gtkgreet
-
         # deps for hyprland / eww
         socat
 

gunther/leonv.nix

@@ -27,12 +27,7 @@
   };
 
   home.packages = with pkgs; [ 
-    prismlauncher
+    # operating systems stuff / C/C++
-
-    # smt solver for liquid haskell
-    z3
-
-    # operating systems stuff
     grub2
     xorriso
     qemu
@@ -40,52 +35,33 @@
     man-pages
     man-pages-posix
     cpplint
-
-    # stuff
-    swi-prolog
-    jq
-    vlc
-    openvpn
-    signal-desktop
-    discord-canary
-    firefox-wayland
-    google-chrome
-    thunderbird
-    gimp
-    qpdfview
-    wget
-    fontforge
-    gparted
-    eza
-    ripgrep
-    fd
-    zoom-us
-    obsidian
-    zotero
-
-    # development
-    go
-    jetbrains.idea-ultimate
-    gnumake
-    ghostscript
-    jdk11
     gcc
     gdb
+    gnumake
+
+    # prolog
+    swi-prolog
+
+    # go
+    go
+
+    # java
+    jetbrains.idea-ultimate
+    jdk11
+
+    # haskell
     doxygen
     haskell.compiler.ghc981
     cabal-install
     haskell-language-server
+
+    # script
+    ghostscript
     python3
     python3Packages.pygments
-    unifont
-    anki
-    pandoc
-
-    # yubikey
-    yubico-pam
-    yubikey-manager
 
     # proof assistants
+    unifont
     (agda.withPackages [ 
       agdaPackages.standard-library
       agdaPackages.agda-categories
@@ -99,88 +75,15 @@
     emacs
   ];
 
+  # emacs
   xdg.configHome = /home/leonv/.config;
   xdg.configFile."doom/init.el".source = ./doom/init.el;
   xdg.configFile."doom/config.el".source = ./doom/config.el;
   xdg.configFile."doom/packages.el".source = ./doom/packages.el;
+  home.sessionPath = [ "$HOME/.config/emacs/bin" ];
 
   programs.home-manager.enable = true;
 
-  programs.zsh = {
+  # for bluetooth headset functionality
-    enable = true;
-    shellAliases = {
-      clean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc";
-      ls = "eza";
-      ll = "eza -l";
-      l = "eza -lah";
-      code = "codium";
-      alg = "code ~/Git/algprog/tex";
-      nixos = "code ~/Git/nixos";
-    };
-    initExtra = ''
-      function rebuild () {
-        sudo nixos-rebuild switch --flake /home/leonv/Git/nixos
-        sudo cp -r /home/leonv/Git/nixos /etc/
-      }
-    '';
-    oh-my-zsh.enable = true;
-  };
-
-  gtk = {
-    enable = true;
-    theme = {
-      name = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
-      package = pkgs.catppuccin-gtk.override {
-        accents = [ "flamingo" ];
-        size = "compact";
-        tweaks = [ "rimless" "black" ];
-        variant = "macchiato";
-      };
-    };
-    iconTheme = {
-      name = "Dracula";
-      package = pkgs.dracula-icon-theme;
-    };
-    font = {
-      name = "NotoSans Nerd Font";
-    };
-    gtk3 = {
-      extraConfig.gtk-application-prefer-dark-theme = true;
-    };
-  };
-  home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
-  home.sessionPath = [ "$HOME/.config/emacs/bin" ];
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 24;
-  };
-
-  programs.tofi = {
-    enable = true;
-    settings = {
-      width = "100%";
-      height = "100%";
-      border-width = 0;
-      outline-width = 0;
-      padding-left = "35%";
-      padding-top = "35%";
-      result-spacing = 25;
-      num-results = 5;
-      font = "monospace";
-      background-color = "#000A";
-    };
-  };
-
-  dconf.settings = {
-    # GTK4 Setup
-    "org/gnome/desktop/interface" = {
-      gtk-theme = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
-      color-scheme = "prefer-dark";
-    };
-  };
-
   services.mpris-proxy.enable = true;
 }

modules/hyprland/default.nix

@@ -62,6 +62,7 @@ in
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       # hyprland
+      jq
       kitty
       networkmanagerapplet
       mako
@@ -86,8 +87,35 @@ in
               tweaks = [ "rimless" "black" ];
               variant = "macchiato";
             })
-    ];
 
+      # desktop apps
+      vlc
+      openvpn
+      signal-desktop
+      discord-canary
+      firefox-wayland
+      google-chrome
+      thunderbird
+      gimp
+      qpdfview
+      wget
+      fontforge
+      gparted
+      eza
+      ripgrep
+      fd
+      zoom-us
+      obsidian
+      zotero
+
+      # yubikey
+      yubico-pam
+      yubikey-manager
+
+      # notes
+      anki
+      pandoc
+    ];
 
     services.hyprpaper = mkIf cfg.hyprpaper.enable {
       enable = true;
@@ -222,6 +250,42 @@ in
     # tell electron to use wayland
     home.sessionVariables.NIXOS_OZONE_WL = "1";
 
+    # tofi for dmenu functionality
+    programs.tofi = {
+      enable = true;
+      settings = {
+        width = "100%";
+        height = "100%";
+        border-width = 0;
+        outline-width = 0;
+        padding-left = "35%";
+        padding-top = "35%";
+        result-spacing = 25;
+        num-results = 5;
+        font = "monospace";
+        background-color = "#000A";
+      };
+    };
+
+    # zsh
+    programs.zsh = {
+      enable = true;
+      shellAliases = {
+        clean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc";
+        ls = "eza";
+        ll = "eza -l";
+        l = "eza -lah";
+        code = "codium";
+      };
+      initExtra = ''
+        function rebuild () {
+          sudo nixos-rebuild switch --flake /home/leonv/Git/nixos
+          sudo cp -r /home/leonv/Git/nixos /etc/
+        }
+      '';
+      oh-my-zsh.enable = true;
+    };
+
     # terminal
     programs.foot = {
       enable = true;
@@ -251,6 +315,46 @@ in
       };
     };
 
+    # GTK
+    gtk = {
+      enable = true;
+      theme = {
+        name = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+        package = pkgs.catppuccin-gtk.override {
+          accents = [ "flamingo" ];
+          size = "compact";
+          tweaks = [ "rimless" "black" ];
+          variant = "macchiato";
+        };
+      };
+      iconTheme = {
+        name = "Dracula";
+        package = pkgs.dracula-icon-theme;
+      };
+      font = {
+        name = "NotoSans Nerd Font";
+      };
+      gtk3 = {
+        extraConfig.gtk-application-prefer-dark-theme = true;
+      };
+    };
+    home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+
+    home.pointerCursor = {
+      gtk.enable = true;
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Classic";
+      size = 24;
+    };
+
+    dconf.settings = {
+      # GTK4 Setup
+      "org/gnome/desktop/interface" = {
+        gtk-theme = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+        color-scheme = "prefer-dark";
+      };
+    };
+
     services.mako = {
       enable = true;
       extraConfig = ''