diff --git a/home/default.nix b/home/default.nix index ea2911a..ddd31bf 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,6 +1,5 @@ { xin = { calcite = import ./xin/calcite.nix; - gold = import ./xin/gold; }; } diff --git a/home/xin/raspite/default.nix b/home/xin/raspite/default.nix new file mode 100644 index 0000000..888383c --- /dev/null +++ b/home/xin/raspite/default.nix @@ -0,0 +1,25 @@ +{ config, pkgs, ... }: +{ + imports = [ ../common ]; + + home.username = "xin"; + home.homeDirectory = "/home/xin"; + home.stateVersion = "23.05"; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + + accounts.email.accounts.gmail = { + primary = true; + address = "lixinyang411@gmail.com"; + flavor = "gmail.com"; + }; + + accounts.email.accounts.whu = { + address = "lixinyang411@whu.edu.cn"; + }; + + accounts.email.accounts.foxmail = { + address = "lixinyang411@foxmail.com"; + }; +} diff --git a/modules/home-manager/gui/themes.nix b/modules/home-manager/gui/themes.nix index 6278692..ad0de1c 100644 --- a/modules/home-manager/gui/themes.nix +++ b/modules/home-manager/gui/themes.nix @@ -13,10 +13,6 @@ name = "Catppuccin-GTK-Dark"; package = pkgs.magnetic-catppuccin-gtk; }; - iconTheme = { - name = "Qogir"; - package = pkgs.qogir-icon-theme; - }; gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; }; }; diff --git a/modules/home-manager/gui/waybar.nix b/modules/home-manager/gui/waybar.nix index 66b9ecb..3890a00 100644 --- a/modules/home-manager/gui/waybar.nix +++ b/modules/home-manager/gui/waybar.nix @@ -44,6 +44,8 @@ in modules-right = [ "network#speed" "custom/separator" + "network#if" + "custom/separator" "pulseaudio" "custom/separator" "memory" @@ -119,6 +121,22 @@ in format = " {percentage}%"; }; + "network#if" = { + format = "{ifname}"; + format-disconnected = "󰌙"; + format-ethernet = "󰌘"; + format-linked = "{ifname} (No IP) 󰈁"; + format-wifi = "{icon}"; + format-icons = [ + "󰤯" + "󰤟" + "󰤢" + "󰤥" + "󰤨" + ]; + interval = 10; + }; + "network#speed" = { format = "{ifname}"; format-disconnected = "󰌙";