home: cleanup

2024-03-26 16:49:35 +08:00 · 2024-03-26 16:49:35 +08:00 · 1d6adde578
commit 1d6adde578
parent dd785d8825
36 changed files with 43 additions and 160 deletions
--- a/home/applications/amberol/default.nix
+++ b/home/applications/amberol/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.amberol];
-}
--- a/home/applications/android-tools/default.nix
+++ b/home/applications/android-tools/default.nix
@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  # requires sudo
-  home.packages = [pkgs.android-tools];
-}
--- a/home/applications/batsignal/default.nix
+++ b/home/applications/batsignal/default.nix
@ -1,3 +0,0 @@
-{
-  services.batsignal.enable = true;
-}
--- a/home/applications/bottom/default.nix
+++ b/home/applications/bottom/default.nix
@ -1,3 +0,0 @@
-{
-  programs.bottom.enable = true;
-}
--- a/home/applications/cava/default.nix
+++ b/home/applications/cava/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.cava];
-}
--- a/home/applications/cliphist/default.nix
+++ b/home/applications/cliphist/default.nix
@ -1,3 +0,0 @@
-{
-  services.cliphist.enable = true;
-}
--- a/home/applications/common/wm.nix
+++ b/home/applications/common/wm.nix
@ -1,16 +1,8 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
-    pavucontrol
-  ];
+  home.packages = with pkgs; [pavucontrol];

-  dconf.settings = {
-    "org/gnome/desktop/wm/preferences" = {
-      "button-layout" = "icon,appmenu:"; # remove csd window buttons
-    };
-  };
-
-  home.sessionVariables = {
-    # https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45
-    GTK_CSD = 0;
-  };
+  # remove csd window buttons
+  # https://github.com/localsend/localsend/blob/2457acd8a7412723b174672d174e4853dccd7d99/app/linux/my_application.cc#L45
+  home.sessionVariables.GTK_CSD = 0;
+  dconf.settings."org/gnome/desktop/wm/preferences"."button-layout" = "icon,appmenu:";
 }
--- a/home/applications/easyeffects/default.nix
+++ b/home/applications/easyeffects/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.easyeffects];
-}
--- a/home/applications/fd/default.nix
+++ b/home/applications/fd/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.fd];
-}
--- a/home/applications/hyperfine/default.nix
+++ b/home/applications/hyperfine/default.nix
@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [
-    pkgs.hyperfine
-  ];
-}
--- a/home/applications/irssi/default.nix
+++ b/home/applications/irssi/default.nix
@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.irssi];
-  #programs.irssi.enable = true;
-}
--- a/home/applications/joshuto/default.nix
+++ b/home/applications/joshuto/default.nix
@ -1,3 +0,0 @@
-{
-  programs.joshuto.enable = true;
-}
--- a/home/applications/lunar-client/default.nix
+++ b/home/applications/lunar-client/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.lunar-client];
-}
--- a/home/applications/mangohud/default.nix
+++ b/home/applications/mangohud/default.nix
@ -1,6 +0,0 @@
-{
-  programs.mangohud = {
-    enable = true;
-    # TODO: add configuration, i have no idea how to display stuff with nix syntax
-  };
-}
--- a/home/applications/mousai/default.nix
+++ b/home/applications/mousai/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.mousai];
-}
--- a/home/applications/mumble/default.nix
+++ b/home/applications/mumble/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.mumble];
-}
--- a/home/applications/netease-cloud-music-gtk/default.nix
+++ b/home/applications/netease-cloud-music-gtk/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.netease-cloud-music-gtk];
-}
--- a/home/applications/osu-lazer/default.nix
+++ b/home/applications/osu-lazer/default.nix
@ -1,7 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  home.packages = [inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.osu-lazer-bin];
-}
--- a/home/applications/osu-stable/default.nix
+++ b/home/applications/osu-stable/default.nix
@ -1,12 +0,0 @@
-{
-  pkgs,
-  inputs,
-  config,
-  ...
-}: {
-  home.packages = [
-    (inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.osu-stable.override {
-      location = "${config.xdg.dataHome}/osu-stable";
-    })
-  ];
-}
--- a/home/applications/prismlauncher/default.nix
+++ b/home/applications/prismlauncher/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [(pkgs.prismlauncher.override {glfw = pkgs.glfw-wayland-minecraft;})];
-}
--- a/home/applications/protonup-qt/default.nix
+++ b/home/applications/protonup-qt/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.protonup-qt];
-}
--- a/home/applications/qbittorrent/default.nix
+++ b/home/applications/qbittorrent/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.qbittorrent];
-}
--- a/home/applications/ripgrep/default.nix
+++ b/home/applications/ripgrep/default.nix
@ -1,3 +0,0 @@
-{
-  programs.ripgrep.enable = true;
-}
--- a/home/applications/steam/default.nix
+++ b/home/applications/steam/default.nix
@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [
-    pkgs.steam
-
-    # with ProtonGE
-    # (pkgs.steam.override {
-    #   extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.proton-ge}'";
-    # })
-  ];
-}
--- a/home/applications/sway/default.nix
+++ b/home/applications/sway/default.nix
@ -8,15 +8,16 @@
  imports = [
    ../common/wayland.nix
    ../common/wm.nix
-    ../cliphist
    ../i3status-rust
    ../mako
    ../rofi
    ../swayidle
    ../swaylock
-    ../udiskie
  ];

+  services.cliphist.enable = true;
+  services.udiskie.enable = true;
+
  home.sessionVariables = {
    GTK_IM_MODULE = lib.mkForce "wayland"; # use text-input-v3
  };
--- a/home/applications/swww/default.nix
+++ b/home/applications/swww/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.swww];
-}
--- a/home/applications/trashy/default.nix
+++ b/home/applications/trashy/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.trashy];
-}
--- a/home/applications/udiskie/default.nix
+++ b/home/applications/udiskie/default.nix
@ -1,3 +0,0 @@
-{
-  services.udiskie.enable = true;
-}
--- a/home/applications/wget/default.nix
+++ b/home/applications/wget/default.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.wget];
-}
--- a/home/applications/yesplaymusic/yesplaymusic.nix
+++ b/home/applications/yesplaymusic/yesplaymusic.nix
@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.yesplaymusic];
-}
--- a/home/applications/zoxide/default.nix
+++ b/home/applications/zoxide/default.nix
@ -1,3 +0,0 @@
-{
-  programs.zoxide.enable = true;
-}
--- a/home/default.nix
+++ b/home/default.nix
@ -35,22 +35,22 @@
    inputs.self.homeManagerModules.default
    inputs.nur.hmModules.nur

+    ./applications/atuin
+    ./applications/bat
+    ./applications/eza
+    ./applications/fastfetch
    ./applications/git
    ./applications/gpg
-    ./applications/starship
-    ./applications/eza
    ./applications/skim
-    ./applications/bat
-    ./applications/zoxide
-    ./applications/ripgrep
-    ./applications/wget
-    ./applications/fd
-    ./applications/atuin
-    ./applications/zellij
-    ./applications/fastfetch
+    ./applications/starship
    ./applications/tealdeer
+    ./applications/zellij
  ];

+  programs.ripgrep.enable = true;
+  programs.zoxide.enable = true;
+  home.packages = with pkgs; [fd] ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [trashy]);
+
  home.shellAliases = {
    ".." = "cd ..";
    "farsee" = "curl -F 'c=@-' 'https://fars.ee/'"; # pb
--- a/hosts/aristotle/default.nix
+++ b/hosts/aristotle/default.nix
@ -27,18 +27,17 @@
  home-manager.users.guanranwang = {
    imports = map (n: ../../home/applications/${n}) [
      "spotify/spicetify.nix"
-      "amberol"
-      "mousai"
      "thunderbird"
      "telegram-desktop"
-      "hyperfine"
      "ydict"
-      "android-tools"
    ];

    home.packages = with pkgs; [
+      amberol
      fractal
      gnome.gnome-calculator
+      hyperfine
+      mousai
    ];

    programs.obs-studio.enable = true;
--- a/nixos/profiles/common/core/default.nix
+++ b/nixos/profiles/common/core/default.nix
@ -28,7 +28,7 @@
  ];

  ### home-manager
-  home-manager.users.guanranwang = import ./home;
+  home-manager.users.guanranwang = import ../../../../home;

  users.mutableUsers = false;
  home-manager = {
--- a/nixos/profiles/common/core/home/default.nix
+++ b/nixos/profiles/common/core/home/default.nix
@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ../../../../../home
-    ../../../../../home/applications/trashy
-  ];
-}
--- a/nixos/profiles/common/opt-in/gaming/home/default.nix
+++ b/nixos/profiles/common/opt-in/gaming/home/default.nix
@ -1,12 +1,23 @@
-{...}: {
-  imports = map (n: ../../../../../../home/applications/${n}) [
-    "steam"
-    "prismlauncher"
-    "osu-lazer"
-    #"osu-stable"
-    "mangohud"
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  gamePkgs = inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system};
+in {
+  programs.mangohud.enable = true;

-    # VOIP
-    "mumble"
-  ];
+  home.packages = with pkgs;
+    [
+      (prismlauncher.override {glfw = glfw-wayland-minecraft;})
+      mumble
+      steam
+      # (pkgs.steam.override {extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${gamePkgs.proton-ge}'";})
+      # lunar-client
+      # protonup-qt
+    ]
+    ++ (with gamePkgs; [
+      osu-lazer-bin
+      # (osu-stable.override {location = "${config.xdg.dataHome}/osu-stable";})
+    ]);
 }