diff --git a/flake.nix b/flake.nix index 08001e7..501acbf 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - #inputs.agenix.url = "github:ryantm/agenix"; + #inputs.agenix.url = "github:ryantm/agenix"; inputs.spicetify-nix.url = "github:the-argus/spicetify-nix"; inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/home/config-files/maxfetch.sh b/home/config-files/maxfetch.sh index e96c2a3..539e233 100755 --- a/home/config-files/maxfetch.sh +++ b/home/config-files/maxfetch.sh @@ -30,6 +30,8 @@ up=$(sed -e "s/ h/h/g" <<< ${up}) up=$(sed -e "s/ m/m/g" <<< ${up}) pkgs=$(nix-store --query --requisites /run/current-system | wc -l) +arch=$(nix-instantiate --eval -E 'builtins.currentSystem') +arch_sanitized=$(echo $arch | sed 's/^"//;s/"$//') fetch() { echo "${cyan}$(tput bold) _ ___ ____ ____ ${normal}$(tput sgr0)" @@ -45,6 +47,7 @@ fetch() { echo " │ ${blue} ${normal} uptime │ ${blue}${up}${normal} " echo " │ ${magenta} ${normal} shell │ ${magenta}$(echo ${SHELL##*/})${normal} " echo " │ ${red}󰏖 ${normal} pkgs │ ${red}${pkgs}${normal} " + echo " │ ${yellow} ${normal} arch │ ${yellow}${arch_sanitized}${normal} " echo " ├─────────────┤ " echo " │ ${_white} ${normal}colors │${_white}$unicode${normal}${red}$unicode${normal}${yellow}$unicode${normal}${green}$unicode${normal}${cyan}$unicode${normal}${blue}$unicode${normal}${magenta}$unicode${normal}${_black}$unicode${normal}" echo " ╰─────────────╯ " diff --git a/home/config-files/wezterm.lua b/home/config-files/wezterm.lua index 0b3270c..56577fd 100644 --- a/home/config-files/wezterm.lua +++ b/home/config-files/wezterm.lua @@ -122,7 +122,7 @@ config.enable_scroll_bar = false config.enable_tab_bar = true config.tab_bar_at_bottom = true config.hide_mouse_cursor_when_typing = false -config.enable_wayland = true +config.enable_wayland = false config.front_end = "OpenGL" config.warn_about_missing_glyphs = false return config diff --git a/home/modules/spicetify.nix b/home/modules/spicetify.nix index a7eaa9b..7d07e2e 100644 --- a/home/modules/spicetify.nix +++ b/home/modules/spicetify.nix @@ -1,20 +1,22 @@ -{ pkgs, lib, inputs, ... }: -let - spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default; -in { - imports = [ inputs.spicetify-nix.homeManagerModule ]; + pkgs, + lib, + inputs, + ... +}: let + spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default; +in { + imports = [inputs.spicetify-nix.homeManagerModule]; - programs.spicetify = - { - enable = true; - theme = spicePkgs.themes.catppuccin; - colorScheme = "mocha"; + programs.spicetify = { + enable = true; + theme = spicePkgs.themes.catppuccin; + colorScheme = "mocha"; - enabledExtensions = with spicePkgs.extensions; [ - fullAppDisplay - shuffle # shuffle+ (special characters are sanitized out of ext names) - # hidePodcasts - ]; - }; + enabledExtensions = with spicePkgs.extensions; [ + fullAppDisplay + shuffle # shuffle+ (special characters are sanitized out of ext names) + # hidePodcasts + ]; + }; }