diff --git a/users/guanranwang/darwin/profiles/core/default.nix b/users/guanranwang/darwin/profiles/core/default.nix index b01e2d9..18e86c3 100644 --- a/users/guanranwang/darwin/profiles/core/default.nix +++ b/users/guanranwang/darwin/profiles/core/default.nix @@ -17,7 +17,6 @@ ### Options myFlake.darwin.networking.dns.provider = lib.mkDefault "alidns"; - ### Flakes imports = [ ../../../../../darwin/flake-modules/home-manager.nix diff --git a/users/guanranwang/home-manager/actual-modules/terminal.nix b/users/guanranwang/home-manager/actual-modules/terminal.nix deleted file mode 100644 index 73b55a2..0000000 --- a/users/guanranwang/home-manager/actual-modules/terminal.nix +++ /dev/null @@ -1,47 +0,0 @@ -{lib, ...}: { - # 3 terminals, one module. - # -- The Orange Box (wtf) - - # FAQ (for future myself): - # - # - Q: font? - # A: use fontconfig. - # - # - Q: WezTerm? - # A: - I don't use it. - # - I don't know Lua. - # - extraConfig is probably not enough if you want customize it yourself. - # - # - Q: which terminal should I use? - # A: - Alacritty - rusty - # - Foot - fast - # - Kitty - feature rich - # - # - Q: why does kitty's font look bold - # A: I dont know, might be related to this: https://sw.kovidgoyal.net/kitty/conf/#opt-kitty.text_composition_strategy - - options = { - myFlake.home-manager.terminal = { - cursorStyle = lib.mkOption { - type = lib.types.enum ["block" "beam" "underline"]; - default = "beam"; - example = "block"; - description = "Select desired terminal cursor style."; - }; - - fontSize = lib.mkOption { - type = lib.types.int; - default = 12; - example = 8; - description = "Select desired terminal font size."; - }; - - padding = lib.mkOption { - type = lib.types.int; - default = 12; - example = 8; - description = "Select desired terminal padding size (in px)."; - }; - }; - }; -} diff --git a/users/guanranwang/home-manager/applications/alacritty/default.nix b/users/guanranwang/home-manager/applications/alacritty/default.nix new file mode 100644 index 0000000..a2a99e3 --- /dev/null +++ b/users/guanranwang/home-manager/applications/alacritty/default.nix @@ -0,0 +1,6 @@ +{...}: { + programs.alacritty = { + enable = true; + settings.env.WINIT_X11_SCALE_FACTOR = "1"; # workaround for scaling in X11 + }; +} diff --git a/users/guanranwang/home-manager/applications/amberol/default.nix b/users/guanranwang/home-manager/applications/amberol/default.nix new file mode 100644 index 0000000..ce18f08 --- /dev/null +++ b/users/guanranwang/home-manager/applications/amberol/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.amberol]; +} diff --git a/users/guanranwang/home-manager/modules/shell/bash.nix b/users/guanranwang/home-manager/applications/bash/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/shell/bash.nix rename to users/guanranwang/home-manager/applications/bash/default.nix diff --git a/users/guanranwang/home-manager/modules/terms/experimental/blackbox.nix b/users/guanranwang/home-manager/applications/blackbox-terminal/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/terms/experimental/blackbox.nix rename to users/guanranwang/home-manager/applications/blackbox-terminal/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/bspwm.nix b/users/guanranwang/home-manager/applications/bspwm/default.nix similarity index 89% rename from users/guanranwang/home-manager/modules/wm/bspwm.nix rename to users/guanranwang/home-manager/applications/bspwm/default.nix index 122db99..b9c6289 100644 --- a/users/guanranwang/home-manager/modules/wm/bspwm.nix +++ b/users/guanranwang/home-manager/applications/bspwm/default.nix @@ -1,11 +1,11 @@ {pkgs, ...}: { imports = [ - ./components/dunst - ./components/picom.nix - ./components/polybar.nix - ./components/rofi - ./components/sxhkd.nix - ./components/udiskie.nix + ../dunst + ../picom + ../polybar + ../rofi + ../sxhkd + ../udiskie ]; home.packages = with pkgs; [flameshot feh]; diff --git a/users/guanranwang/home-manager/applications/cava/default.nix b/users/guanranwang/home-manager/applications/cava/default.nix new file mode 100644 index 0000000..21c3d2e --- /dev/null +++ b/users/guanranwang/home-manager/applications/cava/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.cava]; +} diff --git a/users/guanranwang/home-manager/modules/browser/chromium.nix b/users/guanranwang/home-manager/applications/chromium/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/browser/chromium.nix rename to users/guanranwang/home-manager/applications/chromium/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/default.nix b/users/guanranwang/home-manager/applications/dunst/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/default.nix rename to users/guanranwang/home-manager/applications/dunst/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/battery-alert.png b/users/guanranwang/home-manager/applications/dunst/dunst/battery-alert.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/battery-alert.png rename to users/guanranwang/home-manager/applications/dunst/dunst/battery-alert.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/battery-charging.png b/users/guanranwang/home-manager/applications/dunst/dunst/battery-charging.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/battery-charging.png rename to users/guanranwang/home-manager/applications/dunst/dunst/battery-charging.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/battery.png b/users/guanranwang/home-manager/applications/dunst/dunst/battery.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/battery.png rename to users/guanranwang/home-manager/applications/dunst/dunst/battery.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-high.png b/users/guanranwang/home-manager/applications/dunst/dunst/volume-high.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-high.png rename to users/guanranwang/home-manager/applications/dunst/dunst/volume-high.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-minus.png b/users/guanranwang/home-manager/applications/dunst/dunst/volume-minus.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-minus.png rename to users/guanranwang/home-manager/applications/dunst/dunst/volume-minus.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-mute.png b/users/guanranwang/home-manager/applications/dunst/dunst/volume-mute.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-mute.png rename to users/guanranwang/home-manager/applications/dunst/dunst/volume-mute.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-off.png b/users/guanranwang/home-manager/applications/dunst/dunst/volume-off.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-off.png rename to users/guanranwang/home-manager/applications/dunst/dunst/volume-off.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-plus.png b/users/guanranwang/home-manager/applications/dunst/dunst/volume-plus.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-plus.png rename to users/guanranwang/home-manager/applications/dunst/dunst/volume-plus.png diff --git a/users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-source.png b/users/guanranwang/home-manager/applications/dunst/dunst/volume-source.png similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/dunst/dunst/volume-source.png rename to users/guanranwang/home-manager/applications/dunst/dunst/volume-source.png diff --git a/users/guanranwang/home-manager/applications/easyeffects/default.nix b/users/guanranwang/home-manager/applications/easyeffects/default.nix new file mode 100644 index 0000000..431a02b --- /dev/null +++ b/users/guanranwang/home-manager/applications/easyeffects/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.easyeffects]; +} diff --git a/users/guanranwang/home-manager/modules/browser/firefox.nix b/users/guanranwang/home-manager/applications/firefox/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/browser/firefox.nix rename to users/guanranwang/home-manager/applications/firefox/default.nix diff --git a/users/guanranwang/home-manager/modules/shell/fish.nix b/users/guanranwang/home-manager/applications/fish/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/shell/fish.nix rename to users/guanranwang/home-manager/applications/fish/default.nix diff --git a/users/guanranwang/home-manager/modules/terms/foot.nix b/users/guanranwang/home-manager/applications/foot/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/terms/foot.nix rename to users/guanranwang/home-manager/applications/foot/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/gnome.nix b/users/guanranwang/home-manager/applications/gnome/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/gnome.nix rename to users/guanranwang/home-manager/applications/gnome/default.nix diff --git a/users/guanranwang/home-manager/modules/lang/go.nix b/users/guanranwang/home-manager/applications/go/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/lang/go.nix rename to users/guanranwang/home-manager/applications/go/default.nix diff --git a/users/guanranwang/home-manager/modules/editor/helix.nix b/users/guanranwang/home-manager/applications/helix/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/editor/helix.nix rename to users/guanranwang/home-manager/applications/helix/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/default.nix b/users/guanranwang/home-manager/applications/hyprland/default.nix similarity index 78% rename from users/guanranwang/home-manager/modules/wm/hyprland/default.nix rename to users/guanranwang/home-manager/applications/hyprland/default.nix index cfc55b3..38019dd 100644 --- a/users/guanranwang/home-manager/modules/wm/hyprland/default.nix +++ b/users/guanranwang/home-manager/applications/hyprland/default.nix @@ -1,16 +1,16 @@ { - inputs, + #inputs, pkgs, ... }: { imports = [ - ../components/dunst - ../components/rofi - ../components/swayidle.nix - ../components/swaylock.nix - ../components/swww.nix - ../components/udiskie.nix - ../components/waybar.nix + ../dunst + ../rofi + ../swayidle + ../swaylock + ../swww + ../udiskie + ../waybar ]; home.packages = with pkgs; [swww]; diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/autostart.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/autostart.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/autostart.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/autostart.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/env.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/env.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/env.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/env.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/hyprpaper.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/hyprpaper.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/hyprpaper.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/hyprpaper.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/keybinds.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/keybinds.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/keybinds.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/keybinds.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/main.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/main.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/main.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/main.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/plugins.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/plugins.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/plugins.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/plugins.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/colors.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/themes/colors.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/colors.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/themes/colors.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/frappe.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/themes/frappe.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/frappe.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/themes/frappe.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/latte.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/themes/latte.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/latte.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/themes/latte.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/macchiato.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/themes/macchiato.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/macchiato.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/themes/macchiato.conf diff --git a/users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/mocha.conf b/users/guanranwang/home-manager/applications/hyprland/hypr/themes/mocha.conf similarity index 100% rename from users/guanranwang/home-manager/modules/wm/hyprland/hypr/themes/mocha.conf rename to users/guanranwang/home-manager/applications/hyprland/hypr/themes/mocha.conf diff --git a/users/guanranwang/home-manager/modules/misc/irssi.nix b/users/guanranwang/home-manager/applications/irssi/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/misc/irssi.nix rename to users/guanranwang/home-manager/applications/irssi/default.nix diff --git a/users/guanranwang/home-manager/applications/kitty/default.nix b/users/guanranwang/home-manager/applications/kitty/default.nix new file mode 100644 index 0000000..a2f392e --- /dev/null +++ b/users/guanranwang/home-manager/applications/kitty/default.nix @@ -0,0 +1,6 @@ +{...}: { + programs.kitty = { + enable = true; + settings.confirm_os_window_close = 0; + }; +} diff --git a/users/guanranwang/home-manager/modules/browser/librewolf.nix b/users/guanranwang/home-manager/applications/librewolf/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/browser/librewolf.nix rename to users/guanranwang/home-manager/applications/librewolf/default.nix diff --git a/users/guanranwang/home-manager/applications/loupe/default.nix b/users/guanranwang/home-manager/applications/loupe/default.nix new file mode 100644 index 0000000..2f702e1 --- /dev/null +++ b/users/guanranwang/home-manager/applications/loupe/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.loupe]; +} diff --git a/users/guanranwang/home-manager/applications/mousai/default.nix b/users/guanranwang/home-manager/applications/mousai/default.nix new file mode 100644 index 0000000..6159534 --- /dev/null +++ b/users/guanranwang/home-manager/applications/mousai/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.mousai]; +} diff --git a/users/guanranwang/home-manager/applications/mpv/default.nix b/users/guanranwang/home-manager/applications/mpv/default.nix new file mode 100644 index 0000000..fc16fb4 --- /dev/null +++ b/users/guanranwang/home-manager/applications/mpv/default.nix @@ -0,0 +1,3 @@ +{...}: { + programs.mpv.enable = true; +} diff --git a/users/guanranwang/home-manager/modules/misc/mumble.nix b/users/guanranwang/home-manager/applications/mumble/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/misc/mumble.nix rename to users/guanranwang/home-manager/applications/mumble/default.nix diff --git a/users/guanranwang/home-manager/modules/editor/neovim.nix b/users/guanranwang/home-manager/applications/neovim/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/editor/neovim.nix rename to users/guanranwang/home-manager/applications/neovim/default.nix diff --git a/users/guanranwang/home-manager/applications/netease-cloud-music-gtk/default.nix b/users/guanranwang/home-manager/applications/netease-cloud-music-gtk/default.nix new file mode 100644 index 0000000..7934a7f --- /dev/null +++ b/users/guanranwang/home-manager/applications/netease-cloud-music-gtk/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.netease-cloud-music-gtk]; +} diff --git a/users/guanranwang/home-manager/modules/lang/nix.nix b/users/guanranwang/home-manager/applications/nix/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/lang/nix.nix rename to users/guanranwang/home-manager/applications/nix/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/picom.nix b/users/guanranwang/home-manager/applications/picom/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/picom.nix rename to users/guanranwang/home-manager/applications/picom/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/polybar.nix b/users/guanranwang/home-manager/applications/polybar/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/polybar.nix rename to users/guanranwang/home-manager/applications/polybar/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/rofi/default.nix b/users/guanranwang/home-manager/applications/rofi/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/rofi/default.nix rename to users/guanranwang/home-manager/applications/rofi/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/rofi/rofi/colors.rasi b/users/guanranwang/home-manager/applications/rofi/rofi/colors.rasi similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/rofi/rofi/colors.rasi rename to users/guanranwang/home-manager/applications/rofi/rofi/colors.rasi diff --git a/users/guanranwang/home-manager/modules/wm/components/rofi/rofi/config.rasi b/users/guanranwang/home-manager/applications/rofi/rofi/config.rasi similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/rofi/rofi/config.rasi rename to users/guanranwang/home-manager/applications/rofi/rofi/config.rasi diff --git a/users/guanranwang/home-manager/profiles/media/nixos/spicetify.nix b/users/guanranwang/home-manager/applications/spotify/default.nix similarity index 66% rename from users/guanranwang/home-manager/profiles/media/nixos/spicetify.nix rename to users/guanranwang/home-manager/applications/spotify/default.nix index a8c7645..b8d3bf4 100644 --- a/users/guanranwang/home-manager/profiles/media/nixos/spicetify.nix +++ b/users/guanranwang/home-manager/applications/spotify/default.nix @@ -1,17 +1,10 @@ { pkgs, - lib, inputs, ... }: let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default; in { - # allow spotify to be installed if you don't have unfree enabled already - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "spotify" - ]; - # import the flake's module for your system imports = [inputs.spicetify-nix.homeManagerModule]; diff --git a/users/guanranwang/home-manager/modules/wm/sway.nix b/users/guanranwang/home-manager/applications/sway/default.nix similarity index 97% rename from users/guanranwang/home-manager/modules/wm/sway.nix rename to users/guanranwang/home-manager/applications/sway/default.nix index 39995b5..4aca887 100644 --- a/users/guanranwang/home-manager/modules/wm/sway.nix +++ b/users/guanranwang/home-manager/applications/sway/default.nix @@ -5,12 +5,12 @@ ... }: { imports = [ - ./components/dunst - ./components/rofi - ./components/swayidle.nix - ./components/swaylock.nix - ./components/udiskie.nix - ./components/waybar.nix + ../dunst + ../rofi + ../swayidle + ../swaylock + ../udiskie + ../waybar ]; # https://wiki.archlinux.org/title/Fish#Start_X_at_login diff --git a/users/guanranwang/home-manager/modules/wm/components/swayidle.nix b/users/guanranwang/home-manager/applications/swayidle/default.nix similarity index 97% rename from users/guanranwang/home-manager/modules/wm/components/swayidle.nix rename to users/guanranwang/home-manager/applications/swayidle/default.nix index bed2035..ed4285d 100644 --- a/users/guanranwang/home-manager/modules/wm/components/swayidle.nix +++ b/users/guanranwang/home-manager/applications/swayidle/default.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { imports = [ - ./swaylock.nix + ../swaylock ]; services = { diff --git a/users/guanranwang/home-manager/modules/wm/components/swaylock.nix b/users/guanranwang/home-manager/applications/swaylock/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/swaylock.nix rename to users/guanranwang/home-manager/applications/swaylock/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/sxhkd.nix b/users/guanranwang/home-manager/applications/sxhkd/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/sxhkd.nix rename to users/guanranwang/home-manager/applications/sxhkd/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/udiskie.nix b/users/guanranwang/home-manager/applications/udiskie/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/udiskie.nix rename to users/guanranwang/home-manager/applications/udiskie/default.nix diff --git a/users/guanranwang/home-manager/modules/editor/vscode.nix b/users/guanranwang/home-manager/applications/vscode/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/editor/vscode.nix rename to users/guanranwang/home-manager/applications/vscode/default.nix diff --git a/users/guanranwang/home-manager/modules/wm/components/waybar.nix b/users/guanranwang/home-manager/applications/waybar/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/wm/components/waybar.nix rename to users/guanranwang/home-manager/applications/waybar/default.nix diff --git a/users/guanranwang/home-manager/modules/terms/experimental/wezterm.nix b/users/guanranwang/home-manager/applications/wezterm/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/terms/experimental/wezterm.nix rename to users/guanranwang/home-manager/applications/wezterm/default.nix diff --git a/users/guanranwang/home-manager/profiles/media/nixos/default.nix b/users/guanranwang/home-manager/applications/yesplaymusic/yesplaymusic.nix similarity index 100% rename from users/guanranwang/home-manager/profiles/media/nixos/default.nix rename to users/guanranwang/home-manager/applications/yesplaymusic/yesplaymusic.nix diff --git a/users/guanranwang/home-manager/modules/shell/zsh.nix b/users/guanranwang/home-manager/applications/zsh/default.nix similarity index 100% rename from users/guanranwang/home-manager/modules/shell/zsh.nix rename to users/guanranwang/home-manager/applications/zsh/default.nix diff --git a/users/guanranwang/home-manager/default.nix b/users/guanranwang/home-manager/default.nix index 8fba198..bd167fd 100644 --- a/users/guanranwang/home-manager/default.nix +++ b/users/guanranwang/home-manager/default.nix @@ -25,6 +25,6 @@ programs.home-manager.enable = true; imports = [ - ./actual-modules + ./modules ]; } diff --git a/users/guanranwang/home-manager/actual-modules/color-scheme.nix b/users/guanranwang/home-manager/modules/color-scheme.nix similarity index 100% rename from users/guanranwang/home-manager/actual-modules/color-scheme.nix rename to users/guanranwang/home-manager/modules/color-scheme.nix diff --git a/users/guanranwang/home-manager/actual-modules/default.nix b/users/guanranwang/home-manager/modules/default.nix similarity index 100% rename from users/guanranwang/home-manager/actual-modules/default.nix rename to users/guanranwang/home-manager/modules/default.nix diff --git a/users/guanranwang/home-manager/modules/terminal.nix b/users/guanranwang/home-manager/modules/terminal.nix new file mode 100644 index 0000000..fad12cd --- /dev/null +++ b/users/guanranwang/home-manager/modules/terminal.nix @@ -0,0 +1,86 @@ +{ + lib, + config, + pkgs, + ... +}: let + cfg = config.myFlake.home-manager.terminal; +in { + # 3 terminals, one module. + # -- The Orange Box (wtf) + + # FAQ (for future myself): + # + # - Q: font? + # A: use fontconfig. + # + # - Q: WezTerm? + # A: - I don't use it. + # - I don't know Lua. + # - extraConfig is probably not enough if you want customize it yourself. + # + # - Q: which terminal should I use? + # A: - Alacritty - rusty + # - Foot - fast + # - Kitty - feature rich + # + # - Q: why does kitty's font look bold + # A: I dont know, might be related to this: https://sw.kovidgoyal.net/kitty/conf/#opt-kitty.text_composition_strategy + + options = { + myFlake.home-manager.terminal = { + cursorStyle = lib.mkOption { + type = lib.types.enum ["block" "beam" "underline"]; + default = "beam"; + example = "block"; + description = "Select desired terminal cursor style."; + }; + + fontSize = lib.mkOption { + type = lib.types.int; + default = 12; + example = 8; + description = "Select desired terminal font size."; + }; + + padding = lib.mkOption { + type = lib.types.int; + default = 12; + example = 8; + description = "Select desired terminal padding size (in px)."; + }; + }; + }; + + config = { + programs = { + alacritty.settings = { + import = + lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") + ["${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml"]; + cursor.style = cfg.cursorStyle; + font.size = cfg.fontSize; + window.padding.x = cfg.padding; + window.padding.y = cfg.padding; + }; + + kitty.settings = { + include = + lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") + "${pkgs.vimPlugins.tokyonight-nvim}/extras/kitty/tokyonight_night.conf"; + cursor_shape = cfg.cursorStyle; + font_size = cfg.fontSize; + window_padding_width = builtins.toString (cfg.padding * (3.0 / 4.0)); # px -> pt + }; + + foot.settings = { + main.include = + lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") + "${pkgs.vimPlugins.tokyonight-nvim}/extras/foot/tokyonight_night.ini"; + cursor.style = cfg.cursorStyle; + main.font = "monospace:size=${builtins.toString cfg.fontSize}"; + main.pad = "${builtins.toString cfg.padding}x${builtins.toString cfg.padding}"; + }; + }; + }; +} diff --git a/users/guanranwang/home-manager/modules/terms/alacritty.nix b/users/guanranwang/home-manager/modules/terms/alacritty.nix deleted file mode 100644 index 69cb350..0000000 --- a/users/guanranwang/home-manager/modules/terms/alacritty.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: let - cfg = config.myFlake.home-manager.terminal; -in { - programs.alacritty = { - enable = true; - settings = { - import = - lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") - ["${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml"]; - cursor.style = cfg.cursorStyle; - font.size = cfg.fontSize; - window.padding.x = cfg.padding; - window.padding.y = cfg.padding; - - #env.WINIT_X11_SCALE_FACTOR = "1"; # workaround for.. something? - }; - }; -} diff --git a/users/guanranwang/home-manager/modules/terms/kitty.nix b/users/guanranwang/home-manager/modules/terms/kitty.nix deleted file mode 100644 index d179de3..0000000 --- a/users/guanranwang/home-manager/modules/terms/kitty.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: let - cfg = config.myFlake.home-manager.terminal; -in { - programs.kitty = { - enable = true; - settings = { - include = - lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") - "${pkgs.vimPlugins.tokyonight-nvim}/extras/kitty/tokyonight_night.conf"; - cursor_shape = cfg.cursorStyle; - font_size = cfg.fontSize; - window_padding_width = builtins.toString (cfg.padding * (3.0 / 4.0)); # px -> pt - - confirm_os_window_close = 0; - }; - }; -} diff --git a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix b/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix index e8ac682..0507bb6 100644 --- a/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix +++ b/users/guanranwang/home-manager/profiles/graphical-stuff/nixos/default.nix @@ -1,12 +1,48 @@ {...}: { - imports = [ - ./fonts - ./scripts - ./wallpapers + imports = + [ + ./fonts + ./scripts + ./wallpapers - ./packages.nix - ./input-method.nix - ./theme.nix - ./xdg-mime.nix - ]; + ./packages.nix + ./input-method.nix + ./theme.nix + ./xdg-mime.nix + ] + ++ map (n: ../../../../home-manager/applications/${n}) [ + # Terminal + "alacritty" + + # Shell + "fish" + "bash" + + # Editor + "helix" + "neovim" + "vscode" + + # Browser + "chromium" + "librewolf" + + # Language + "nix" + "go" + + # Media + "loupe" + "mpv" + "spotify" + "amberol" + "mousai" + + # WM + "sway" + + # Misc + "irssi" + "mumble" + ]; } diff --git a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix index 00fed0e..3b60511 100644 --- a/users/guanranwang/nixos/profiles/device-type/desktop/default.nix +++ b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix @@ -20,20 +20,6 @@ home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [ "profiles/command-line/nixos/fancy-stuff.nix" "profiles/graphical-stuff/nixos" - "profiles/media/nixos" - "modules/terms/alacritty.nix" - "modules/shell/fish.nix" - "modules/shell/bash.nix" - "modules/editor/helix.nix" - "modules/editor/neovim.nix" - "modules/editor/vscode.nix" - "modules/browser/chromium.nix" - "modules/browser/librewolf.nix" - "modules/lang/nix.nix" - "modules/lang/go.nix" - "modules/wm/sway.nix" - "modules/misc/irssi.nix" - "modules/misc/mumble.nix" ]; fonts.enableDefaultPackages = false;