diff --git a/home/redyf/apps/misc/default.nix b/home/redyf/apps/misc/default.nix index 02a344a5..55900865 100644 --- a/home/redyf/apps/misc/default.nix +++ b/home/redyf/apps/misc/default.nix @@ -10,20 +10,15 @@ # grapejuice # libpulseaudio - # Notetaking - obsidian - # Other stuff ollama playerctl - # spotify # brave # Rice # cmatrix # Extra utils - vlc mpv glib unzip # Unzip files using the terminal diff --git a/home/redyf/apps/raspberry/default.nix b/home/redyf/apps/raspberry/default.nix new file mode 100644 index 00000000..3ff0f272 --- /dev/null +++ b/home/redyf/apps/raspberry/default.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + rpi-imager + realvnc-vnc-viewer + ]; +} diff --git a/home/redyf/apps/spotify/default.nix b/home/redyf/apps/spotify/default.nix new file mode 100644 index 00000000..b363e084 --- /dev/null +++ b/home/redyf/apps/spotify/default.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + spotify + ]; +} diff --git a/home/redyf/cli-apps/starship/macchiato.nix b/home/redyf/cli-apps/starship/macchiato.nix index 84fa0450..5e3138c6 100644 --- a/home/redyf/cli-apps/starship/macchiato.nix +++ b/home/redyf/cli-apps/starship/macchiato.nix @@ -15,7 +15,7 @@ in vicmd_symbol = "[](#ecd3a0)"; # format = "$symbol[ ](bold #b4befe) "; # format = "$symbol[λ ](bold #b4befe) "; - format = "$symbol[>](#b4befe) "; + format = "$symbol[󰅂](#b4befe) "; }; format = '' diff --git a/home/redyf/cli-apps/starship/oxocarbon.nix b/home/redyf/cli-apps/starship/oxocarbon.nix index f54ea161..cbeebeeb 100644 --- a/home/redyf/cli-apps/starship/oxocarbon.nix +++ b/home/redyf/cli-apps/starship/oxocarbon.nix @@ -29,6 +29,12 @@ style = "bold bg:none fg:#393939"; }; + git_branch = { + format = "on [$symbol$branch(:$remote_branch)]($style) "; + symbol = " "; + style = "bold purple"; + }; + time = { disabled = false; use_12hr = true; diff --git a/home/redyf/cli-apps/tmux/catppuccin-custom.conf b/home/redyf/cli-apps/tmux/catppuccin-custom.conf deleted file mode 100644 index b6e3e965..00000000 --- a/home/redyf/cli-apps/tmux/catppuccin-custom.conf +++ /dev/null @@ -1,34 +0,0 @@ -# Enable catppuccin theme -set -g @catppuccin_flavour 'macchiato' - -set -g @catppuccin_window_status_enable "yes" -set -g @catppuccin_window_status_icon_enable "yes" - -set -g @catppuccin_icon_window_zoom " " -set -g @catppuccin_icon_window_last "null" -set -g @catppuccin_icon_window_current "null" -set -g @catppuccin_icon_window_mark "null" -set -g @catppuccin_icon_window_silent "null" -set -g @catppuccin_icon_window_activity "null" -set -g @catppuccin_icon_window_bell "null" - -set -g @catppuccin_window_middle_separator "null" - -set -g @catppuccin_window_default_background "#cad3f5" -set -g @catppuccin_window_default_color "#24273a" -set -g @catppuccin_window_default_fill "all" -set -g @catppuccin_window_default_text "#W" - -set -g @catppuccin_window_current_background "#363a4f" -set -g @catppuccin_window_current_color "#c6a0f6" -set -g @catppuccin_window_current_fill "number" -set -g @catppuccin_window_current_text "#W" - -set -g @catppuccin_status_modules_right "directory session" -set -g @catppuccin_maximized_text "null" -set -g @catppuccin_status_left_separator "█" -set -g @catppuccin_status_right_separator "█" -set -g @catppuccin_directory_color "#8aadf4" - -# Set to better match the catppuccin theme -set -g pane-active-border-style fg="#c6a0f6" diff --git a/home/redyf/cli-apps/tmux/default.nix b/home/redyf/cli-apps/tmux/default.nix index c093160b..91a46a18 100644 --- a/home/redyf/cli-apps/tmux/default.nix +++ b/home/redyf/cli-apps/tmux/default.nix @@ -9,28 +9,6 @@ sha256 = "1hjav791xr5jx0swx4njfxlhhhx599ddan3bgaw1abwwfy1w1ji3"; }; }; - power-theme = pkgs.tmuxPlugins.mkTmuxPlugin { - pluginName = "power"; - rtpFilePath = "tmux-power.tmux"; - version = "unstable-2024-05-12"; - src = pkgs.fetchFromGitHub { - owner = "wfxr"; - repo = "tmux-power"; - rev = "16bbde801378a70512059541d104c5ae35be32b9"; - hash = "sha256-IyYQyIONMnVBwhhcI3anOPxKpv2TfI2KZgJ5o5JtZ8I="; - }; - }; - tokyo-night = pkgs.tmuxPlugins.mkTmuxPlugin { - pluginName = "tokyo-night-tmux"; - rtpFilePath = "tokyo-night.tmux"; - version = "1.5.3"; - src = pkgs.fetchFromGitHub { - owner = "janoamaral"; - repo = "tokyo-night-tmux"; - rev = "d34f1487b4a644b13d8b2e9a2ee854ae62cc8d0e"; - hash = "sha256-3rMYYzzSS2jaAMLjcQoKreE0oo4VWF9dZgDtABCUOtY="; - }; - }; in { programs.tmux = { enable = true; @@ -52,10 +30,10 @@ in { # plugin = tokyo-night; # extraConfig = builtins.readFile ./tokyo-night-tmux.conf; # } - { - plugin = power-theme; - extraConfig = builtins.readFile ./power-theme.conf; - } + # { + # plugin = power-theme; + # extraConfig = builtins.readFile ./power-theme.conf; + # } # { # plugin = catppuccin; # extraConfig = builtins.readFile ./catppuccin.conf; @@ -102,87 +80,13 @@ in { # Status line #-------------------------------------------------------------------------- - # TokyoNight colors for Tmux - # set -g mode-style "fg=#7aa2f7,bg=#3b4261" - # - # set -g message-style "fg=#7aa2f7,bg=#3b4261" - # set -g message-command-style "fg=#7aa2f7,bg=#3b4261" - # - # set -g pane-border-style "fg=#3b4261" - # set -g pane-active-border-style "fg=#7aa2f7" - # - # set -g status "on" - # set -g status-justify "left" - # - # set -g status-style "fg=#7aa2f7,bg=#1e1e2e" - # - # set -g status-left-length "100" - # set -g status-right-length "100" - # - # set -g status-left-style NONE - # set -g status-right-style NONE - # - # set -g status-left "#[fg=#1d202f,bg=#1e1e2e,bold] #S #[fg=#7aa2f7,bg=#1e1e2e,nobold,nounderscore,noitalics]" - # set -g status-right "#[fg=#1f2335,bg=#1e1e2e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1e1e2e] #{prefix_highlight} #[fg=#3b4261,bg=#1e1e2e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %I:%M %p #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h " - # if-shell '[ "$(tmux show-option -gqv "clock-mode-style")" == "24" ]' { - # set -g status-right "#[fg=#1f2335,bg=#1e1e2e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1e1e2e] #{prefix_highlight} #[fg=#3b4261,bg=#1e1e2e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1d202f,bg=#7aa2f7,bold] #h " - # } - # - # setw -g window-status-activity-style "underscore,fg=#a9b1d6,bg=#1e1e2e" - # setw -g window-status-separator "" - # setw -g window-status-style "NONE,fg=#a9b1d6,bg=#1e1e2e" - # setw -g window-status-format "#[fg=#1f2335,bg=#1e1e2e,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#1f2335,bg=#1e1e2e,nobold,nounderscore,noitalics]" - # setw -g window-status-current-format "#[fg=#1f2335,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261,bold] #I  #W #F #[fg=#3b4261,bg=#1e1e2e,nobold,nounderscore,noitalics]" - - # tmux-plugins/tmux-prefix-highlight support - # set -g @prefix_highlight_output_prefix "#[fg=#e0af68]#[bg=#1e1e2e]#[fg=#1f2335]#[bg=#e0af68]" - # set -g @prefix_highlight_output_suffix "" + # Adding Git repo and branch to Tmux status line + set -g status-right '#(cd #{pane_current_path}; git rev-parse --abbrev-ref HEAD)' + set -g status-interval 1 # Enable transparent tmux bar set -g status-bg default set -g status-style bg=default - - # Status line customisation - # set-option -g status-left-length 100 - # set-option -g status-right-length 100 - # set-option -g status-left " #{session_name} " - # set-option -g status-right " " - # - # set-option -g status-style "fg=#828bb1 bg=default" # default will set the background to transparent - - # set-option -g window-status-format "#{window_index}:#{window_name}#{window_flags} " # window_name -> pane_current_command - # set-option -g window-status-current-format "#{window_index}:#{window_name}#{window_flags} " - # set-option -g window-status-current-style "fg=#B4BEFE" - # set-option -g window-status-activity-style none - - # clock mode - # setw -g clock-mode-colour colour1 - - # copy mode - # setw -g mode-style "fg=colour1 bg=colour18 bold" - - # pane borders - # set -g pane-border-style "fg=colour1" - # set -g pane-active-border-style "fg=colour3" - - # statusbar - # set -g status-justify left - # set -g status-style "fg=colour1" - # set -g status-left "" - # set -g status-right "%Y-%m-%d %H:%M " - # set -g status-right-length 50 - # set -g status-left-length 10 - # - # setw -g window-status-current-style "fg=colour0 bg=colour1 bold" - # setw -g window-status-current-format " #I #W #F " - # - # setw -g window-status-style "fg=colour1 dim" - # setw -g window-status-format " #I #[fg=colour7]#W #[fg=colour1]#F " - # - # setw -g window-status-bell-style "fg=colour2 bg=colour1 bold" - # - # # messages - # set -g message-style "fg=colour2 bg=colour0 bold" ''; }; home.packages = with pkgs; [ diff --git a/home/redyf/cli-apps/tmux/power-theme.conf b/home/redyf/cli-apps/tmux/power-theme.conf deleted file mode 100644 index 4de09013..00000000 --- a/home/redyf/cli-apps/tmux/power-theme.conf +++ /dev/null @@ -1,33 +0,0 @@ -#set -g @tmux_power_theme "gold" -#set -g @tmux_power_theme "everforest" -#set -g @tmux_power_theme "moon" -#set -g @tmux_power_theme "coral" -#set -g @tmux_power_theme "snow" -#set -g @tmux_power_theme "forest" -#set -g @tmux_power_theme "violet" -#set -g @tmux_power_theme "redwine" -#set -g @tmux_power_theme "default" - -#You can define your favourite main color if you don"t like any of above. -set -g @tmux_power_theme "#FF7EB6" - -#You can change the date and time formats using strftime: -set -g @tmux_power_date_format "%F" -set -g @tmux_power_time_format "%T" - -#You can also customize the icons. As an example, the following configurations can generate the theme shown in the first screenshot: -#set -g @plugin "wfxr/tmux-power" -#set -g @plugin "wfxr/tmux-net-speed" -#set -g @tmux_power_theme "snow" -set -g @tmux_power_date_icon " " -set -g @tmux_power_time_icon " " -set -g @tmux_power_user_icon " " -set -g @tmux_power_session_icon " " -set -g @tmux_power_show_upload_speed false -set -g @tmux_power_show_download_speed false -set -g @tmux_power_show_web_reachable false -set -g @tmux_power_right_arrow_icon "" -set -g @tmux_power_left_arrow_icon "" -set -g @tmux_power_upload_speed_icon "󰕒" -set -g @tmux_power_download_speed_icon "󰇚" -set -g @tmux_power_prefix_highlight_pos "R" diff --git a/home/redyf/cli-apps/tmux/tokyo-night-tmux.conf b/home/redyf/cli-apps/tmux/tokyo-night-tmux.conf deleted file mode 100644 index bb62af20..00000000 --- a/home/redyf/cli-apps/tmux/tokyo-night-tmux.conf +++ /dev/null @@ -1,14 +0,0 @@ -set -g @tokyo-night-tmux_window_id_style "digital" -set -g @tokyo-night-tmux_pane_id_style "hsquare" -set -g @tokyo-night-tmux_zoom_id_style "dsquare" - -set -g @tokyo-night-tmux_show_datetime "0" -set -g @tokyo-night-tmux_date_format "MYD" -set -g @tokyo-night-tmux_time_format "12H" - -set -g @tokyo-night-tmux_show_music 0 - -set -g @tokyo-night-tmux_show_netspeed "0" -set -g @tokyo-night-tmux_netspeed_iface "wlan0" # Detected via default route -set -g @tokyo-night-tmux_netspeed_showip "1" # Display IPv4 address (default 0) -set -g @tokyo-night-tmux_netspeed_refresh "1" # Update interval in seconds (default 1) diff --git a/home/redyf/cli-apps/tmux/tokyonight.conf b/home/redyf/cli-apps/tmux/tokyonight.conf deleted file mode 100644 index cae8cbdb..00000000 --- a/home/redyf/cli-apps/tmux/tokyonight.conf +++ /dev/null @@ -1,36 +0,0 @@ -# TokyoNight colors for Tmux - -set -g mode-style "fg=#82aaff,bg=#3b4261" - -set -g message-style "fg=#82aaff,bg=#3b4261" -set -g message-command-style "fg=#82aaff,bg=#3b4261" - -set -g pane-border-style "fg=#3b4261" -set -g pane-active-border-style "fg=#82aaff" - -set -g status "on" -set -g status-justify "left" - -set -g status-style "fg=#82aaff,bg=#1e2030" - -set -g status-left-length "100" -set -g status-right-length "100" - -set -g status-left-style NONE -set -g status-right-style NONE - -set -g status-left "#[fg=#1b1d2b,bg=#82aaff,bold] #S #[fg=#82aaff,bg=#1e2030,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=#1e2030,bg=#1e2030,nobold,nounderscore,noitalics]#[fg=#82aaff,bg=#1e2030] #{prefix_highlight} #[fg=#3b4261,bg=#1e2030,nobold,nounderscore,noitalics]#[fg=#82aaff,bg=#3b4261] %Y-%m-%d  %I:%M %p #[fg=#82aaff,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1b1d2b,bg=#82aaff,bold] #h " -if-shell '[ "$(tmux show-option -gqv "clock-mode-style")" == "24" ]' { - set -g status-right "#[fg=#1e2030,bg=#1e2030,nobold,nounderscore,noitalics]#[fg=#82aaff,bg=#1e2030] #{prefix_highlight} #[fg=#3b4261,bg=#1e2030,nobold,nounderscore,noitalics]#[fg=#82aaff,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#82aaff,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1b1d2b,bg=#82aaff,bold] #h " -} - -setw -g window-status-activity-style "underscore,fg=#828bb8,bg=#1e2030" -setw -g window-status-separator "" -setw -g window-status-style "NONE,fg=#828bb8,bg=#1e2030" -setw -g window-status-format "#[fg=#1e2030,bg=#1e2030,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#1e2030,bg=#1e2030,nobold,nounderscore,noitalics]" -setw -g window-status-current-format "#[fg=#1e2030,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#82aaff,bg=#3b4261,bold] #I  #W #F #[fg=#3b4261,bg=#1e2030,nobold,nounderscore,noitalics]" - -# tmux-plugins/tmux-prefix-highlight support -set -g @prefix_highlight_output_prefix "#[fg=#ffc777]#[bg=#1e2030]#[fg=#1e2030]#[bg=#ffc777]" -set -g @prefix_highlight_output_suffix "" diff --git a/home/redyf/desktop/addons/kitty/default.nix b/home/redyf/desktop/addons/kitty/default.nix index 846088d4..0412d4ed 100644 --- a/home/redyf/desktop/addons/kitty/default.nix +++ b/home/redyf/desktop/addons/kitty/default.nix @@ -8,7 +8,6 @@ # theme = "Tokyo Night"; # theme = "Catppuccin-Mocha"; # font = { - # # name = "JetBrainsMono Nerd Font"; # name = "MonoLisa"; # package = pkgs.monolisa-script; # size = 11; diff --git a/home/redyf/desktop/default.nix b/home/redyf/desktop/default.nix index a88daf1f..6ef26e1b 100644 --- a/home/redyf/desktop/default.nix +++ b/home/redyf/desktop/default.nix @@ -3,6 +3,6 @@ _: { ./addons ./gtk ./hyprland - ./awesomewm.nix + # ./awesomewm.nix ]; } diff --git a/home/redyf/tools/git/default.nix b/home/redyf/tools/git/default.nix index 2f999ca4..98d1fd42 100644 --- a/home/redyf/tools/git/default.nix +++ b/home/redyf/tools/git/default.nix @@ -4,9 +4,24 @@ userName = "Redyf"; userEmail = "mateusalvespereira7@gmail.com"; extraConfig = { - init = {defaultBranch = "main";}; - core.editor = "nvim"; - pull.rebase = false; + core = { + editor = "nvim"; + }; + init = { + defaultBranch = "main"; + }; + branch = { + autoSetupRemote = true; + }; + fetch = { + prune = true; + }; + pull = { + ff = false; + commit = false; + rebase = true; + prune = true; + }; maintenance.repo = "/home/redyf/opensource/nixpkgs"; }; }; diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix index 7f6c5a8d..e3929c63 100644 --- a/hosts/redyf/configuration.nix +++ b/hosts/redyf/configuration.nix @@ -60,6 +60,11 @@ in { }; }; + zramSwap = { + enable = true; + memoryPercent = 50; + }; + environment = { variables = { EDITOR = "nvim";