home/common.nix

@@ -34,26 +34,28 @@ in {
     };
 
     packages = with pkgs; [
-      # see also: system/core.nix
+      # Add your global packages here
-
-      # keygen
       duralumin
       duralumin-keygen
-
-      # terminal utilities
-      gh
-      yazi
       ranger
       neovim
-
+      bottom
-      nix-index
+      git
-
+      wget
-      imagemagick
+      curl
+      tree
+      htop
+      ripgrep
+      killall
+      xdg-utils
+      file
+      gh
 
       # for running wayland apps over ssh
       waypipe
 
-      # my own screenshot utility
+      blender
+
       screenshot
     ];
   };

home/default.nix

@@ -1,12 +1,10 @@
 {...}: {
   imports = [
     ./alacritty.nix
-    ./ghostty.nix
     ./common.nix
     ./desktop-apps.nix
     ./development
     ./emacs.nix
-    ./mail.nix
     ./firefox.nix
     ./games
     ./git-ssh.nix

home/desktop-apps.nix

@@ -28,8 +28,6 @@
     virt-manager
     foliate
 
-    blender
-
     # GUI File Manager
     nemo-with-extensions
   ];

home/emacs.nix

@@ -50,9 +50,6 @@ in {
     hunspellDicts.de-de
     hunspellDicts.da-dk
 
-    # English word lists for spell checking
-    scowl
-
     # jinx from emacsPackages
     emacsPackages.jinx
 

home/ghostty.nix

@@ -1,29 +0,0 @@
-{lib, super-config, ...}:
-let
-  # theme = import ../data/theme.nix {config = super-config; };
-  mkIfOrElse = cond: then_: else_: (lib.mkMerge [
-    (lib.mkIf cond then_)
-    (lib.mkIf (!cond) else_)
-  ]);
-in {
-  programs.ghostty = {
-    enable = true;
-    settings = {
-      font-family = "monospace";
-      font-size = 12;
-      title-report = true;
-      shell-integration = "zsh";
-      shell-integration-features = "no-cursor";
-      theme = "dark: Gruvbox Dark, light: Gruvbox Light";
-      window-theme = mkIfOrElse (super-config.darkMode == true) "dark" "light";
-
-      cursor-style = "block";
-      cursor-style-blink = false;
-      cursor-opacity = 0.8;
-
-      keybind = [
-        "ctrl+shift+enter=new_window"
-      ];
-    };
-  };
-}

home/mail.nix

@@ -1,65 +0,0 @@
-{pkgs, ...}: {
-  programs.thunderbird = {
-    enable = true;
-    profiles.default = {
-      isDefault = true;
-    };
-  };
-
-  home.packages = with pkgs; [
-    rofi-rbw-wayland
-    pinentry-rofi
-    wl-clipboard
-  ];
-
-  programs.rbw = {
-    enable = true;
-    settings = {
-      base_url = "https://vaultwarden.nirgendwo.xyz";
-      email = "janis@nirgendwo.xyz";
-      pinentry = pkgs.pinentry-rofi;
-      lock_timeout = 3600;
-    };
-  };
-
-  accounts.email.accounts = {
-    "Janis @ GMail" = {
-      address = "j4nisboehm@gmail.com";
-      realName = "Janis Böhm";
-      flavor = "gmail.com";
-
-      thunderbird = {
-        enable = true;
-        profiles = [ "default" ];
-      };
-
-      passwordCommand = [ "rbw" "get" "j4nisboehm @ Google" ];
-    };
-
-    "Janis @ Nirgendwo" = {
-      primary = true;
-      address = "janis@nirgendwo.xyz";
-      realName = "Janis Böhm";
-      userName = "janis";
-
-      imap = {
-        host = "mail.nirgendwo.xyz";
-        port = 993;
-        tls.enable = true;
-      };
-
-      smtp = {
-        host = "mail.nirgendwo.xyz";
-        port = 465;
-        tls.enable = true;
-      };
-      
-      thunderbird = {
-        enable = true;
-        profiles = [ "default" ];
-      };
-
-      passwordCommand = [ "rbw" "get" "janis @ nirgendswo.com" ];
-    };
-  };
-}

home/sway.nix

@@ -51,15 +51,6 @@ in {
           }// super-config.extraOutputConfig;
 
           startup = [
-      {
-        command = "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP";
-      }
-      {
-        command = "gesttings set org.gnome.desktop.interface color-scheme 'prefer-dark'";
-      }
-      {
-        command = "gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'";
-      }
             {
               always = true;
               command = "${pkgs.gammastep}/bin/gammastep -l 54:10 -t 6500k:4500k";

home/theme.nix

@@ -24,20 +24,14 @@
   # GTK Setup
   gtk = {
     enable = true;
-    # theme = {
-    #   name = "catppuccin-mocha-standard-blue-dark";
-    #   package = pkgs.catppuccin-gtk.override {
-    #     accents = [ "blue" ];
-    #     size = "standard";
-    #     variant = "mocha";
-    #   };
-    # };
-
     theme = {
-      name = "Adwaita-dark";
+      name = "catppuccin-mocha-standard-blue-dark";
-      package = pkgs.gnome-themes-extra;
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "blue" ];
+        size = "standard";
+        variant = "mocha";
+      };
     };
-
     iconTheme = {
       name = "Papirus-Dark";
       package = pkgs.catppuccin-papirus-folders.override {
@@ -45,19 +39,14 @@
         accent = "blue";
       };
     };
-    # cursorTheme = {
+    cursorTheme = {
-    #   name = "catppuccin-mocha-lavender-cursors";
+      name = "catppuccin-mocha-lavender-cursors";
-    #   package = pkgs.catppuccin-cursors.mochaLavender;
+      package = pkgs.catppuccin-cursors.mochaLavender;
-    # };
-
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = lib.mkIf (super-config.darkMode == true) 1;
     };
-    gtk4.extraConfig = {
+    gtk3 = {
-      gtk-application-prefer-dark-theme = lib.mkIf (super-config.darkMode == true) 1;
+      extraConfig.gtk-application-prefer-dark-theme = super-config.darkMode == true;
     };
   };
-
   dconf.settings = {
     "org/gtk/settings/file-chooser" = {
       sort-directories-first = true;
@@ -65,7 +54,7 @@
 
     # GTK4 Setup
     "org/gnome/desktop/interface" = {
-      # gtk-theme = "catppuccin-mocha-standard-blue-dark";
+      gtk-theme = "catppuccin-mocha-standard-blue-dark";
       color-scheme = lib.mkIf (super-config.darkMode == true) "prefer-dark";
     };
   };
@@ -99,11 +88,13 @@
 
   qt = {
     enable = true;
-    platformTheme.name = "gtk";
+    platformTheme.name = "qtct";
-    style.name = "adwaita-dark";
+    style = {
+      name = "kvantum";
+    };
   };
 
   systemd.user.sessionVariables = {
-    QT_STYLE_OVERRIDE = "adwaita-dark";
+    QT_STYLE_OVERRIDE = "kvantum";
   };
 }

home/zsh.nix

@@ -3,12 +3,6 @@ let
   aliases = import ../data/zsh-aliases.nix {};
 in {
   home.packages = with pkgs; [ pure-prompt ];
-
-  programs.zoxide = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
   programs.zsh = {
     enable = true;
     enableCompletion = true;

system/core.nix

@@ -4,50 +4,10 @@
     zsh
     wget
     curl
-    rsync
     git
     vim
-    jq
-    bat
-    ripgrep
-    ripgrep-all
-    zoxide
-    file
-    fd
-    tree
-    xdg-utils
 
-    # nixos util
-    nh
-
-    # compression
-    unzip
-    zip
-    zstd
-
-    # stats and monitoring
-    fastfetch
-    pciutils
-    usbutils
-    lsof
-    lm_sensors
-
-    # network tools
-    nmap
-    tcpdump
-    doggo
-    inetutils
-    iproute2
-    whois
-
-    # documentation
-    man-pages
-    man-db
-
-    # system monitoring
     htop
-    bottom
-    killall
 
     linux-firmware
     linuxHeaders

system/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./boot.nix
     ./core.nix
-    ./xdg.nix
     ./fonts.nix
     ./hardware.nix
     ./networking.nix

system/xdg.nix

@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-    extraPortals = with pkgs; [
-        xdg-desktop-portal
-        xdg-desktop-portal-wlr
-        xdg-desktop-portal-gtk
-        xdg-desktop-portal-xapp
-    ];
-
-    config.common.default = "*";
-  };
-}