home/hyprland/default.nix

@@ -6,7 +6,7 @@
         ./hyprlock.nix
         ./hyprpaper.nix
         ./waybar # Status Bar 
-        ./rofi # App Launcher
+        ../rofi # App Launcher
     ];
    
 }

home/programs/browsers.nix

@@ -0,0 +1,23 @@
+{
+  pkgs,
+  config,
+  username,
+  ...
+}: {
+  programs = {
+    chromium = {
+      enable = true;
+      commandLineArgs = ["--enable-features=TouchpadOverscrollHistoryNavigation"];
+      extensions = [
+        # {id = "";}  // extension id, query from chrome web store
+      ];
+    };
+
+    firefox = {
+      enable = true;
+      profiles.${username} = {};
+    };
+
+    #thunderbird.enable = true;
+  };
+}

home/programs/default.nix

@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./browsers.nix
+    ./common.nix
+    ./git.nix
+    ./media.nix
+    ./xdg.nix
+    ./neovim.nix
+  ];
+}

home/programs/dev/default.nix

@@ -1,9 +0,0 @@
-{
-    imports = [
-        ./git.nix
-        ./neovim.nix
-        ./fstl.nix
-        ./openscad.nix
-        ./sqllite_browser.nix
-    ];
-}

home/programs/dev/fstl.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install fstl
-  home.packages = with pkgs; [
-    fstl
-  ];
-}

home/programs/dev/openscad.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install OpenSCAD
-  home.packages = with pkgs; [
-    openscad
-  ];
-}

home/programs/dev/sqllite_browser.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install sqlitebrowser (DB Browser for SQLite)
-  home.packages = with pkgs; [
-    sqlitebrowser
-  ];
-}

home/programs/games.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  config,
+  username,
+  ...
+}: {
+  home.packages = with pkgs; [
+    # Launchers
+    steam
+#    itch
+    lutris
+
+    # Games
+    xonotic
+#    armagetron
+    freeciv
+    mindustry
+    openra
+  ];
+}

home/programs/games/itch.nix

@@ -1,9 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-    home.packages = with pkgs; [
-        itch
-    ];
-}

home/programs/games/lutris.nix

@@ -1,9 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-    home.packages = with pkgs; [
-        lutris
-    ];
-}

home/programs/games/opensource.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-    home.packages = with pkgs; [
-        xonotic
-#    armagetron
-        freeciv
-        mindustry
-        openra
-    ];
-}

home/programs/games/steam.nix

@@ -1,9 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-    home.packages = with pkgs; [
-        steam
-    ];
-}

home/programs/media.nix

@@ -0,0 +1,35 @@
+{
+  pkgs,
+  config,
+  ...
+}:
+# media - control and enjoy audio/video
+{
+  # imports = [
+  # ];
+
+  home.packages = with pkgs; [
+    # audio control
+    pavucontrol
+    playerctl
+    pulsemixer
+    # images
+    imv
+    # Apps
+    spotify
+  ];
+
+  programs = {
+    mpv = {
+      enable = true;
+      defaultProfiles = ["gpu-hq"];
+      scripts = [pkgs.mpvScripts.mpris];
+    };
+
+    obs-studio.enable = true;
+  };
+
+  services = {
+    playerctld.enable = true;
+  };
+}

home/programs/media/audio.nix

@@ -1,24 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-{
-    home.packages = with pkgs; [
-        # audio control
-        pavucontrol
-        playerctl
-        pulsemixer
-    ];
-
-    programs.mpv = {
-        enable = true;
-        defaultProfiles = ["gpu-hq"];
-        scripts = [pkgs.mpvScripts.mpris];
-    };
-
-
-    services = {
-        playerctld.enable = true;
-    };
-}

home/programs/media/image.nix

@@ -1,12 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-{
-    home.packages = with pkgs; [
-        # images
-        imv
-    ];
-
-}

home/programs/media/media.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-# media - control and enjoy audio/video
-{
-    imports = [
-        ./audio.nix
-        ./image.nix
-    ];
-
-}

home/programs/media/obs.nix

@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-
-{
-    # Install OBS Studio and any desired plugins
-    home.packages = with pkgs; [
-        obs-studio
-        obs-studio-plugins.obs-vkcapture # For better Wayland capture (if you're on Wayland)
-        obs-studio-plugins.move-transition # Useful for scene transitions
-    # Add other OBS plugins you might need here
-    ];
-
-    # Optional: Configure environment variables or settings if needed
-    # This is less common for OBS Studio, as it's mostly GUI configured.
-    # Example (you might not need this):
-    environment.variables = {
-        QT_QPA_PLATFORM = "wayland"; # If you're on Wayland and encounter issues
-    };
-
-    # Optional: Set permissions if necessary (less common)
-    # systemd.user.services.obs-studio.serviceConfig.SupplementaryGroups = [ "video" ];
-}

home/programs/media/spotify.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install Spotify
-  home.packages = with pkgs; [
-    spotify
-  ];
-
-  # Optional: You might need to set environment variables for Spotify,
-  # especially if you encounter issues with it finding libraries.
-  # This is less common now, but here's an example:
-  # environment.variables = {
-  #   NIXOS_OZONE_WL = "1"; # If you're on Wayland and have issues
-  # };
-}

home/programs/productivity/blender.nix

@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install Blender
-  home.packages = with pkgs; [
-    blender
-  ];
-
-  # Optional: Install specific versions of Blender (e.g., LTS)
-  # home.packages = with pkgs; [
-  #   blender-bin # Latest stable release
-  #   blender-lts
-  # ];
-
-  # Optional: Install Blender plugins
-  # home.packages = with pkgs; [
-  #   blender
-  #   blender-addons.io-scene-gltf2 # Example GLTF exporter/importer
-  #   # Add other Blender addons here
-  # ];
-}

home/programs/productivity/obsidian.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install Obsidian
-  home.packages = with pkgs; [
-    obsidian
-  ];
-
-  # Optional: You might want to configure Obsidian's data directory.
-  # By default, Obsidian stores its data in ~/Obsidian.
-  # You can change this using environment variables, but it's less common to manage this declaratively.
-  # Example (you might not need this):
-  # environment.variables = {
-  #   OBSIDIAN_VAULT_PATH = "/path/to/your/vaults";
-  # };
-}

home/programs/productivity/onlyoffice.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install OnlyOffice Desktop Editors
-  home.packages = with pkgs; [
-    onlyoffice-desktopeditors
-  ];
-}

home/programs/productivity/slicer.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install Slic3r
-  home.packages = with pkgs; [
-    slic3r
-  ];
-}

home/programs/productivity/thunderbird.nix

@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install Thunderbird
-  home.packages = with pkgs; [
-    thunderbird
-  ];
-
-  # Configure Thunderbird using profiles.ini
-  programs.thunderbird.enable = true;
-  programs.thunderbird.profiles."default" = {
-    isDefault = true;
-    settings = {
-      mail.check_default_mail = false;
-      # Add other Thunderbird settings here if needed
-    };
-    accounts = [
-      {
-        name = "Phil Keier (Hotmail)";
-        server = "imap-mail.outlook.com";
-        user = "phil.keier@hotmail.com";
-        port = 993;
-        ssl = true;
-        type = "imap";
-        identity = {
-          name = "Phil Keier";
-          email = "phil.keier@hotmail.com";
-          smtpServer = "smtp-mail.outlook.com";
-          smtpPort = 587;
-          smtpSsl = true;
-          smtpUsername = "phil.keier@hotmail.com";
-        };
-      }
-    ];
-  };
-}

home/programs/social/element.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install Element Desktop
-  home.packages = with pkgs; [
-    element-desktop
-  ];
-}

home/programs/social/telegram.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install Telegram Desktop
-  home.packages = with pkgs; [
-    telegram-desktop
-    telegram-cli
-  ];
-}

home/programs/social/webcord.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Install WebCord
-  home.packages = with pkgs; [
-    webcord
-  ];
-}

home/programs/web/chromium.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-    programs.chromium = {
-        enable = true;
-        commandLineArgs = ["--enable-features=TouchpadOverscrollHistoryNavigation"];
-        extensions = [
-            # {id = "";}  // extension id, query from chrome web store
-        ];
-    };
-}

home/programs/web/firefox.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  config,
-  username,
-  ...
-}: {
-    programs.firefox = {
-        enable = true;
-        profiles.${username} = {};
-    };
-}