diff --git a/apps/de/mako/config b/apps/de/mako/config index 5ac66b0..2ccf86e 100644 --- a/apps/de/mako/config +++ b/apps/de/mako/config @@ -2,7 +2,7 @@ max-visible=5 default-timeout=30000 background-color=#111111 border-color=#666666 -font=iosevka-lyte 11 +font=Iosevka 11 progress-color=source #33333388 # format="%s default-timeout=15000 diff --git a/apps/shell/fish/config.fish b/apps/shell/fish/config.fish index db11722..472c343 100755 --- a/apps/shell/fish/config.fish +++ b/apps/shell/fish/config.fish @@ -57,3 +57,7 @@ if has_command tmux && string match -v -q '*tmux*' $TERM && string match -v -q ' tmux start-server tmux attach -t default || tmux new -s default end + +if set -q $__HM_SESS_VARS_SOURCED + exec bash -c "source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh; exec fish" +end diff --git a/apps/shell/fish/paths.fish b/apps/shell/fish/paths.fish index 65e82a7..a4cd5fc 100755 --- a/apps/shell/fish/paths.fish +++ b/apps/shell/fish/paths.fish @@ -48,3 +48,8 @@ set -Ux TMUX_PLUGIN_MANAGER_PATH $XDG_CONFIG_HOME/tmux/plugins/ set -Ux NOTES_PATH $XDG_DOCUMENTS_DIR/notes set -Ux USER_LOGS_PATH $XDG_DOCUMENTS_DIR/logs set -Ux SCROTS_PATH $XDG_PICTURES_DIR/scrots + +if test -n "$NIX_PATH" + set NIX_PATH : +end +set -Ux NIX_PATH $HOME/.nix-defexpr/channels:$NIX_PATH diff --git a/env/nix/modules/de/sway.nix b/env/nix/modules/de/sway.nix index 38f5c41..bef89cd 100644 --- a/env/nix/modules/de/sway.nix +++ b/env/nix/modules/de/sway.nix @@ -4,13 +4,16 @@ let unstable = import { config = { allowUnfree = true; }; }; in { imports = [ ./graphics.nix ]; + fonts.fonts = with pkgs; [ + noto-fonts-emoji font-awesome + ]; programs = { sway = { enable = true; extraPackages = with pkgs; [ swaylock swayidle - unstable.mako + unstable.mako unstable.libnotify waybar wl-clipboard slurp diff --git a/env/nix/modules/users/daniel.nix b/env/nix/modules/users/daniel.nix index 571f1ea..85d1f28 100644 --- a/env/nix/modules/users/daniel.nix +++ b/env/nix/modules/users/daniel.nix @@ -1,4 +1,7 @@ { config, pkgs, ... }: { + fonts.fonts = with pkgs; [ + # helvetica # needed by zoom + ]; users.users.daniel = { isNormalUser = true; extraGroups = [ "wheel" "docker" ]; @@ -24,15 +27,22 @@ elixir postgresql # database htop # almost as good as bottom (btm) - google-cloud-sdk # gcloud - kubectl # kubernetes cli - awscli # aws cli unzip # needed by a handful of other utilities autoconf automake # autotools weechat # irc python39Full # python 3.9 jq # awk for json xfce.thunar xfce.thunar-archive-plugin xfce.thunar-volman # gui file manager + mpd # music player daemon + ncmpcpp # ncurses music player client + vlc # video player + + # TODO: work module? + google-cloud-sdk # gcloud + kubectl # kubernetes cli + awscli # aws cli + zoom # video conferencing + lastpass-cli # TODO: move this one to just laptop? brightnessctl # laptop screen brightness diff --git a/init.sh b/init.sh index 89c927d..3ac7ece 100755 --- a/init.sh +++ b/init.sh @@ -45,6 +45,12 @@ fix_dotfiles_origin() { git remote set-url origin "ssh://git@git.lyte.dev:2222/lytedev/dotfiles.git" } +setup_home_manager() { + nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager + nix-channel --update + nix-shell '' -A install +} + init_for_root() { clone_dotfiles "$root_home$dotfiles" symlink_nixos "$root_home$dotfiles/env/nix/"