dotfiles

My PC Dotfiles & Website
commit 5cd75b955e57ec0e5537208c54b84eb420cddd24
parent 8f340eb7ea31945b702ac0534773d2aad9550fd0
Author: maydayv7 <maydayv7@gmail.com>
Date:   Wed,  7 Oct 2026 00:07:42 +0530

feat: Replace `geany` with `xed-editor`

Diffstat:

MCHANGELOG.md | 5+++++
Mfiles/_module.nix | 8+-------
Dfiles/geany/keybindings.conf | 152-------------------------------------------------------------------------------
Dfiles/geany/settings.conf | 188-------------------------------------------------------------------------------
Afiles/hyprland/xed.xml | 86+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mmodules/apps/git/git.nix | 11+++++++----
Mmodules/desktop/_wm/shell.nix | 45+++++++++++++++++++++++++++------------------
Mmodules/desktop/_wm/text.nix | 84++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
Mmodules/desktop/hyprland/_features/shell.nix | 6+-----
Mmodules/games/mc-server/_mods.nix | 30++++++++++++++++++------------
Dpackages/geany-catppuccin/default.nix | 32--------------------------------
Dpackages/geany-catppuccin/metadata.nix | 5-----
Dpackages/geany-catppuccin/selection.patch | 11-----------
Apackages/xed-extra-plugins/default.nix | 33+++++++++++++++++++++++++++++++++
Apackages/xed-extra-plugins/metadata.nix | 6++++++
15 files changed, 259 insertions(+), 443 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -1,7 +1,12 @@ ## 2026 +### October + +- Replace `geany` with `xed-editor` + ### September +- Noctalia plugin `keyhelp` - Update `mc-server` to 26.3 - Change `site` domain - Refactor `gitsite` and move `stagit` in-tree diff --git a/files/_module.nix b/files/_module.nix @@ -51,13 +51,6 @@ in { # Fastfetch fetch = builtins.readFile ./fastfetch.jsonc; - # Geany Text Editor - geany = util.map.files { - directory = ./geany; - apply = builtins.readFile; - extension = ".conf"; - }; - # 'git' Version Control git.hooks = ./git/hooks; @@ -78,6 +71,7 @@ in { hyprland = { shaders = ./hyprland/shaders; pypr = builtins.readFile ./hyprland/pypr.toml; + xed = builtins.readFile ./hyprland/xed.xml; }; # Pictures diff --git a/files/geany/keybindings.conf b/files/geany/keybindings.conf @@ -1,152 +0,0 @@ -[Bindings] -popup_gototagdefinition= -edit_transposeline=<Primary>t -edit_movelineup= -edit_movelinedown= -move_tableft=<Alt>Page_Up -move_tabright=<Alt>Page_Down -menu_new=<Primary>n -menu_open=<Primary>o -menu_open_selected=<Primary><Shift>o -menu_save=<Primary>s -menu_saveas= -menu_saveall=<Primary><Shift>s -file_properties=<Primary><Shift>v -menu_print=<Primary>p -menu_close=<Primary>w -menu_closeall=<Primary><Shift>w -menu_reloadfile=<Primary>r -menu_reloadall= -file_openlasttab= -menu_quit=<Primary>q -menu_undo=<Primary>z -menu_redo=<Primary>y -edit_duplicateline=<Primary>k -edit_deleteline=<Primary>d -edit_deletelinetoend=<Primary><Shift>Delete -edit_deletelinetobegin=<Primary><Shift>BackSpace -edit_scrolltoline=<Primary><Shift>l -edit_scrolllineup=<Alt>Up -edit_scrolllinedown=<Alt>Down -edit_completesnippet=Tab -move_snippetnextcursor= -edit_suppresssnippetcompletion= -popup_contextaction= -edit_autocomplete=<Primary>space -edit_calltip=<Primary><Shift>space -edit_wordpartcompletion=Tab -menu_cut=<Primary>x -menu_copy=<Primary>c -menu_paste=<Primary>v -edit_copyline=<Primary><Shift>c -edit_cutline=<Primary><Shift>x -menu_selectall=<Primary>a -edit_selectword=<Shift><Alt>w -edit_selectline=<Shift><Alt>l -edit_selectparagraph=<Shift><Alt>p -edit_selectwordpartleft= -edit_selectwordpartright= -edit_togglecase=<Primary><Alt>u -edit_commentlinetoggle=<Primary>e -edit_commentline= -edit_uncommentline= -edit_increaseindent=<Primary>i -edit_decreaseindent=<Primary>u -edit_increaseindentbyspace= -edit_decreaseindentbyspace= -edit_autoindent= -edit_sendtocmd1=<Primary>1 -edit_sendtocmd2=<Primary>2 -edit_sendtocmd3=<Primary>3 -edit_sendtocmd4= -edit_sendtocmd5= -edit_sendtocmd6= -edit_sendtocmd7= -edit_sendtocmd8= -edit_sendtocmd9= -edit_sendtovte= -format_reflowparagraph=<Primary>j -edit_joinlines= -menu_insert_date=<Shift><Alt>d -edit_insertwhitespace= -edit_insertlinebefore= -edit_insertlineafter= -menu_preferences=<Primary><Alt>p -menu_pluginpreferences= -menu_find=<Primary>f -menu_findnext=<Primary>g -menu_findprevious=<Primary><Shift>g -menu_findnextsel= -menu_findprevsel= -menu_replace=<Primary>h -menu_findinfiles=<Primary><Shift>f -menu_nextmessage= -menu_previousmessage= -popup_findusage=<Primary><Shift>e -popup_finddocumentusage=<Primary><Shift>d -find_markall=<Primary><Shift>m -nav_back=<Alt>Left -nav_forward=<Alt>Right -menu_gotoline=<Primary>l -edit_gotomatchingbrace=<Primary>b -edit_togglemarker=<Primary>m -edit_gotonextmarker=<Primary>period -edit_gotopreviousmarker=<Primary>comma -popup_gototagdeclaration=<Primary><Shift>t -edit_gotolinestart=Home -edit_gotolineend=End -edit_gotolinestartvisual=<Alt>Home -edit_gotolineendvisual=<Alt>End -edit_prevwordstart=<Primary>slash -edit_nextwordstart=<Primary>backslash -menu_toggleall= -menu_fullscreen=F11 -menu_messagewindow= -toggle_sidebar= -menu_zoomin=<Primary>plus -menu_zoomout=<Primary>minus -normal_size=<Primary>0 -menu_linewrap= -menu_linebreak= -menu_clone= -menu_strip_trailing_spaces= -menu_replacetabs= -menu_replacespaces= -menu_togglefold= -menu_foldall= -menu_unfoldall= -reloadtaglist=<Primary><Shift>r -remove_markers= -remove_error_indicators= -remove_markers_and_indicators= -project_new= -project_new_from_folder= -project_open= -project_properties= -project_close= -build_compile=F8 -build_link=F9 -build_make=<Shift>F9 -build_makeowntarget=<Primary><Shift>F9 -build_makeobject=<Shift>F8 -build_nexterror= -build_previouserror= -build_run=F5 -build_options= -menu_opencolorchooser= -menu_help=F1 -switch_editor=F2 -switch_search_bar=F7 -switch_message_window= -switch_compiler= -switch_messages= -switch_scribble=F6 -switch_vte=F4 -switch_sidebar= -switch_sidebar_symbol_list= -switch_sidebar_doc_list= -switch_tableft=<Primary>Page_Up -switch_tabright=<Primary>Page_Down -switch_tablastused=<Primary>Tab -move_tabfirst= -move_tablast= diff --git a/files/geany/settings.conf b/files/geany/settings.conf @@ -1,188 +0,0 @@ -[geany] -pref_main_load_session=true -pref_main_project_file_in_basedir=true -pref_main_save_winpos=true -pref_main_save_wingeom=true -pref_main_confirm_exit=false -pref_main_suppress_status_messages=false -switch_msgwin_pages=false -beep_on_errors=true -auto_focus=false -sidebar_symbol_visible=true -sidebar_openfiles_visible=true -editor_font=Monospace 10 -tagbar_font=Sans 9 -msgwin_font=Monospace 9 -show_notebook_tabs=true -show_tab_cross=true -tab_order_ltr=true -tab_order_beside=false -tab_pos_editor=2 -tab_pos_msgwin=0 -tab_label_length=1000 -show_indent_guide=false -show_white_space=false -show_line_endings=false -show_line_endings_only_when_differ=false -show_markers_margin=true -show_linenumber_margin=true -long_line_enabled=true -long_line_type=0 -long_line_column=72 -long_line_color=#C2EBC2 -symbolcompletion_max_height=10 -symbolcompletion_min_chars=4 -use_folding=true -unfold_all_children=false -use_indicators=true -line_wrapping=false -auto_close_xml_tags=true -complete_snippets=true -auto_complete_symbols=true -pref_editor_disable_dnd=false -pref_editor_smart_home_key=true -pref_editor_newline_strip=false -line_break_column=72 -auto_continue_multiline=true -comment_toggle_mark=~ -scroll_stop_at_last_line=true -autoclose_chars=0 -pref_editor_default_new_encoding=UTF-8 -pref_editor_default_open_encoding=none -default_eol_character=2 -pref_editor_new_line=true -pref_editor_ensure_convert_line_endings=false -pref_editor_replace_tabs=false -pref_editor_trail_space=false -pref_toolbar_show=true -pref_toolbar_append_to_menu=false -pref_toolbar_use_gtk_default_style=true -pref_toolbar_use_gtk_default_icon=true -pref_toolbar_icon_style=0 -pref_toolbar_icon_size=0 -pref_template_developer=V 7 -pref_template_company= -pref_template_mail=v7@vortex -pref_template_initial=V7 -pref_template_version=1.0 -pref_template_year=%Y -pref_template_date=%Y-%m-%d -pref_template_datetime=%d.%m.%Y %H:%M:%S %Z -context_action_cmd= -sidebar_visible=true -statusbar_visible=true -msgwindow_visible=true -fullscreen=false -symbols_group_by_type=true -color_picker_palette= -scribble_text=Type here what you want, use it as a notice/scratch board -scribble_pos=57 -custom_date_format= -default_open_path= -cmdline_new_files=true -notebook_double_click_hides_widgets=false -tab_close_switch_to_mru=false -tab_pos_sidebar=2 -openfiles_path_mode=2 -sidebar_pos=0 -symbols_sort_mode=0 -msgwin_orientation=1 -highlighting_invert_all=false -pref_main_search_use_current_word=true -check_detect_indent=false -detect_indent_width=false -use_tab_to_indent=true -backspace_unindent=true -pref_editor_tab_width=4 -indent_mode=2 -indent_type=1 -virtualspace=1 -change_history_markers=false -change_history_indicators=false -autocomplete_doc_words=false -completion_drops_rest_of_word=false -autocompletion_max_entries=30 -autocompletion_update_freq=250 -color_scheme=theme.conf -scroll_lines_around_cursor=0 -mru_length=10 -disk_check_timeout=30 -show_editor_scrollbars=true -brace_match_ltgt=false -use_gtk_word_boundaries=true -complete_snippets_whilst_editing=false -indent_hard_tab_width=8 -editor_ime_interaction=0 -use_atomic_file_saving=false -gio_unsafe_save_backup=false -use_gio_unsafe_file_saving=true -keep_edit_history_on_reload=true -show_keep_edit_history_on_reload_msg=true -reload_clean_doc_on_file_change=false -save_config_on_file_change=true -extract_filetype_regex=-\\*-\\s*([^\\s]+)\\s*-\\*- -allow_always_save=false -find_selection_type=0 -replace_and_find_by_default=true -show_symbol_list_expanders=true -compiler_tab_autoscroll=true -statusbar_template=line: %l / %L col: %c sel: %s %w %t %mEOL: %M encoding: %e filetype: %f scope: %S -new_document_after_close=false -msgwin_status_visible=true -msgwin_compiler_visible=true -msgwin_messages_visible=true -msgwin_scribble_visible=true -warn_on_project_close=true - -[tools] -terminal_cmd=xterm -e "/bin/sh %c" -browser_cmd= -grep_cmd=grep - -[printing] -print_cmd=lpr '%f' -use_gtk_printing=true -print_line_numbers=true -print_page_numbers=true -print_page_header=true -page_header_basename=false -page_header_datefmt=%c - -[VTE] -load_vte=true -send_cmd_prefix= -send_selection_unsafe=false - -[build-menu] -number_ft_menu_items=0 -number_non_ft_menu_items=0 -number_exec_menu_items=0 - -[search] -pref_search_hide_find_dialog=false -pref_search_always_wrap=false -pref_search_current_file_dir=true -fif_regexp=false -fif_case_sensitive=true -fif_match_whole_word=false -fif_invert_results=false -fif_recursive=false -fif_extra_options= -fif_use_extra_options=false -fif_files= -fif_files_mode=0 -find_regexp=false -find_regexp_multiline=false -find_case_sensitive=false -find_escape_sequences=false -find_match_whole_word=false -find_match_word_start=false -find_close_dialog=true -replace_regexp=false -replace_regexp_multiline=false -replace_case_sensitive=false -replace_escape_sequences=false -replace_match_whole_word=false -replace_match_word_start=false -replace_search_backwards=false -replace_close_dialog=true diff --git a/files/hyprland/xed.xml b/files/hyprland/xed.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<style-scheme id="custom" name="custom" version="1.0"> + <description>Soothing pastel theme</description> + + <!-- Palette --> + <color name="base00" value="#@base00" /> + <color name="base01" value="#@base01" /> + <color name="base02" value="#@base02" /> + <color name="base03" value="#@base03" /> + <color name="base04" value="#@base04" /> + <color name="base05" value="#@base05" /> + <color name="base06" value="#@base06" /> + <color name="base07" value="#@base07" /> + <color name="base08" value="#@base08" /> + <color name="base09" value="#@base09" /> + <color name="base0A" value="#@base0A" /> + <color name="base0B" value="#@base0B" /> + <color name="base0C" value="#@base0C" /> + <color name="base0D" value="#@base0D" /> + <color name="base0E" value="#@base0E" /> + <color name="base0F" value="#@base0F" /> + + <!-- Global Settings --> + <style name="text" foreground="base05" background="base00" /> + <style name="selection" foreground="base05" background="base04" /> + <style name="cursor" foreground="base06" /> + <style name="secondary-cursor" foreground="base06" /> + <style name="current-line" background="base02" /> + <style name="line-numbers" foreground="base05" background="base01" /> + <style name="draw-spaces" foreground="base05" /> + <style name="background-pattern" background="base00" /> + + <!-- Bracket Matching --> + <style name="bracket-match" foreground="base0E" /> + <style name="bracket-mismatch" foreground="base05" background="base09" /> + + <!-- Right Margin --> + <style name="right-margin" foreground="base05" background="base01" /> + + <!-- Search Matching --> + <style name="search-match" foreground="base05" background="base0D" /> + + <!-- Comments --> + <style name="def:comment" foreground="base04" /> + <style name="def:shebang" foreground="base04" bold="true" /> + <style name="def:doc-comment-element" italic="true" /> + + <!-- Constants --> + <style name="def:constant" foreground="base0B" /> + <style name="def:string" foreground="base0B" /> + <style name="def:special-char" foreground="base07" /> + <style name="def:special-constant" foreground="base07" /> + <style name="def:floating-point" foreground="base07" /> + + <!-- Identifiers --> + <style name="def:identifier" foreground="base0D" /> + + <!-- Statements --> + <style name="def:statement" foreground="base0D" bold="true" /> + + <!-- Types --> + <style name="def:type" foreground="base08" bold="true" /> + + <!-- Markup --> + <style name="def:emphasis" italic="true" /> + <style name="def:strong-emphasis" foreground="base0A" bold="true" /> + <style name="def:inline-code" foreground="base0B" /> + <style name="def:insertion" underline="single" /> + <style name="def:deletion" strikethrough="true" /> + <style name="def:link-text" foreground="base06" /> + <style name="def:link-symbol" foreground="base0D" bold="true" /> + <style name="def:link-destination" foreground="base0D" italic="true" underline="single" /> + <style name="def:heading" foreground="base0C" bold="true" /> + <style name="def:thematic-break" foreground="base0B" bold="true" /> + <style name="def:preformatted-section" foreground="base0B" /> + <style name="def:list-marker" foreground="base0C" bold="true" /> + + <!-- Others --> + <style name="def:preprocessor" foreground="base0C" /> + <style name="def:error" foreground="base08" bold="true" /> + <style name="def:warning" foreground="base09" /> + <style name="def:note" foreground="base0D" bold="true" /> + <style name="def:net-address" italic="true" underline="single" /> +</style-scheme> +\ No newline at end of file diff --git a/modules/apps/git/git.nix b/modules/apps/git/git.nix @@ -37,10 +37,13 @@ in { ]; # Hooks - file.".git-hooks" = { - source = files.git.hooks; - recursive = true; - }; + file = lib.mapAttrs' ( + name: _: + lib.nameValuePair ".git-hooks/${name}" { + text = builtins.readFile "${files.git.hooks}/${name}"; + executable = true; + } + ) (builtins.readDir files.git.hooks); }; # GitHub CLI diff --git a/modules/desktop/_wm/shell.nix b/modules/desktop/_wm/shell.nix @@ -11,6 +11,7 @@ ... }: let output = osConfig.gui.display or "eDP-1"; + sync = config.services.syncthing.enable; in { imports = [inputs.noctalia.homeModules.default]; gui._unmanaged = ["noctalia-shell"]; @@ -93,10 +94,9 @@ bar.main = { position = "top"; start = lib.mkDefault ["control-center" "taskbar" "media"]; - center = ["launcher" "clock" "weather"]; + center = ["launcher" "notes" "clock" "weather" "recorder"]; end = [ "group:g2" - "recorder" "clipboard" "bluetooth" "network" @@ -114,10 +114,10 @@ scale = 1.1; thickness = 30; widget_spacing = 14; - capsule_group = lib.mkDefault [ + capsule_group = [ { id = "g2"; - members = ["tray"]; + members = ["tray"] ++ lib.optional sync "syncthing"; } ]; }; @@ -125,13 +125,21 @@ # Widgets widget = { clock.anchor = true; - control-center.glyph = "menu"; network.show_label = false; + notes.type = "noctalia/notes:notes"; recorder.type = "noctalia/screen_recorder:recorder"; + control-center = { + custom_image = files.images.nixos; + custom_image_colorize = true; + }; media = { hide_when_no_media = true; title_scroll = "on_hover"; }; + weather = { + show_condition = false; + show_temperature = false; + }; taskbar = { group_by_workspace = true; inactive_opacity = 0.85; @@ -139,13 +147,10 @@ show_active_indicator = false; workspace_label_placement = "inside"; }; - weather = { - show_condition = false; - show_temperature = false; - }; - control-center = { - custom_image = files.images.nixos; - custom_image_colorize = true; + syncthing = lib.mkIf sync { + type = "rylos/syncthing:bar"; + enable_scroll = false; + show_pending = false; }; }; @@ -328,15 +333,19 @@ location = files.noctalia; } ]; - enabled = [ - "noctalia/screen_recorder" - "noctalia/timer" - "maydayv7/keyhelp" - ]; + enabled = + [ + "noctalia/notes" + "noctalia/screen_recorder" + "noctalia/timer" + "maydayv7/keyhelp" + ] + ++ lib.optional sync "rylos/syncthing"; }; + plugin_settings."noctalia/notes".panel_placement = "attached"; plugin_settings."noctalia/screen_recorder" = { copy_to_clipboard = true; - video_source = "focused"; + video_source = "portal"; }; }; diff --git a/modules/desktop/_wm/text.nix b/modules/desktop/_wm/text.nix @@ -5,21 +5,87 @@ ... }: { nixos = {pkgs, ...}: { - environment.systemPackages = [pkgs.geany]; + environment.systemPackages = [ + (pkgs.xed-editor.overrideAttrs (old: { + preFixup = + (old.preFixup or "") + + '' + gappsWrapperArgs+=( + --prefix GI_TYPELIB_PATH : "$out/lib/xed/girepository-1.0" + --prefix PYTHONPATH : "${pkgs.python3Packages.makePythonPath [pkgs.python3Packages.pycairo]}" + ) + ''; + })) + ]; }; - home = {pkgs, ...}: { + home = { + config, + pkgs, + ... + }: { xdg.mimeApps.defaultApplications = util.build.mime { - markdown = ["geany.desktop"]; - text = ["geany.desktop"]; + markdown = ["org.x.editor.desktop"]; + text = ["org.x.editor.desktop"]; + }; + + dconf.settings = { + "org/x/editor/preferences/editor" = { + auto-close = true; + auto-indent = true; + bracket-matching = true; + display-line-numbers = true; + display-right-margin = false; + draw-whitespace = false; + ensure-trailing-newline = false; + highlight-current-line = true; + scheme = "custom"; + }; + + "org/x/editor/preferences/ui" = { + minimap-visible = true; + side-panel-visible = false; + statusbar-visible = true; + }; + + "org/x/editor/plugins".active-plugins = [ + "open-uri-context-menu" + "textsize" + "docinfo" + "time" + "filebrowser" + "joinlines" + "modelines" + "spell" + "bracketcompletion" + "sort" + "xed_find_in_files" + "xed_split_pane" + "xed_smart_overview" + "xed_quick_highlight" + "xed_indentation_guides" + ]; }; home = { - persist.directories = [".config/geany"]; - file = with files.geany; { - ".config/geany/geany.conf".text = settings; - ".config/geany/keybindings.conf".text = keybindings; - ".config/geany/colorschemes/theme.conf".source = "${pkgs.custom.geany-catppuccin}/share/geany/colorschemes/catppuccin-macchiato.conf"; + persist.directories = [ + ".config/xed" + ".config/xed-find-in-files" + ".local/share/xed" + ".cache/xed" + ".config/enchant" + ]; + + file = { + ".local/share/xed/styles/custom.xml".text = util.build.theme { + colors = config.lib.stylix.colors; + file = files.hyprland.xed; + }; + + ".local/share/xed/plugins" = { + source = "${pkgs.custom.xed-extra-plugins}/share/xed/plugins"; + recursive = true; + }; }; }; }; diff --git a/modules/desktop/hyprland/_features/shell.nix b/modules/desktop/hyprland/_features/shell.nix @@ -10,7 +10,7 @@ _: { # Bar bar.main = { start = ["control-center" "taskbar" "group:g1" "media"]; - capsule_group = [ + capsule_group = lib.mkBefore [ { id = "g1"; members = [ @@ -19,10 +19,6 @@ _: { "maydayv7/hyprland-submap:indicator" ]; } - { - id = "g2"; - members = ["tray"]; - } ]; }; diff --git a/modules/games/mc-server/_mods.nix b/modules/games/mc-server/_mods.nix @@ -23,8 +23,14 @@ { name = "Lithium"; id = "gvQqBUqZ"; - url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/WXHRsMRl/lithium-fabric-0.26.1%2Bmc26.3.jar"; - hash = "sha512-rLubA3ogPwBeA6IL8dmGYBk4Srta0nZkgIoSuRljmiUB7LUvjw130n4UCZNbDb27cOAaxGZIDArkIe5AP2ScWQ=="; + url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/xS0Q8LSi/lithium-fabric-0.26.2%2Bmc26.3.jar"; + hash = "sha512-TX/uZhMu7ccf6rk5C5LJXXBY7b2tD+z6wdg2opULl6fKRjr77eYcfvNhzmXh+Sernond5b8uDgzkhq+1xdvuQA=="; + } + { + name = "Krypton"; + id = "fQEb0iXm"; + url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/UugdIYJw/krypton-0.3.2.jar"; + hash = "sha512-0dV+vUE5W3WwHxMM2VA+uNIIISQko5n/nzZ/UL6PvBxkckQrM8aG53fDFI9qYJUg6PtzLHVRV8NYyyB/1NESOg=="; } { name = "FerriteCore"; @@ -41,8 +47,8 @@ { name = "C2ME"; id = "VSNURh3q"; - url = "https://cdn.modrinth.com/data/VSNURh3q/versions/sSoXjAqP/c2me-fabric-mc26.3-0.4.2-alpha.0.88.jar"; - hash = "sha512-u3QdEYyI6m2Vd/7Rr/rMHx8Ke3JaYZ7pM0N8xeQDyPFHSnCKub1ALRVO/ePOZu9Ng+2VDAz099xlblJYNyOSJg=="; + url = "https://cdn.modrinth.com/data/VSNURh3q/versions/FXjQDzq7/c2me-fabric-mc26.3-0.4.2-alpha.0.89.jar"; + hash = "sha512-tPz4K74Vv6JT46tt9Na2ToAKLM20XUyiuAQNqH9yAz/tNPT5QBaqxQdZbHj92xjbooxmQnkBgWQsrkb64os6hQ=="; } # Server-side @@ -61,8 +67,8 @@ { name = "Veinminer"; id = "OhduvhIc"; - url = "https://cdn.modrinth.com/data/OhduvhIc/versions/G10nvigw/veinminer-fabric-2.12.2.jar"; - hash = "sha512-XjGGMpijZXnS62aYFwm57tecoBV1MbRPgXiXfEIWaAENNu9EXAAyFcKD6swPayE+eylwyDkCVAFEqtjf+yQPwA=="; + url = "https://cdn.modrinth.com/data/OhduvhIc/versions/Hpw3qIxS/veinminer-fabric-2.12.3.jar"; + hash = "sha512-7H+SYppgEL9mQzfJ1DNDcER9y8brKxgC72Enuw4MhYt9VusZ03K8WX6HgwNPj7kPDGbQRDM68jz2vCTxXawDjw=="; } { name = "VeinminerEnchant"; @@ -75,20 +81,20 @@ { name = "DistantHorizons"; id = "uCdwusMi"; - url = "https://cdn.modrinth.com/data/uCdwusMi/versions/gfi11b05/DistantHorizons-3.3.2-26.3-fabric-neoforge.jar"; - hash = "sha512-eKN41ewRezMJIwFf5lF/z6usPbRkszIdeiW25dd90RIlyDtHB+g6xyBQfFrHGKFjkQEzIpWhxYBBPPJJj0cpWQ=="; + url = "https://cdn.modrinth.com/data/uCdwusMi/versions/TGgEbP9A/DistantHorizons-3.3.4-26.3-fabric-neoforge.jar"; + hash = "sha512-C5CxsI2Zl0v8PI6Gss6yUuL5FxXtZrklAEwoM1+0Thvdu7a4BD5NTVPIftJHeJzReIsbpOP0OU7+FU4MWc/yNg=="; } { name = "JEI"; id = "u6dRKJwZ"; - url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/wS0zzU8r/jei-26.3-fabric-31.7.0.34.jar"; - hash = "sha512-xaBTc1SuYTI93+NAQUezHhGJ9eDobNODpRFzxHmXfnWDRFFi+p0EqLaPbxeiFUWVo/W+PdzDJ+BRpZF8U6bAhA=="; + url = "https://cdn.modrinth.com/data/u6dRKJwZ/versions/QfoQJyPO/jei-26.3-fabric-31.9.0.58.jar"; + hash = "sha512-zfUlfSuD8kVUKRzjn/BuW5wwuQwSE2vgL4d320uYvqzjFcguHsbidVPEQs0q0fufd0QiNbXOMYMYWixH2sWtuw=="; } { name = "Jade"; id = "nvQzSEkH"; - url = "https://cdn.modrinth.com/data/nvQzSEkH/versions/lt43vWtF/Jade-mc26.3-Fabric-26.3.1.jar"; - hash = "sha512-E1nWV2IU//rct71CAr/RYGyCerbHUUPLx3Ryae19QTH12yJqkUuakkyskuWWx5lOb+MwNnH/jVotzUHK9hPnrg=="; + url = "https://cdn.modrinth.com/data/nvQzSEkH/versions/71CTWqdE/Jade-mc26.3-Fabric-26.3.5.jar"; + hash = "sha512-LnMx5i62ZYJorpLcQt6LRp9Q3WxqnSVGpvZJuul8LN/Y1MFWCUjPRiaRddLHnGxHo2oCaF451HZ2jRj7sqKHAw=="; } { name = "SimpleVC"; diff --git a/packages/geany-catppuccin/default.nix b/packages/geany-catppuccin/default.nix @@ -1,32 +0,0 @@ -{ - lib, - pkgs, - ... -}: -with pkgs; let - metadata = import ./metadata.nix; -in - stdenv.mkDerivation { - pname = "geany-catppuccin"; - version = metadata.rev; - - src = fetchFromGitHub { - owner = "catppuccin"; - repo = "geany"; - inherit (metadata) rev sha256; - }; - - dontBuild = true; - patches = [./selection.patch]; - installPhase = '' - mkdir -p $out/share/geany/colorschemes/ - cp -r ./src/. $out/share/geany/colorschemes/ - ''; - - meta = { - description = "Soothing pastel theme for Geany"; - homepage = metadata.repo; - license = lib.licenses.mit; - maintainers = ["maydayv7"]; - }; - } diff --git a/packages/geany-catppuccin/metadata.nix b/packages/geany-catppuccin/metadata.nix @@ -1,5 +0,0 @@ -{ - repo = "https://github.com/catppuccin/geany"; - rev = "ab96041d6ec462b19e5d70c232e8a20bc738ca99"; - sha256 = "sha256-9QwL/tTqjkF7R9SP/1tGphBcgrjxCTrKqKbp5JuG/B8="; -} diff --git a/packages/geany-catppuccin/selection.patch b/packages/geany-catppuccin/selection.patch @@ -1,11 +0,0 @@ ---- a/src/catppuccin-macchiato.conf -+++ b/src/catppuccin-macchiato.conf -@@ -46,7 +46,7 @@ error=red;yellow;false;true - op=blue;base;true;false - # Editor UI - # selection: words; background --selection=pink;blue;false;false -+selection=;surface1;false;true - current_line=;surface0;true - brace_good=green;overlay1;true;true - brace_bad=red;overlay1;true;true diff --git a/packages/xed-extra-plugins/default.nix b/packages/xed-extra-plugins/default.nix @@ -0,0 +1,33 @@ +{ + lib, + pkgs, + ... +}: let + metadata = import ./metadata.nix; +in + pkgs.stdenvNoCC.mkDerivation { + pname = "xed-extra-plugins"; + version = metadata.rev; + + src = pkgs.fetchFromGitHub { + owner = "gabriellaraujocoding"; + repo = "xed-extra-plugins"; + inherit (metadata) rev sha256; + }; + + dontBuild = true; + installPhase = '' + runHook preInstall + mkdir -p "$out/share/xed/plugins" + cp -r xed-* "$out/share/xed/plugins/" + runHook postInstall + ''; + + meta = { + description = "Extra plugins for the Xed text editor"; + homepage = metadata.repo; + license = with lib.licenses; [gpl2Plus bsd3]; + platforms = lib.platforms.linux; + maintainers = ["maydayv7"]; + }; + } diff --git a/packages/xed-extra-plugins/metadata.nix b/packages/xed-extra-plugins/metadata.nix @@ -0,0 +1,6 @@ +{ + repo = "https://github.com/gabriellaraujocoding/xed-extra-plugins"; + branch = "main"; + rev = "3f09499f97e5e014dea96e4e9df38f9b8108989b"; + sha256 = "sha256-VgLCS2sxVh8SsSqzt/fQACyyNrtGkv0HKAjS+a2oii4="; +}