cleaning by inlining tiny files

2025-04-17 13:36:47 +02:00 · 2025-04-17 13:36:47 +02:00 · 2928310925
commit 2928310925
parent c046eadcea
42 changed files with 75 additions and 313 deletions
--- a/home/profiles/develop/devenv.nix
+++ b/home/profiles/develop/devenv.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [devenv];
-}
--- a/home/profiles/develop/tools.nix
+++ b/home/profiles/develop/tools.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [tokei];
-}
--- a/home/profiles/editors/jetbrains/android-studio.nix
+++ b/home/profiles/editors/jetbrains/android-studio.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [android-studio];
-}
--- a/home/profiles/editors/jetbrains/idea.nix
+++ b/home/profiles/editors/jetbrains/idea.nix
@ -1,13 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    (symlinkJoin {
-      name = "idea-ultimate";
-      paths = [jetbrains.idea-ultimate];
-      buildInputs = [makeWrapper];
-      postBuild = ''
-        wrapProgram $out/bin/idea-ultimate \
-          --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libGL]}"
-      '';
-    })
-  ];
-}
--- a/home/profiles/editors/jetbrains/rider.nix
+++ b/home/profiles/editors/jetbrains/rider.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs.jetbrains; [rider];
-}
--- a/home/profiles/editors/vscodium.nix
+++ b/home/profiles/editors/vscodium.nix
@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    vscodium
-  ];
-}
--- a/home/profiles/programs/games/heroic.nix
+++ b/home/profiles/programs/games/heroic.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [heroic];
-}
--- a/home/profiles/programs/games/krunker.nix
+++ b/home/profiles/programs/games/krunker.nix
@ -1,9 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}: {
-  home.packages = [
-    self.packages.${pkgs.system}.krunker
-  ];
-}
--- a/home/profiles/programs/games/lutris.nix
+++ b/home/profiles/programs/games/lutris.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [lutris];
-}
--- a/home/profiles/programs/games/minecraft.nix
+++ b/home/profiles/programs/games/minecraft.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [prismlauncher];
-}
--- a/home/profiles/programs/games/roblox.nix
+++ b/home/profiles/programs/games/roblox.nix
@ -1,10 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  # i have sober installed imperatively through flatpak
-  home.packages = [
-    inputs.sobercookie.packages.${pkgs.system}.default
-  ];
-}
--- a/home/profiles/programs/games/switch.nix
+++ b/home/profiles/programs/games/switch.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [ryubing];
-}
--- a/home/profiles/programs/media/jellyfin.nix
+++ b/home/profiles/programs/media/jellyfin.nix
@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    jellyfin-media-player
-    feishin
-  ];
-}
--- a/home/profiles/programs/media/stremio.nix
+++ b/home/profiles/programs/media/stremio.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [stremio];
-}
--- a/home/profiles/programs/misc/bitwarden.nix
+++ b/home/profiles/programs/misc/bitwarden.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.bitwarden-desktop];
-}
--- a/home/profiles/programs/misc/blender.nix
+++ b/home/profiles/programs/misc/blender.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [blender];
-}
--- a/home/profiles/programs/misc/dolphin.nix
+++ b/home/profiles/programs/misc/dolphin.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [kdePackages.dolphin];
-}
--- a/home/profiles/programs/misc/element.nix
+++ b/home/profiles/programs/misc/element.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [element-desktop];
-}
--- a/home/profiles/programs/misc/foliate.nix
+++ b/home/profiles/programs/misc/foliate.nix
@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    foliate
-  ];
-}
--- a/home/profiles/programs/misc/keepassxc.nix
+++ b/home/profiles/programs/misc/keepassxc.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.keepassxc];
-}
--- a/home/profiles/programs/misc/krita.nix
+++ b/home/profiles/programs/misc/krita.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.krita];
-}
--- a/home/profiles/programs/misc/libreoffice.nix
+++ b/home/profiles/programs/misc/libreoffice.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [libreoffice-qt6];
-}
--- a/home/profiles/programs/misc/obsidian.nix
+++ b/home/profiles/programs/misc/obsidian.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [obsidian];
-}
--- a/home/profiles/programs/misc/pwvucontrol.nix
+++ b/home/profiles/programs/misc/pwvucontrol.nix
@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    pwvucontrol
-  ];
-}
--- a/home/profiles/programs/misc/qpwgraph.nix
+++ b/home/profiles/programs/misc/qpwgraph.nix
@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    qpwgraph
-  ];
-}
--- a/home/profiles/programs/music/picard.nix
+++ b/home/profiles/programs/music/picard.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.picard];
-}
--- a/home/profiles/programs/music/puddletag.nix
+++ b/home/profiles/programs/music/puddletag.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.puddletag];
-}
--- a/home/profiles/services/udiskie.nix
+++ b/home/profiles/services/udiskie.nix
@ -1,3 +0,0 @@
-{
-  services.udiskie.enable = true;
-}
--- a/home/profiles/terminal/programs/lazygit.nix
+++ b/home/profiles/terminal/programs/lazygit.nix
@ -1,3 +0,0 @@
-{
-  programs.lazygit.enable = true;
-}
--- a/home/profiles/terminal/programs/tdf.nix
+++ b/home/profiles/terminal/programs/tdf.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [tdf];
-}
--- a/home/profiles/terminal/programs/zoxide.nix
+++ b/home/profiles/terminal/programs/zoxide.nix
@ -1,3 +0,0 @@
-{
-  programs.zoxide.enable = true;
-}
--- a/home/profiles/terminal/shell/starship.nix
+++ b/home/profiles/terminal/shell/starship.nix
@ -1,5 +0,0 @@
-{
-  programs.starship = {
-    enable = true;
-  };
-}
--- a/home/suites/hopper/default.nix
+++ b/home/suites/hopper/default.nix
@ -1,6 +1,7 @@
 {
  homeProfiles,
  lib,
+  pkgs,
  ...
 }: {
  imports = with homeProfiles; [
@ -13,19 +14,24 @@
    programs.desktop.default
    programs.desktop.sway.default

-    programs.misc.pwvucontrol
-    programs.misc.qpwgraph
-
    programs.media.mpv
-    programs.media.stremio

    services.playerctl
    services.polkit-agent
-    services.udiskie
  ];

  wayland.windowManager.sway.config.output."HDMI-A-1".scale = "2.0";

+  services = {
+    udiskie.enable = true;
+  };
+  home.packages = with pkgs; [
+    pwvucontrol
+    qpwgraph
+
+    stremio
+  ];
+
  home = {
    username = "desktop";
    homeDirectory = lib.mkForce "/home/desktop";
--- a/home/suites/kidney/default.nix
+++ b/home/suites/kidney/default.nix
@ -1,23 +0,0 @@
-{homeProfiles, ...}: {
-  imports = with homeProfiles; [
-    default
-
-    # editors.emacs
-    editors.nvim
-
-    terminal.shell.zsh
-    terminal.programs.xdg
-    terminal.programs.direnv
-    terminal.programs.comma
-    terminal.programs.tmux
-    terminal.programs.irssi
-
-    develop.langs.nix
-    develop.tools
-    develop.devenv
-
-    terminal.programs.git
-    terminal.programs.github
-    terminal.programs.lazygit
-  ];
-}
--- a/home/suites/nixdesk/default.nix
+++ b/home/suites/nixdesk/default.nix
@ -1,6 +1,7 @@
 {
  self,
  pkgs,
+  inputs,
  homeProfiles,
  ...
 }: {
@ -14,26 +15,18 @@

    terminal.shell.zsh
    terminal.shell.fish
-    terminal.shell.starship

    terminal.programs.xdg
    terminal.programs.direnv
    terminal.programs.tmux
    terminal.programs.comma
-    terminal.programs.zoxide
-    terminal.programs.tdf
    terminal.programs.irssi
    terminal.programs.git
    terminal.programs.github
-    terminal.programs.lazygit
    terminal.programs.jujutsu

    # editors.emacs
    editors.nvim
-    editors.vscodium
-    editors.jetbrains.rider
-    editors.jetbrains.idea
-    editors.jetbrains.android-studio

    programs.browsers.firefox.default
    programs.browsers.tor
@ -50,9 +43,7 @@

    # development
    develop.common
-    develop.tools
    develop.docs
-    develop.devenv

    develop.langs.haskell
    develop.langs.rust
@ -64,41 +55,78 @@
    develop.langs.c

    # programs
-    programs.misc.keepassxc
-    programs.misc.bitwarden
    programs.misc.discord
-    programs.misc.element
    programs.misc.obs
-    programs.misc.krita
-    programs.misc.foliate
-    programs.misc.blender
-    programs.misc.obsidian
-    programs.misc.dolphin
-    programs.misc.pwvucontrol
-    programs.misc.qpwgraph
-    programs.misc.libreoffice

-    programs.music.puddletag
-    programs.music.picard
    programs.music.beets
    programs.music.cmus

    programs.media.mpv
-    programs.media.jellyfin
-    programs.media.stremio

    # gaming
    programs.games.default
-    programs.games.lutris
-    programs.games.switch
-    programs.games.heroic
-    programs.games.minecraft
-    programs.games.roblox
-    programs.games.krunker

    services.playerctl
    services.polkit-agent
-    services.udiskie # although i dont need this for usb memory, it is quite convenient for flashing qmk
    # services.appusage
  ];
+
+  services = {
+    udiskie.enable = true;
+  };
+  programs = {
+    starship.enable = true;
+    zoxide.enable = true;
+    lazygit.enable = true;
+  };
+  home.packages = with pkgs; [
+    # coding
+    tokei
+    devenv
+    vscodium
+    android-studio
+    jetbrains.rider
+    jetbrains.idea-ultimate
+
+    # communication
+    element-desktop
+
+    # audio
+    pwvucontrol
+    qpwgraph
+
+    # productivity
+    tdf # terminal pdf reader
+    obsidian
+
+    # passwords
+    keepassxc
+    bitwarden-desktop
+
+    # creating
+    krita
+    blender
+    libreoffice-qt6
+
+    # system things
+    kdePackages.dolphin
+
+    # music
+    puddletag
+    picard
+
+    # media
+    stremio
+    jellyfin-media-player
+    feishin
+    foliate
+
+    # games
+    heroic
+    lutris
+    ryubing # switch emu
+    prismlauncher
+    inputs.sobercookie.packages.${pkgs.system}.default
+    self.packages.${pkgs.system}.krunker
+  ];
 }