diff --git a/flake.nix b/flake.nix index 757e07b..b9c10f2 100644 --- a/flake.nix +++ b/flake.nix @@ -92,7 +92,6 @@ ./modules/nix/darwin.nix ./modules/network/vpn/tailscale-darwin.nix - ./modules/users/nico.nix ./hosts/kita/conf.nix ]; }; diff --git a/modules/shell.nix b/modules/shell.nix index 2d0a94c..91cbc83 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -4,8 +4,6 @@ programs.zsh.enable = true; programs.zsh.promptInit = ( builtins.readFile ../stow/.zshrc ); - programs.fish.enable = true; - environment.systemPackages = with pkgs; [ neovim git @@ -28,8 +26,6 @@ ffmpeg imagemagick - ] ++ lib.optionals config.programs.fish.enable [ - pkgs.fishPlugins.pure ] ++ lib.optionals pkgs.stdenv.isLinux [ pkgs.trash-cli ]; programs.tmux.enable = true; diff --git a/modules/users/nico.nix b/modules/users/nico.nix index 317b762..bbe4da7 100644 --- a/modules/users/nico.nix +++ b/modules/users/nico.nix @@ -4,7 +4,7 @@ users.users.nico = { isNormalUser = true; extraGroups = [ "wheel" ]; - shell = pkgs.fish; + shell = pkgs.zsh; }; users.users.nico.openssh.authorizedKeys.keys = [ diff --git a/stow/.config/fish/config.fish b/stow/.config/fish/config.fish deleted file mode 100644 index e977293..0000000 --- a/stow/.config/fish/config.fish +++ /dev/null @@ -1,22 +0,0 @@ -if status is-interactive - # Commands to run in interactive sessions can go here - - # match prompt symbol to OS logo - if test -e /System - set pure_symbol_prompt "" - else - posix-source /etc/os-release - if [ "$ID" = "nixos" ] - set pure_symbol_prompt "" - else if [ "$ID" = "debian" ] - set pure_symbol_prompt "" - else if [ "$ID" = "fedora" ] - set pure_symbol_prompt "" - else if [ "$ID" = "arch" ] - set pure_symbol_prompt "󰣇" - end - end - - set pure_enable_single_line_prompt true - zoxide init fish | source -end diff --git a/stow/.config/fish/fish_variables b/stow/.config/fish/fish_variables deleted file mode 100644 index 1725016..0000000 --- a/stow/.config/fish/fish_variables +++ /dev/null @@ -1,97 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3800 -SETUVAR fish_color_autosuggestion:brblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:normal -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:yellow\x1e\x2di -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR pure_begin_prompt_with_current_directory:true -SETUVAR pure_check_for_new_release:false -SETUVAR pure_color_at_sign:pure_color_mute -SETUVAR pure_color_aws_profile:pure_color_warning -SETUVAR pure_color_command_duration:pure_color_warning -SETUVAR pure_color_current_directory:pure_color_primary -SETUVAR pure_color_danger:red -SETUVAR pure_color_dark:black -SETUVAR pure_color_git_branch:pure_color_mute -SETUVAR pure_color_git_dirty:pure_color_mute -SETUVAR pure_color_git_stash:pure_color_info -SETUVAR pure_color_git_unpulled_commits:pure_color_info -SETUVAR pure_color_git_unpushed_commits:pure_color_info -SETUVAR pure_color_hostname:pure_color_mute -SETUVAR pure_color_info:cyan -SETUVAR pure_color_jobs:pure_color_normal -SETUVAR pure_color_k8s_context:pure_color_success -SETUVAR pure_color_k8s_namespace:pure_color_primary -SETUVAR pure_color_k8s_prefix:pure_color_info -SETUVAR pure_color_light:white -SETUVAR pure_color_mute:brblack -SETUVAR pure_color_nixdevshell_prefix:pure_color_info -SETUVAR pure_color_nixdevshell_symbol:pure_color_mute -SETUVAR pure_color_normal:normal -SETUVAR pure_color_prefix_root_prompt:pure_color_danger -SETUVAR pure_color_primary:blue -SETUVAR pure_color_prompt_on_error:pure_color_danger -SETUVAR pure_color_prompt_on_success:pure_color_success -SETUVAR pure_color_success:magenta -SETUVAR pure_color_system_time:pure_color_mute -SETUVAR pure_color_username_normal:pure_color_mute -SETUVAR pure_color_username_root:pure_color_light -SETUVAR pure_color_virtualenv:pure_color_mute -SETUVAR pure_color_warning:yellow -SETUVAR pure_enable_aws_profile:true -SETUVAR pure_enable_container_detection:true -SETUVAR pure_enable_git:true -SETUVAR pure_enable_k8s:false -SETUVAR pure_enable_nixdevshell:false -SETUVAR pure_enable_single_line_prompt:true -SETUVAR pure_enable_virtualenv:true -SETUVAR pure_reverse_prompt_symbol_in_vimode:true -SETUVAR pure_separate_prompt_on_error:false -SETUVAR pure_shorten_prompt_current_directory_length:0 -SETUVAR pure_shorten_window_title_current_directory_length:0 -SETUVAR pure_show_jobs:false -SETUVAR pure_show_prefix_root_prompt:false -SETUVAR pure_show_subsecond_command_duration:false -SETUVAR pure_show_system_time:false -SETUVAR pure_symbol_aws_profile_prefix: -SETUVAR pure_symbol_container_prefix: -SETUVAR pure_symbol_git_dirty:\x2a -SETUVAR pure_symbol_git_stash:\u2261 -SETUVAR pure_symbol_git_unpulled_commits:\u21e3 -SETUVAR pure_symbol_git_unpushed_commits:\u21e1 -SETUVAR pure_symbol_k8s_prefix:\u2638 -SETUVAR pure_symbol_nixdevshell_prefix:\u2744\ufe0f -SETUVAR pure_symbol_prefix_root_prompt:\x23 -SETUVAR pure_symbol_prompt:\ue843 -SETUVAR pure_symbol_reverse_prompt:\u276e -SETUVAR pure_symbol_ssh_prefix: -SETUVAR pure_symbol_title_bar_separator:\x2d -SETUVAR pure_symbol_virtualenv_prefix: -SETUVAR pure_threshold_command_duration:5 -SETUVAR pure_truncate_prompt_current_directory_keeps:\x2d1 -SETUVAR pure_truncate_window_title_current_directory_keeps:\x2d1 diff --git a/stow/.config/fish/functions/0x0.fish b/stow/.config/fish/functions/0x0.fish deleted file mode 100644 index 195318b..0000000 --- a/stow/.config/fish/functions/0x0.fish +++ /dev/null @@ -1,9 +0,0 @@ -function 0x0 --description 'Uploads a file or folder to 0x0.st' - if test -d "$argv" - set TMPFILE "$(mktemp --suffix '.tar')" - tar cf "$TMPFILE" "$argv" - curl -F file="@$TMPFILE" -F expires=24 https://0x0.st - else - curl -F file=@"$argv" -F expires=24 https://0x0.st - end -end diff --git a/stow/.config/fish/functions/cat.fish b/stow/.config/fish/functions/cat.fish deleted file mode 100644 index abbc480..0000000 --- a/stow/.config/fish/functions/cat.fish +++ /dev/null @@ -1,4 +0,0 @@ -function cat --wraps=bat --description 'alias cat bat' - bat $argv - -end diff --git a/stow/.config/fish/functions/la.fish b/stow/.config/fish/functions/la.fish deleted file mode 100644 index d33eb8f..0000000 --- a/stow/.config/fish/functions/la.fish +++ /dev/null @@ -1,4 +0,0 @@ -function la --wraps='ls -ah --color=auto' --description 'alias la=ls -ah --color=auto' - ls -ah --color=auto $argv - -end diff --git a/stow/.config/fish/functions/ll.fish b/stow/.config/fish/functions/ll.fish deleted file mode 100644 index 874614f..0000000 --- a/stow/.config/fish/functions/ll.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ll --wraps='ls -l' --wraps='ls -ahl --color=auto' --description 'alias ll=ls -ahl --color=auto' - ls -ahl --color=auto $argv - -end diff --git a/stow/.config/fish/functions/ls.fish b/stow/.config/fish/functions/ls.fish deleted file mode 100644 index eaf48c8..0000000 --- a/stow/.config/fish/functions/ls.fish +++ /dev/null @@ -1,4 +0,0 @@ -function ls --description 'alias ls=ls -h --color=auto' - command ls -h --color=auto $argv - -end diff --git a/stow/.config/fish/functions/posix-source.fish b/stow/.config/fish/functions/posix-source.fish deleted file mode 100644 index 5147014..0000000 --- a/stow/.config/fish/functions/posix-source.fish +++ /dev/null @@ -1,6 +0,0 @@ -function posix-source - for i in (cat $argv) - set arr (echo $i |tr = \n) - set -gx $arr[1] $arr[2] - end -end diff --git a/stow/.config/fish/functions/rm.fish b/stow/.config/fish/functions/rm.fish deleted file mode 100644 index 5d4ae5f..0000000 --- a/stow/.config/fish/functions/rm.fish +++ /dev/null @@ -1,4 +0,0 @@ -function rm --wraps=trash --description 'alias rm trash' - trash $argv - -end diff --git a/stow/.config/fish/functions/v.fish b/stow/.config/fish/functions/v.fish deleted file mode 100644 index c4c8a12..0000000 --- a/stow/.config/fish/functions/v.fish +++ /dev/null @@ -1,4 +0,0 @@ -function v --wraps=nvim --description 'alias v nvim' - nvim $argv - -end diff --git a/stow/.config/fish/functions/vi.fish b/stow/.config/fish/functions/vi.fish deleted file mode 100644 index 1f236aa..0000000 --- a/stow/.config/fish/functions/vi.fish +++ /dev/null @@ -1,4 +0,0 @@ -function vi --wraps=nvim --description 'alias vi nvim' - nvim $argv - -end diff --git a/stow/.config/fish/functions/vim.fish b/stow/.config/fish/functions/vim.fish deleted file mode 100644 index 67df688..0000000 --- a/stow/.config/fish/functions/vim.fish +++ /dev/null @@ -1,4 +0,0 @@ -function vim --wraps=nvim --description 'alias vim nvim' - nvim $argv - -end diff --git a/stow/.config/hypr/hyprland.conf b/stow/.config/hypr/hyprland.conf index bad31d8..f0ef64d 100755 --- a/stow/.config/hypr/hyprland.conf +++ b/stow/.config/hypr/hyprland.conf @@ -20,10 +20,9 @@ exec-once = hyprshade auto & exec-once = walker --gapplication-service exec-once = opensnitch-ui -exec-once = systemctl start --user polkit-gnome-authentication-agent-1.service +exec-once = systemctl status --user polkit-gnome-authentication-agent-1.service exec-once = steam -silent & -exec-once = 1password --silent & ############################# ### ENVIRONMENT VARIABLES ### @@ -168,7 +167,6 @@ $mainMod = SUPER # Sets "Windows" key as main modifier bind = $mainMod, Q, exec, ghostty bind = $mainMod, B, exec, firefox bind = $mainMod, D, exec, walker -bind = $mainMod shift, D, exec, 1password --quick-access bind = $mainMod, S, exec, hyprshot -z --clipboard-only -m region bind = $mainMod shift, S, exec, hyprshot -z --clipboard-only -m window bind = $mainMod control, S, exec, hyprshot -z --clipboard-only -m active @@ -256,16 +254,14 @@ windowrulev2 = noshadow,initialClass:ulauncher windowrulev2 = float,initialTitle:(^KeePassXC - Browser Access Request$) -windowrulev2 = stayfocused,initialTitle:(^Quick Access — 1Password$) - windowrulev2 = noanim,initialTitle:(^flameshot$) windowrulev2 = float,initialTitle:(^flameshot$) windowrulev2 = float, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) windowrulev2 = pin, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) windowrulev2 = noinitialfocus, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) -windowrulev2 = size 20%, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) -windowrulev2 = move 76% 0.5%, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) +windowrulev2 = size 502 286, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) +windowrulev2 = move 72% 6%, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) windowrulev2 = keepaspectratio, initialTitle:(^Picture-in-Picture$), initialClass:(^firefox$) windowrulev2 = move -100% -100%, initialClass:(^xwaylandvideobridge$)