From b5d49384a6f3fc5a836f54e91305e45b6c4832e1 Mon Sep 17 00:00:00 2001 From: tdro Date: Sun, 19 Sep 2021 22:13:45 -0400 Subject: .config/nixpkgs: Remove copyq, add autocutsel --- .config/X11/xbindkeysrc | 2 +- .config/copyq/copyq-dark.conf | 201 ---------------------------- .config/copyq/copyq.conf | 224 -------------------------------- .config/nixpkgs/config.nix | 12 +- .config/systemd/user/autocutsel.service | 13 ++ .local/bin/scripts/clipboard | 1 - 6 files changed, 20 insertions(+), 433 deletions(-) delete mode 100644 .config/copyq/copyq-dark.conf delete mode 100644 .config/copyq/copyq.conf create mode 100644 .config/systemd/user/autocutsel.service diff --git a/.config/X11/xbindkeysrc b/.config/X11/xbindkeysrc index af5cb92..60ae4e6 100644 --- a/.config/X11/xbindkeysrc +++ b/.config/X11/xbindkeysrc @@ -34,7 +34,7 @@ "bookmarks show $HOME/Documents/text/bookmarks/bookmarks.html" Mod4 + g -# copyq toggle +# clipboard toggle "$HOME/.local/bin/scripts/clipboard" Mod4 + z diff --git a/.config/copyq/copyq-dark.conf b/.config/copyq/copyq-dark.conf deleted file mode 100644 index 36380e1..0000000 --- a/.config/copyq/copyq-dark.conf +++ /dev/null @@ -1,201 +0,0 @@ -[General] -plugin_priority=itemimage, itemencrypted, itemfakevim, itemnotes, itemsync, itemtext, itemtags, itempinned, itemweb - -[Options] -action_has_input=false -action_has_output=false -action_output_tab= -action_separator=\\n -activate_closes=true -activate_focuses=true -activate_pastes=false -always_on_top=false -autocompletion=true -autostart=false -check_clipboard=true -check_selection=true -clipboard_notification_lines=0 -clipboard_tab=&clipboard -close_on_unfocus=false -command_history_size=100 -confirm_exit=true -copy_clipboard=false -copy_selection=false -disable_tray=true -edit_ctrl_return=true -editor=geany %1 -expire_tab=0 -filter_history= -hide_main_window=true -hide_main_window_in_task_bar=false -hide_tabs=false -hide_toolbar=true -hide_toolbar_labels=true -item_popup_interval=0 -language=en -max_process_manager_rows=1000 -maxitems=10000 -move=true -notification_horizontal_offset=10 -notification_maximum_height=100 -notification_maximum_width=300 -notification_position=3 -notification_vertical_offset=10 -number_search=false -open_windows_on_current_screen=false -run_selection=false -save_filter_history=false -show_advanced_command_settings=false -show_simple_items=false -show_tab_item_count=true -tab_tree=true -tabs=&clipboard, &saved, imported -text_wrap=true -transparency=0 -transparency_focused=0 -tray_commands=false -tray_images=false -tray_item_paste=false -tray_items=0 -tray_tab= -tray_tab_is_current=false -vi=true - -[Plugins] -itemdata\enabled=true -itemencrypted\enabled=true -itemencrypted\encrypt_tabs= -itemfakevim\enabled=true -itemfakevim\really_enable=false -itemfakevim\source_file= -itemimage\enabled=true -itemimage\image_editor= -itemimage\max_image_height=240 -itemimage\max_image_width=320 -itemimage\svg_editor= -itemnotes\enabled=true -itempinned\enabled=true -itemsync\enabled=true -itemtags\enabled=true -itemtags\tags=@Invalid() -itemtext\enabled=true -itemtext\max_height=0 -itemtext\max_lines=0 -itemtext\use_rich_text=false -itemweb\enabled=true -itemweb\max_height=0 - -[Shortcuts] -about=shift+f1 -action=F5 -change_tab_icon=ctrl+shift+t -commands=f6 -copy_selected_items=ctrl+c -delete_item=del -edit=f2 -edit_notes=shift+f2 -editor=ctrl+e -exit=ctrl+q -export=ctrl+s -export_tab=Ctrl+S -find_items=ctrl+g -format-next=ctrl+right -format-previous=ctrl+left -help=f1 -import=ctrl+i -import_tab=Ctrl+I -item-menu=shift+f10 -move_down=ctrl+down -move_to_bottom=ctrl+end -move_to_clipboard= -move_to_top=ctrl+home -move_up=ctrl+up -new=ctrl+n -new_tab=ctrl+t -next_tab=right -next_to_clipboard=Ctrl+Shift+N -paste_selected_items=ctrl+v -preferences=ctrl+p -previous_tab=left -previous_to_clipboard=Ctrl+Shift+P -process_manager=ctrl+shift+z -remove_tab=ctrl+w -rename_tab=ctrl+f2 -reverse_selected_items=ctrl+shift+r -show-log=f12 -show_clipboard_content=ctrl+shift+c -show_item_content=f4 -show_item_preview=f7 -sort_selected_items=ctrl+shift+s -system-run=f5 -toggle_clipboard_storing=ctrl+shift+x - -[Tabs] -1\icon= -1\max_item_count=0 -1\name=&clipboard -1\store_items=true -2\icon= -2\max_item_count=0 -2\name=&saved -2\store_items=true -3\icon= -3\max_item_count=0 -3\name=imported -3\store_items=true -size=3 - -[Theme] -alt_bg=#2e3436 -alt_item_css= -bg=#242424 -css= -cur_item_css="\n ;border: 0.1em solid ${sel_bg}" -edit_bg=#2e3436 -edit_fg=#fdfdfd -edit_font= -fg=#fdfdfd -find_bg=#ff0 -find_fg=#000000 -find_font= -font= -font_antialiasing=true -item_css= -item_spacing= -menu_bar_css="\n ;background: ${bg}\n ;color: ${fg}" -menu_bar_disabled_css="\n ;color: ${bg - #666}" -menu_bar_selected_css="\n ;background: ${sel_bg}\n ;color: ${sel_fg}" -menu_css="\n ;border-top: 0.08em solid ${bg + #333}\n ;border-left: 0.08em solid ${bg + #333}\n ;border-bottom: 0.08em solid ${bg - #333}\n ;border-right: 0.08em solid ${bg - #333}" -notes_bg=#000000 -notes_css= -notes_fg=#ffffff -notes_font= -notification_bg=#333 -notification_fg=#ddd -notification_font= -num_fg=#909090 -num_font= -search_bar="\n ;background: ${edit_bg}\n ;color: ${edit_fg}\n ;border: 1px solid ${alt_bg}\n ;margin: 2px" -search_bar_focused="\n ;border: 1px solid ${sel_bg}" -sel_bg=#204a87 -sel_fg=#ffffff -sel_item_css= -show_number=true -show_scrollbars=true -style_main_window=false -tab_bar_css="\n ;background: ${bg - #222}" -tab_bar_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_bar_scroll_buttons_css="\n ;background: ${bg - #222}\n ;color: ${fg}\n ;border: 0" -tab_bar_sel_item_counter="\n ;color: ${sel_bg - #044 + #400}" -tab_bar_tab_selected_css="\n ;padding: 0.5em\n ;background: ${bg}\n ;border: 0.05em solid ${bg}\n ;color: ${fg}" -tab_bar_tab_unselected_css="\n ;border: 0.05em solid ${bg}\n ;padding: 0.5em\n ;background: ${bg - #222}\n ;color: ${fg - #333}" -tab_tree_css="\n ;color: ${fg}\n ;background-color: ${bg}" -tab_tree_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_tree_item_css=padding:2px -tab_tree_sel_item_counter="\n ;color: ${sel_fg - #044 + #400}" -tab_tree_sel_item_css="\n ;color: ${sel_fg}\n ;background-color: ${sel_bg}" -tool_bar_css="\n ;color: ${fg}\n ;background-color: ${bg}\n ;border: 0" -tool_button_css="\n ;background-color: transparent" -tool_button_pressed_css="\n ;background: ${sel_bg}" -tool_button_selected_css="\n ;background: ${sel_bg}\n ;color: ${sel_fg}" -use_system_icons=false diff --git a/.config/copyq/copyq.conf b/.config/copyq/copyq.conf deleted file mode 100644 index f73d4a1..0000000 --- a/.config/copyq/copyq.conf +++ /dev/null @@ -1,224 +0,0 @@ -[General] -plugin_priority=itemimage, itemencrypted, itemfakevim, itemnotes, itemsync, itemtext, itemtags, itempinned, itemweb - -[Options] -action_has_input=false -action_has_output=false -action_output_tab= -action_separator=\\n -activate_closes=true -activate_focuses=true -activate_item_with_single_click=false -activate_pastes=false -always_on_top=false -autocompletion=false -autostart=false -check_clipboard=true -check_selection=false -clipboard_notification_lines=0 -clipboard_tab=&clipboard -close_on_unfocus=false -command_history_size=100 -confirm_exit=true -copy_clipboard=false -copy_selection=false -disable_tray=true -edit_ctrl_return=true -editor=gvim %1 -expire_tab=0 -filter_case_insensitive=true -filter_history= -filter_regular_expression=true -hide_main_window=true -hide_main_window_in_task_bar=false -hide_tabs=false -hide_toolbar=true -hide_toolbar_labels=true -item_popup_interval=0 -language=en -max_process_manager_rows=1000 -maxitems=10000 -move=true -native_menu_bar=true -notification_horizontal_offset=10 -notification_maximum_height=100 -notification_maximum_width=300 -notification_position=3 -notification_vertical_offset=10 -number_search=false -open_windows_on_current_screen=false -run_selection=false -save_delay_ms_on_item_added=300000 -save_delay_ms_on_item_edited=1000 -save_delay_ms_on_item_modified=300000 -save_delay_ms_on_item_moved=1800000 -save_delay_ms_on_item_removed=600000 -save_filter_history=false -save_on_app_deactivated=true -show_advanced_command_settings=false -show_simple_items=false -show_tab_item_count=true -tab_tree=false -tabs=&clipboard, &saved -text_tab_width=8 -text_wrap=true -transparency=0 -transparency_focused=0 -tray_commands=false -tray_images=false -tray_item_paste=false -tray_items=0 -tray_menu_open_on_left_click=false -tray_tab= -tray_tab_is_current=false -vi=true - -[Plugins] -itemdata\enabled=true -itemencrypted\enabled=true -itemencrypted\encrypt_tabs= -itemfakevim\enabled=true -itemfakevim\really_enable=false -itemfakevim\source_file= -itemimage\enabled=true -itemimage\image_editor= -itemimage\max_image_height=240 -itemimage\max_image_width=320 -itemimage\svg_editor= -itemnotes\enabled=true -itemnotes\notes_at_bottom=false -itemnotes\notes_beside=false -itemnotes\show_tooltip=false -itempinned\enabled=true -itemsync\enabled=true -itemsync\format_settings=@Invalid() -itemsync\sync_tabs=@Invalid() -itemtags\enabled=true -itemtags\tags=@Invalid() -itemtext\enabled=true -itemtext\max_height=0 -itemtext\max_lines=0 -itemtext\use_rich_text=false -itemweb\enabled=true -itemweb\max_height=0 - -[Shortcuts] -about=shift+f1 -action=F5 -change_tab_icon=ctrl+shift+t -commands=f6 -copy_selected_items=ctrl+c -delete_item=del -edit=f2 -edit_notes=shift+f2 -editor=ctrl+e -exit=ctrl+q -export=ctrl+s -export_tab=Ctrl+S -find_items=ctrl+g -format-next=ctrl+right -format-previous=ctrl+left -help=f1 -import=ctrl+i -import_tab=Ctrl+I -item-menu=shift+f10 -move_down=ctrl+down -move_to_bottom=ctrl+end -move_to_clipboard= -move_to_top=ctrl+home -move_up=ctrl+up -new=ctrl+n -new_tab=ctrl+t -next_tab=right -next_to_clipboard=Ctrl+Shift+N -paste_selected_items=ctrl+v -preferences=ctrl+p -previous_tab=left -previous_to_clipboard=Ctrl+Shift+P -process_manager=ctrl+shift+z -remove_tab=ctrl+w -rename_tab=ctrl+f2 -reverse_selected_items=ctrl+shift+r -show-log=f12 -show_clipboard_content=ctrl+shift+c -show_item_content=f4 -show_item_preview=f7 -sort_selected_items=ctrl+shift+s -system-run=f5 -toggle_clipboard_storing=ctrl+shift+x - -[Tabs] -1\icon= -1\max_item_count=0 -1\name=&clipboard -1\store_items=true -2\icon= -2\max_item_count=0 -2\name=&saved -2\store_items=true -3\icon= -3\max_item_count=0 -3\name=&clipboard -3\store_items=true -size=2 - -[Theme] -alt_bg=#f3f3f3 -alt_item_css= -bg=#fdfdfd -css= -css_template_items=items -css_template_main_window=main_window -css_template_notification=notification -css_template_tooltip=tooltip -cur_item_css="\n ;border: 0.1em solid ${sel_bg}" -edit_bg=#fdfdfd -edit_fg=#242424 -edit_font= -fg=#242424 -find_bg=#ff0 -find_fg=#000 -find_font= -font= -font_antialiasing=true -hover_item_css= -icon_size=16 -item_css= -item_spacing= -menu_bar_css="\n ;background: ${bg}\n ;color: ${fg}" -menu_bar_disabled_css="\n ;color: ${bg - #666}" -menu_bar_selected_css="\n ;background: ${sel_bg}\n ;color: ${sel_fg}" -menu_css="\n ;border-top: 0.08em solid ${bg + #333}\n ;border-left: 0.08em solid ${bg + #333}\n ;border-bottom: 0.08em solid ${bg - #333}\n ;border-right: 0.08em solid ${bg - #333}" -notes_bg=#ffffdc -notes_css= -notes_fg=#000000 -notes_font= -notification_bg=#333 -notification_fg=#ddd -notification_font= -num_fg=#909090 -num_font= -search_bar="\n ;background: ${edit_bg}\n ;color: ${edit_fg}\n ;border: 1px solid ${alt_bg}\n ;margin: 2px" -search_bar_focused="\n ;border: 1px solid ${sel_bg}" -sel_bg=#729fcf -sel_fg=#000000 -sel_item_css= -show_number=true -show_scrollbars=true -style_main_window=false -tab_bar_css="\n ;background: ${bg - #222}" -tab_bar_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_bar_scroll_buttons_css="\n ;background: ${bg - #222}\n ;color: ${fg}\n ;border: 0" -tab_bar_sel_item_counter="\n ;color: ${sel_bg - #044 + #400}" -tab_bar_tab_selected_css="\n ;padding: 0.5em\n ;background: ${bg}\n ;border: 0.05em solid ${bg}\n ;color: ${fg}" -tab_bar_tab_unselected_css="\n ;border: 0.05em solid ${bg}\n ;padding: 0.5em\n ;background: ${bg - #222}\n ;color: ${fg - #333}" -tab_tree_css="\n ;color: ${fg}\n ;background-color: ${bg}" -tab_tree_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_tree_item_css=padding:2px -tab_tree_sel_item_counter="\n ;color: ${sel_fg - #044 + #400}" -tab_tree_sel_item_css="\n ;color: ${sel_fg}\n ;background-color: ${sel_bg}" -tool_bar_css="\n ;color: ${fg}\n ;background-color: ${bg}\n ;border: 0" -tool_button_css="\n ;background-color: transparent" -tool_button_pressed_css="\n ;background: ${sel_bg}" -tool_button_selected_css="\n ;background: ${sel_bg}\n ;color: ${sel_fg}" -use_system_icons=false diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix index 68b85f3..a86009d 100644 --- a/.config/nixpkgs/config.nix +++ b/.config/nixpkgs/config.nix @@ -160,7 +160,6 @@ in anki blender code-server - copyq dconf diffpdf escrotum @@ -224,6 +223,7 @@ in paths = [ (callPackage ./packages/x11vnc/default.nix {}) (callPackage ./packages/xprintidle/default.nix {}) + autocutsel glxinfo wmctrl xbindkeys @@ -341,11 +341,6 @@ in paths = [ freecadStable kicad ]; }; - LaTeX = pkgs.buildEnv { - name = "latex"; - paths = [ gummi texworks texlive.combined.scheme-full ]; - }; - Android = pkgs.buildEnv { name = "android"; paths = [ @@ -356,6 +351,11 @@ in ]; }; + LaTeX = pkgs.buildEnv { + name = "latex"; + paths = [ gummi texworks texlive.combined.scheme-full ]; + }; + JavaScript = pkgs.buildEnv { name = "javascript"; paths = [ diff --git a/.config/systemd/user/autocutsel.service b/.config/systemd/user/autocutsel.service new file mode 100644 index 0000000..82e822b --- /dev/null +++ b/.config/systemd/user/autocutsel.service @@ -0,0 +1,13 @@ +[Unit] +Description=Keep the X clipboard and the cutbuffer in sync + +[Service] +Type=forking +RestartSec=3s +Restart=always +SyslogIdentifier=autocutsel +ExecStartPre=/usr/bin/env autocutsel -f -s PRIMARY +ExecStart=/usr/bin/env autocutsel -f -s CLIPBOARD + +[Install] +WantedBy=default.target diff --git a/.local/bin/scripts/clipboard b/.local/bin/scripts/clipboard index e776c70..c740b74 100755 --- a/.local/bin/scripts/clipboard +++ b/.local/bin/scripts/clipboard @@ -1,2 +1 @@ #!/bin/sh -eu -copyq toggle; -- cgit v1.2.3