From cfe49c73fc5e60222619df22edf5a235e8708c8b Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 2 Mar 2024 11:36:22 +0100 Subject: [PATCH] home: remove unsused modules --- home/modules/default.nix | 5 - home/modules/fish.nix | 85 ---------- home/modules/kitty/config | 62 -------- home/modules/kitty/default.nix | 20 --- home/modules/mako.nix | 37 ----- home/modules/sway/config | 283 --------------------------------- home/modules/sway/default.nix | 45 ------ home/modules/termite.nix | 68 -------- 8 files changed, 605 deletions(-) delete mode 100644 home/modules/fish.nix delete mode 100644 home/modules/kitty/config delete mode 100644 home/modules/kitty/default.nix delete mode 100644 home/modules/mako.nix delete mode 100644 home/modules/sway/config delete mode 100644 home/modules/sway/default.nix delete mode 100644 home/modules/termite.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index 093c10b..b1f117d 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -2,19 +2,14 @@ alacritty = import ./alacritty; colors = import ./colors.nix; direnv = import ./direnv.nix; - fish = import ./fish.nix; git = import ./git.nix; gpg = import ./gpg.nix; gtk = import ./gtk.nix; helix = import ./helix; keyring = import ./keyring.nix; - kitty = import ./kitty; - mako = import ./mako.nix; session = import ./session.nix; ssh = import ./ssh.nix; - sway = import ./sway; syncthing = import ./syncthing.nix; - termite = import ./termite.nix; tmux = import ./tmux.nix; xdg = import ./xdg.nix; zsh = import ./zsh.nix; diff --git a/home/modules/fish.nix b/home/modules/fish.nix deleted file mode 100644 index 6a852bd..0000000 --- a/home/modules/fish.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: -with lib; let - cfg = config.dadada.home.fish; -in -{ - options.dadada.home.fish = { - enable = mkEnableOption "Enable fish config"; - }; - - config = mkIf cfg.enable { - programs.fish = { - enable = true; - plugins = with pkgs; [ - { - name = "fzf"; - src = pkgs.fetchFromGitHub { - owner = "jethrokuan"; - repo = "fzf"; - rev = "c3defd4a922e97120503b45e26efa775bc672b50"; - sha256 = "1k5b0nva0mbqc9830qhbcwxsi8d9b2p4ws1fq0bw9nkf2ripyp4p"; - }; - } - ]; - interactiveShellInit = '' - # fish git prompt - set __fish_git_prompt_show_informative_status 'yes' - set __fish_git_prompt_showdirtystate 'yes' - set __fish_git_prompt_showstashstate 'yes' - set __fish_git_prompt_showuntrackedfiles 'yes' - set __fish_git_prompt_showupstream 'yes' - set __fish_git_prompt_showcolorhints 'yes' - - set fish_greeting - - # disable path shortening - set fish_prompt_pwd_dir_length 0 - - set -U FZF_LEGACY_KEYBINDINGS 0 - set -x TERM xterm-256color - set -U fish_user_paths ~/bin $fish_user_paths - - #if status is-interactive - #and not status is-login - #and not set -q TMUX - #and string match -qr "^xterm-.*" "$TERM" - # exec tmux - #end - ''; - promptInit = '' - function fish_prompt - set last_status $status - printf '%s %s:%s ' \ - (set_color red - echo $last_status) \ - (set_color green - hostname) \ - (set_color blue - prompt_pwd) - set_color normal - end - - function fish_right_prompt - printf '%s' (__fish_git_prompt) - end - ''; - shellAliases = { - gst = "git status"; - gco = "git commit"; - glo = "git log"; - gad = "git add"; - ls = "exa"; - ll = "exa -l"; - la = "exa -la"; - mv = "mv -i"; - cp = "cp -i"; - }; - }; - - home.packages = [ pkgs.eza ]; - }; -} diff --git a/home/modules/kitty/config b/home/modules/kitty/config deleted file mode 100644 index 4c73ef6..0000000 --- a/home/modules/kitty/config +++ /dev/null @@ -1,62 +0,0 @@ -font_family monospace -font_size 9 -bold_font auto -italic_font auto -bold_italic_font auto -copy_on_select no -clipboard_control no-append write-clipboard read-clipboard -allow_hyperlinks yes -detect_urls yes -strip_trailing_spaces never -window_alert_on_bell yes -enable_audio_bell yes -bell_on_tab yes -tab_bar_style hide -scrollback_lines 20000 - -map ctrl+shift+v no_op -map ctrl+shift+c no_op - -background #1f2022 -foreground #a3a3a3 -selection_background #a3a3a3 -selection_foreground #1f2022 -url_color #b8b8b8 -cursor #a3a3a3 -active_border_color #585858 -inactive_border_color #282828 -active_tab_background #1f2022 -active_tab_foreground #a3a3a3 -inactive_tab_background #282828 -inactive_tab_foreground #b8b8b8 -tab_bar_background #282828 - -# normal -color0 #1f2022 -color1 #f2241f -color2 #67b11d -color3 #b1951d -color4 #4f97d7 -color5 #a31db1 -color6 #2d9574 -color7 #a3a3a3 - -# bright -color8 #585858 -color9 #f2241f -color10 #67b11d -color11 #b1951d -color12 #4f97d7 -color13 #a31db1 -color14 #2d9574 -color15 #f8f8f8 - -# extended base16 colors -color16 #ffa500 -color17 #b03060 -color18 #282828 -color19 #444155 -color20 #b8b8b8 -color21 #e8e8e8 - -#shell tmux diff --git a/home/modules/kitty/default.nix b/home/modules/kitty/default.nix deleted file mode 100644 index 982d938..0000000 --- a/home/modules/kitty/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs -, lib -, config -, ... -}: -with lib; let - cfg = config.dadada.home.kitty; -in -{ - options.dadada.home.kitty = { - enable = mkEnableOption "Enable kitty config"; - }; - config = mkIf cfg.enable { - programs.kitty = { - enable = true; - extraConfig = builtins.readFile ./config; - }; - home.packages = [ pkgs.source-code-pro ]; - }; -} diff --git a/home/modules/mako.nix b/home/modules/mako.nix deleted file mode 100644 index 7fd49b6..0000000 --- a/home/modules/mako.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config -, lib -, pkgs -, colors -, ... -}: -with lib; let - cfg = config.dadada.home.mako; -in -{ - options.dadada.home.mako = { - enable = mkEnableOption "Enable mako config"; - }; - config = mkIf cfg.enable { - programs.mako = { - enable = true; - anchor = "bottom-right"; - backgroundColor = colors.color8; - borderColor = colors.color0; - #defaultTimeout = -1; - font = "Source Code Pro 10"; - format = ''%a %s\n%b''; - height = 100; - #groupBy = "app-name"; - icons = false; - ignoreTimeout = false; - layer = "overlay"; - margin = "0,0,0"; - maxVisible = 200; - padding = "0"; - progressColor = colors.color4; - sort = "+time"; - textColor = colors.foreground; - width = 400; - }; - }; -} diff --git a/home/modules/sway/config b/home/modules/sway/config deleted file mode 100644 index c72960a..0000000 --- a/home/modules/sway/config +++ /dev/null @@ -1,283 +0,0 @@ -set $foreground #a3a3a3ff -set $background #1f2022e5 -set $dark_black #1f2022ff -set $light_black #282828ff -set $dark_red #444155ff -set $light_red #585858ff -set $dark_green #b8b8b8ff -set $light_green #a3a3a3ff -set $dark_yellow #e8e8e8ff -set $light_yellow #f8f8f8ff -set $dark_blue #f2241fff -set $light_blue #ffa500ff -set $dark_magenta #b1951dff -set $light_magenta #67b11dff -set $dark_cyan #2d9574ff -set $light_cyan #4f97d7ff -set $dark_white #a31db1ff -set $light_white #b03060ff - -xwayland enable - -# global modifier key -set $mod Mod4 - -# reload the configuration file -bindsym $mod+Shift+c reload - -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart - -# the font to be used for i3bar and window decorations -font pango:Source Code Pro 8 - -bindsym $mod+Return exec alacritty -bindsym $mod+Space exec bemenu-run - -# switch keyboard to neo -#bindsym $mod+F1 exec neo-key -#bindsym $mod+F2 exec eu-key - -# kill focused window -bindsym $mod+Shift+q kill - -# toggle moving floating windows with the mouse -floating_modifier $mod - -# toggle tiling / floating -bindsym $mod+Shift+f floating toggle - -# resize window (you can also use the mouse for that) -mode "resize" { - # resize windows with hjkl - bindsym h resize shrink width 10 px or 10 ppt - bindsym j resize grow height 10 px or 10 ppt - bindsym k resize shrink height 10 px or 10 ppt - bindsym l resize grow width 10 px or 10 ppt - - # back to normal mode - bindsym Return mode "default" - bindsym Escape mode "default" -} - -# switch to resize mode -bindsym $mod+r mode "resize" - -# set border width of new window -default_border pixel 1 - -# keep focus within current container? -focus_wrapping no - -# focus goes to window if mouse is moved onto it -focus_follows_mouse yes - -# enter fullscreen mode for the focused container -bindsym $mod+o fullscreen - -# default orientation of new windows -default_orientation horizontal - -# split in horizontal orientation -bindsym $mod+b split h - -# split in vertical orientation -bindsym $mod+shift+b split v - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+x layout toggle all - -# name workspaces -set $1 1 -set $2 2 -set $3 3 -set $4 4 -set $5 5 -set $6 6 -set $7 7 -set $8 8 -set $9 9 -set $10 10 - -# default mode -workspace_layout tabbed - -# automatically jump back to previous workspace -workspace_auto_back_and_forth yes - -# messaging -#workspace 2 output LVDS-1 - -# web and doc -#workspace 1 output VGA-1 - -# editor and IDE -#workspace 3 output DP-2 - -# change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -# focus latest urgent window -bindsym $mod+Shift+1 [urgent=latest] focus - -# focus the parent container -bindsym $mod+Up focus parent - -# focus the child container -bindsym $mod+Down focus child - -# focus tiling/floating -bindsym $mod+f focus mode_toggle - -# focus workspace -bindsym $mod+1 workspace number $1 -bindsym $mod+2 workspace number $2 -bindsym $mod+3 workspace number $3 -bindsym $mod+4 workspace number $4 -bindsym $mod+5 workspace number $5 -bindsym $mod+6 workspace number $6 -bindsym $mod+7 workspace number $7 -bindsym $mod+8 workspace number $8 -bindsym $mod+9 workspace number $9 -bindsym $mod+0 workspace number $10 -bindsym $mod+n workspace next_on_output -bindsym $mod+p workspace prev_on_output - -# focus different outputs (displays) -bindsym $mod+shift+h focus output left -bindsym $mod+shift+j focus output down -bindsym $mod+shift+k focus output up -bindsym $mod+shift+l focus output right - -# show the first scratchpad window -bindsym $mod+minus scratchpad show - -set $mode_move "move" -bindsym $mod+m mode "$mode_move" - -mode "$mode_move" { - - # move focused container - bindsym h move left ;mode "default" - bindsym j move down ;mode "default" - bindsym k move up ;mode "default" - bindsym l move right;mode "default" - bindsym 1 move container to workspace number $1 ;mode "default" - bindsym 2 move container to workspace number $2 ;mode "default" - bindsym 3 move container to workspace number $3 ;mode "default" - bindsym 4 move container to workspace number $4 ;mode "default" - bindsym 5 move container to workspace number $5 ;mode "default" - bindsym 6 move container to workspace number $6 ;mode "default" - bindsym 7 move container to workspace number $7 ;mode "default" - bindsym 8 move container to workspace number $8 ;mode "default" - bindsym 9 move container to workspace number $9 ;mode "default" - bindsym 0 move container to workspace number $10 ;mode "default" - bindsym n move container to workspace next_on_output;mode "default" - bindsym p move container to workspace prev_on_output;mode "default" - - # move focused workspace to output - bindsym shift+h move workspace to output left ; mode "default" - bindsym shift+j move workspace to output down ; mode "default" - bindsym shift+k move workspace to output up ; mode "default" - bindsym shift+l move workspace to output right ; mode "default" - bindsym shift+n move container to output next ; mode "default" - bindsym shift+p move container to output prev ; mode "default" - - # make the currently focused window a scratchpad - bindsym minus move scratchpad; mode "default" - - # Move container to the current position of the cursor - bindsym m move position mouse; mode "default" - - bindsym Escape mode "default" -} - -# lock the screen -bindsym $mod+equal exec lock-session - -# control volume -bindsym --locked XF86AudioRaiseVolume exec amixer set 'Master' 5%+ && pkill -RTMIN+10 i3blocks -bindsym --locked XF86AudioLowerVolume exec amixer set 'Master' 5%- && pkill -RTMIN+10 i3blocks -bindsym --locked XF86AudioMute exec amixer set Master toggle && pkill -RTMIN+10 i3blocks -bindsym --locked --to-code XF86AudioMicMute exec --no-startup-id pactl set-source-mute 1 toggle - -# control media player -bindsym --locked XF86AudioPlay exec playerctl play-pause && pkill -RTMIN+11 i3blocks -bindsym --locked XF86LaunchA exec playerctl play-pause && pkill -RTMIN+11 i3blocks -bindsym --locked XF86AudioNext exec playerctl next && pkill -RTMIN+11 i3blocks -bindsym --locked XF86Explorer exec playerctl next && pkill -RTMIN+11 i3blocks -bindsym --locked XF86AudioPrev exec playerctl previous && pkill -RTMIN+11 i3blocks -bindsym --locked XF86Search exec playerctl previous && pkill -RTMIN+11 i3blocks - -# control screen brightness -bindsym --locked XF86MonBrightnessUp exec brightnessctl set -d intel_backlight +5% -bindsym --locked XF86MonBrightnessDown exec brightnessctl set -d intel_backlight 5%- - -# Basic bar configuration using the Base16 variables. -bar { - id bar - status_command i3status - mode dock - modifier $mod - position bottom - strip_workspace_numbers yes - workspace_buttons yes - #output LVDS-1 - - colors { - background $background - separator $light_green - statusline $foreground - - # State Border BG Text - focused_workspace $light_black $dark_cyan $background - active_workspace $light_black $dark_green $background - inactive_workspace $dark_black $background $foreground - urgent_workspace $light_black $dark_red $background - binding_mode $light_black $dark_magenta $background - } -} - -#hide_edge_borders both -bindsym XF86Launch1 exec aplay ~/lib/sounds/wortwitzklingel-mono.wav - -# Basic color configuration using the Base16 variables for windows and borders. -# Property Name Border BG Text Indicator Child Border -client.focused $light_black $dark_cyan $background $dark_cyan $dark_cyan -client.focused_inactive $light_black $dark_green $background $dark_green $dark_green -client.unfocused $light_black $background $foreground $dark_white $dark_white -client.urgent $light_black $dark_red $background $dark_red $dark_red -client.placeholder $light_black $dark_magenta $background $dark_magenta $dark_magenta - -input * { - xkb_layout eu - xkb_model pc105+inet - xkb_options caps:escape - natural_scroll enabled -} - -input 2:7:SynPS/2_Synaptics_TouchPad { - # disables the input device - events disabled -} - -seat * { - hide_cursor 5000 -} - -assign [app_id="thunderbird"] workspace 1 -assign [app_id="telegramdesktop"] workspace 1 -assign [app_id="firefox" title="Riot.*"] workspace 1 -assign [app_id="firefox" title="Instant messaging.*"] workspace 1 -assign [app_id="firefox" title="Threema Web.*"] workspace 1 -assign [app_id="firefox" title="chaos\.social.*"] workspace 1 -assign [app_id="thunderbird" title="Write:.*"] workspace 3 -assign [app_id="firefox"] workspace 2 -assign [app_id="jetbrains-studio"] workspace 3 -assign [app_id="org.keepassxc.KeePassXC"] workspace 10 - -exec xset s off -exec mako diff --git a/home/modules/sway/default.nix b/home/modules/sway/default.nix deleted file mode 100644 index 0f99485..0000000 --- a/home/modules/sway/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config -, pkgs -, lib -, colors -, ... -}: -with lib; let - cfg = config.dadada.home.sway; -in -{ - options.dadada.home.sway = { - enable = mkEnableOption "Enable Sway config"; - }; - config = mkIf cfg.enable { - home.packages = with pkgs; [ - qt5.qtwayland - swayidle - xwayland - mako - kanshi - kitty - i3status - bemenu - xss-lock - swaylock - brightnessctl - playerctl - ]; - - wayland.windowManager.sway = { - enable = true; - config = null; - extraConfig = builtins.readFile ./config; - extraSessionCommands = '' - export SDL_VIDEODRIVER=wayland - # needs qt5.qtwayland in systemPackages - export QT_QPA_PLATFORM=wayland - export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - # Fix for some Java AWT applications (e.g. Android Studio), - # use this if they aren't displayed properly: - export _JAVA_AWT_WM_NONREPARENTING=1 - ''; - }; - }; -} diff --git a/home/modules/termite.nix b/home/modules/termite.nix deleted file mode 100644 index 77bb1e6..0000000 --- a/home/modules/termite.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config -, lib -, pkgs -, colors ? ../../lib/colors.nix -, ... -}: -with lib; let - cfg = config.dadada.home.termite; -in -{ - options.dadada.home.termite = { - enable = mkEnableOption "Enable termite config"; - }; - config = mkIf cfg.enable { - programs.termite = { - enable = true; - allowBold = true; - audibleBell = false; - clickableUrl = true; - dynamicTitle = true; - font = "Source Code Pro 10"; - mouseAutohide = false; - scrollOnOutput = false; - scrollOnKeystroke = true; - scrollbackLines = -1; - searchWrap = true; - urgentOnBell = true; - cursorBlink = "off"; - cursorShape = "block"; - sizeHints = false; - scrollbar = "off"; - colorsExtra = '' - foreground = ${colors.foreground} - foreground_bold = ${colors.foregroundBold} - cursor = ${colors.cursor} - cursor_foreground = ${colors.cursorForeground} - background = ${colors.background} - color0 = ${colors.background} - color8 = ${colors.color8} - color7 = ${colors.color7} - color15 = ${colors.color15} - color1 = ${colors.color1} - color9 = ${colors.color9} - color2 = ${colors.color2} - color10 = ${colors.color10} - color3 = ${colors.color3} - color11 = ${colors.color11} - color4 = ${colors.color4} - color12 = ${colors.color12} - color5 = ${colors.color5} - color13 = ${colors.color13} - color6 = ${colors.color6} - color14 = ${colors.color14} - color16 = ${colors.color16} - color17 = ${colors.color17} - color18 = ${colors.color18} - color19 = ${colors.color19} - color20 = ${colors.color20} - color21 = ${colors.color21} - ''; - }; - - # Add font that is used in config - home.packages = [ - pkgs.source-code-pro - ]; - }; -}