diff --git a/modules/user/blender/default.nix b/modules/user/blender/default.nix index e019494..c6a6c89 100644 --- a/modules/user/blender/default.nix +++ b/modules/user/blender/default.nix @@ -10,15 +10,7 @@ in { }; config = { - home.packages = - [ pkgs.blender-hip - (pkgs.writeScriptBin "declarative-blender-prefs" - '' - #!/bin/sh - ${pkgs.blender-hip}/bin/blender --python ${./applyprefs.py}; - '') - ]; - home.file.".config/declarative-blender-prefs/applyprefs.py".source = ./applyprefs.py; + home.packages = [ pkgs.blender-hip ]; home.file.".config/blender/extensions/node_pie.zip".source = builtins.fetchurl { url = "https://github.com/strike-digital/node_pie/releases/download/1.2.38/node_pie_1_2_38.zip"; sha256 = "sha256:00kscj7dkl80kc482jg3kcw9vhr1n64n44ld2xncr6gxil679fk2"; diff --git a/modules/user/emacs/default.nix b/modules/user/emacs/default.nix index db47798..0844cb3 100644 --- a/modules/user/emacs/default.nix +++ b/modules/user/emacs/default.nix @@ -42,7 +42,6 @@ in { typescript-mode sass-mode rainbow-mode - default-text-scale (epkgs.callPackage ( { lib, fetchurl, trivialBuild }: diff --git a/modules/user/emacs/init.el b/modules/user/emacs/init.el index 0cc4880..2bea792 100644 --- a/modules/user/emacs/init.el +++ b/modules/user/emacs/init.el @@ -248,14 +248,6 @@ (define-key evil-motion-state-map (kbd "RET") nil) (evil-mode 1)) -(use-package default-text-scale - :after (evil) - :config - ;; Zoom in/out keybinds - (evil-define-key nil 'global (kbd "C--") 'default-text-scale-decrease) - (evil-define-key nil 'global (kbd "C-+") 'default-text-scale-reset) - (evil-define-key nil 'global (kbd "C-=") 'default-text-scale-increase)) - (use-package evil-collection :after (evil) :custom @@ -332,7 +324,6 @@ (evil-define-key 'motion 'global (kbd "pg") 'projectile-switch-project) (evil-define-key 'motion 'global (kbd "pf") 'projectile-find-file) (evil-define-key 'motion 'global (kbd "pa") 'projectile-add-known-project) - (evil-define-key 'motion 'global (kbd "pr") 'projectile-remove-known-project) (evil-define-key 'motion 'global (kbd "/") 'projectile-grep) (evil-define-key 'motion 'global (kbd "gg") 'magit-status) (evil-define-key 'motion 'global (kbd "gt") 'git-timemachine-toggle) diff --git a/modules/user/godot/declarative-godot-settings/apply_settings.gd b/modules/user/godot/declarative-godot-settings/apply_settings.gd deleted file mode 100644 index ac35778..0000000 --- a/modules/user/godot/declarative-godot-settings/apply_settings.gd +++ /dev/null @@ -1,93 +0,0 @@ -# HACK -# Declarative settings in Godot don't really work without patching Godot -# source code. Workaround is to store a script to setup all of the settings. -# Annoying thing is that it can only be run from within the editor! - -# ALERT -# Open this script within it's contained project and press Ctrl-Shift-x to apply. - -@tool -extends EditorScript - -var settings: EditorSettings = EditorInterface.get_editor_settings() - -func apply_setting(setting_name: String, new_value): - var old_value = settings.get_setting(setting_name) - settings.set_setting(setting_name, new_value) - print(setting_name + ": " + str(old_value) + " -> " + str(new_value)) - -func _run(): - print("Applying custom Godot editor settings:") - apply_setting("interface/editor/dock_tab_style", 2) - apply_setting("interface/theme/preset", "Custom") - apply_setting("inerface/theme/base_color", Color("{{base00}}ff")) - apply_setting("interface/theme/accent_color", Color("{{base09}}ff")) - apply_setting("text_editor/theme/color_theme", "Custom") - apply_setting("text_editor/theme/highlighting/symbol_color",Color("{{base0E}}ff")) - apply_setting("text_editor/theme/highlighting/keyword_color",Color("{{base0E}}ff")) - apply_setting("text_editor/theme/highlighting/control_flow_keyword_color",Color("{{base09}}ff")) - apply_setting("text_editor/theme/highlighting/control_flow_keyword_color",Color("{{base0A}}ff")) - apply_setting("text_editor/theme/highlighting/base_type_color",Color("{{base09}}ff")) - apply_setting("text_editor/theme/highlighting/engine_type_color",Color("{{base09}}ff")) - apply_setting("text_editor/theme/highlighting/user_type_color",Color("{{base09}}ff")) - apply_setting("text_editor/theme/highlighting/comment_color",Color("c9c8c980")) - apply_setting("text_editor/theme/highlighting/doc_comment_color",Color("{{base0B}}cc")) - apply_setting("text_editor/theme/highlighting/string_color",Color("{{base0B}}ff")) - apply_setting("text_editor/theme/highlighting/background_color",Color("{{base00}}ff")) - apply_setting("text_editor/theme/highlighting/completion_background_color",Color("{{base01}}ff")) - apply_setting("text_editor/theme/highlighting/completion_selected_color",Color("ffffff12")) - apply_setting("text_editor/theme/highlighting/completion_existing_color",Color("ffffff24")) - apply_setting("text_editor/theme/highlighting/completion_scroll_color",Color("ffffff4a")) - apply_setting("text_editor/theme/highlighting/completion_scroll_hovered_color",Color("ffffff66")) - apply_setting("text_editor/theme/highlighting/completion_font_color",Color("{{base07}}ff")) - apply_setting("text_editor/theme/highlighting/text_color",Color("{{base07}}ff")) - apply_setting("text_editor/theme/highlighting/line_number_color",Color("c9c8c980")) - apply_setting("text_editor/theme/highlighting/safe_line_number_color",Color("{{base0D}}bf")) - apply_setting("text_editor/theme/highlighting/caret_color",Color("{{base07}}ff")) - apply_setting("text_editor/theme/highlighting/caret_background_color",Color("{{base00}}ff")) - apply_setting("text_editor/theme/highlighting/text_selected_color",Color("ffffff12")) - apply_setting("text_editor/theme/highlighting/selection_color",Color("{{base09}}33")) - apply_setting("text_editor/theme/highlighting/brace_mismatch_color",Color("{{base08}}ff")) - apply_setting("text_editor/theme/highlighting/current_line_color",Color("ffffff12")) - apply_setting("text_editor/theme/highlighting/line_length_guideline_color",Color("{{base02}}ff")) - apply_setting("text_editor/theme/highlighting/word_highlighted_color",Color("ffffff12")) - apply_setting("text_editor/theme/highlighting/number_color",Color("{{base0D}}ff")) - apply_setting("text_editor/theme/highlighting/function_color",Color("{{base0E}}ff")) - apply_setting("text_editor/theme/highlighting/member_variable_color",Color("{{base0A}}ff")) - apply_setting("text_editor/theme/highlighting/mark_color",Color("{{base08}}4d")) - apply_setting("text_editor/theme/highlighting/warning_color",Color("{{base0A}}4d")) - apply_setting("text_editor/theme/highlighting/bookmark_color",Color("{{base0E}}ff")) - apply_setting("text_editor/theme/highlighting/breakpoint_color",Color("{{base08}}ff")) - apply_setting("text_editor/theme/highlighting/executing_line_color",Color("{{base0C}}ff")) - apply_setting("text_editor/theme/highlighting/code_folding_color",Color("ffffff45")) - apply_setting("text_editor/theme/highlighting/folded_code_region_color",Color("{{base08}}33")) - apply_setting("text_editor/theme/highlighting/search_result_color",Color("{{base0C}}33")) - apply_setting("text_editor/theme/highlighting/search_result_border_color",Color("{{base0F}}33")) - apply_setting("text_editor/theme/highlighting/gdscript/function_definition_color",Color("{{base0F}}ff")) - apply_setting("text_editor/theme/highlighting/gdscript/global_function_color",Color("{{base0E}}ff")) - apply_setting("text_editor/theme/highlighting/gdscript/node_path_color",Color("{{base0B}}ff")) - apply_setting("text_editor/theme/highlighting/gdscript/node_reference_color",Color("{{base0A}}ff")) - apply_setting("text_editor/theme/highlighting/gdscript/annotation_color",Color("{{base0C}}ff")) - apply_setting("text_editor/theme/highlighting/gdscript/string_name_color",Color("{{base0D}}ff")) - apply_setting("text_editor/theme/highlighting/comment_markers/critical_color",Color("{{base08}}ff")) - apply_setting("text_editor/theme/highlighting/comment_markers/warning_color",Color("{{base0A}}ff")) - apply_setting("text_editor/theme/highlighting/comment_markers/notice_color",Color("{{base0D}}ff")) - apply_setting("interface/theme/contrast", 0.35) - apply_setting("interface/scene_tabs/restore_scenes_on_load", false) - apply_setting("interface/multi_window/enable", false) - apply_setting("interface/multi_window/restore_windows_on_load", false) - apply_setting("network/connection/check_for_updates", 0) - apply_setting("network/language_server/show_native_symbols_in_editor", true) - apply_setting("network/language_server/use_thread", true) - apply_setting("filesystem/external_programs/raster_image_editor", "pinta") - apply_setting("filesystem/external_programs/vector_image_editor", "inkscape") - apply_setting("filesystem/external_programs/audio_editor", "tenacity") - apply_setting("filesystem/external_programs/3d_model_editor", "blender") - apply_setting("filesystem/external_programs/terminal_emulator", "alacritty") - apply_setting("filesystem/external_programs/terminal_emulator_flags", "") - apply_setting("filesystem/directories/autoscan_project_path", "/home/emmet/Projects") - apply_setting("filesystem/directories/default_project_path", "/home/emmet/Projects") - apply_setting("filesystem/import/blender/blender_path", "/home/emmet/.nix-profile/bin/blender") - apply_setting("text_editor/behavior/indent/size", 2) - apply_setting("editors/3d/navigation/emulate_numpad", false) - apply_setting("project_manager/directory_naming_convention", 2) diff --git a/modules/user/godot/declarative-godot-settings/apply_settings.gd.uid b/modules/user/godot/declarative-godot-settings/apply_settings.gd.uid deleted file mode 100644 index 66f0f3f..0000000 --- a/modules/user/godot/declarative-godot-settings/apply_settings.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cucm2ubvgnpl0 diff --git a/modules/user/godot/declarative-godot-settings/default.nix b/modules/user/godot/declarative-godot-settings/default.nix deleted file mode 100644 index 4c1e9c1..0000000 --- a/modules/user/godot/declarative-godot-settings/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.userSettings.godot; -in -{ - config = lib.mkIf cfg.enable { - home.file.".config/declarative-godot-settings/apply_settings.gd".source = config.lib.stylix.colors { - template = builtins.readFile ./apply_settings.gd; - extension = ".gd"; - }; - home.file.".config/declarative-godot-settings/apply_settings.gd.uid".source = ./apply_settings.gd.uid; - home.file.".config/declarative-godot-settings/project.godot".source = ./project.godot; - home.file.".config/declarative-godot-settings/dummy_scene.tscn".source = ./dummy_scene.tscn; - - home.packages = [ - (pkgs.writeScriptBin "declarative-godot-settings" '' - #!/bin/sh - ${pkgs.godot}/bin/godot --editor --path ${config.home.homeDirectory}/.config/declarative-godot-settings; - '') - ]; - }; -} diff --git a/modules/user/godot/declarative-godot-settings/dummy_scene.tscn b/modules/user/godot/declarative-godot-settings/dummy_scene.tscn deleted file mode 100644 index ed07523..0000000 --- a/modules/user/godot/declarative-godot-settings/dummy_scene.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=3 uid="uid://do6bjr26bosb2"] - -[node name="DummyScene" type="Node"] diff --git a/modules/user/godot/declarative-godot-settings/project.godot b/modules/user/godot/declarative-godot-settings/project.godot deleted file mode 100644 index 2a5d83f..0000000 --- a/modules/user/godot/declarative-godot-settings/project.godot +++ /dev/null @@ -1,16 +0,0 @@ -; Engine configuration file. -; It's best edited using the editor UI and not directly, -; since the parameters that go here are not all obvious. -; -; Format: -; [section] ; section goes between [] -; param=value ; assign values to parameters - -config_version=5 - -[application] - -config/name="Declarative Godot Settings" -run/main_scene="uid://do6bjr26bosb2" -config/features=PackedStringArray("4.5", "Forward Plus") -config/icon="res://icon.svg" diff --git a/modules/user/godot/default.nix b/modules/user/godot/default.nix index 4906182..d8a4307 100644 --- a/modules/user/godot/default.nix +++ b/modules/user/godot/default.nix @@ -14,5 +14,182 @@ in { godot_4 ]; + # TODO fix other colors + # TODO write script that applies these settings not as a symlink + #home.file.".config/godot/editor_settings-4.3.tres".text = '' + # [gd_resource type="EditorSettings" format=3] + # + # [resource] + # interface/editor/separate_distraction_mode = true + # interface/theme/preset = "Custom" + # interface/theme/spacing_preset = "Custom" + # interface/theme/base_color = Color(''+config.lib.stylix.colors.base00-dec-r+'',''+config.lib.stylix.colors.base00-dec-g+'', ''+config.lib.stylix.colors.base00-dec-b+'', 0.8) + + # interface/theme/accent_color = Color(''+config.lib.stylix.colors.base08-dec-r+'',''+config.lib.stylix.colors.base08-dec-g+'', ''+config.lib.stylix.colors.base08-dec-b+'', 1) + + # interface/theme/contrast = 0.3 + # interface/theme/icon_saturation = 1.55 + # interface/theme/relationship_line_opacity = 0.35 + # interface/theme/border_size = 1 + # interface/theme/corner_radius = 6 + # interface/theme/additional_spacing = 1 + # interface/touchscreen/enable_pan_and_scale_gestures = true + # interface/touchscreen/scale_gizmo_handles = 2.0 + # interface/multi_window/enable = false + # interface/multi_window/restore_windows_on_load = false + # filesystem/external_programs/raster_image_editor = "krita" + # filesystem/external_programs/vector_image_editor = "inkscape" + # filesystem/external_programs/3d_model_editor = "blender" + # filesystem/external_programs/terminal_emulator = "''+config.userSettings.terminal+''" + + # filesystem/directories/default_project_path = "/home/''+config.home.username+''/Projects" + + # text_editor/theme/highlighting/symbol_color = Color(0.67, 0.79, 1, 1) + # text_editor/theme/highlighting/keyword_color = Color(1, 0.44, 0.52, 1) + # text_editor/theme/highlighting/control_flow_keyword_color = Color(1, 0.55, 0.8, 1) + # text_editor/theme/highlighting/base_type_color = Color(0.26, 1, 0.76, 1) + # text_editor/theme/highlighting/engine_type_color = Color(0.56, 1, 0.86, 1) + # text_editor/theme/highlighting/user_type_color = Color(0.78, 1, 0.93, 1) + # text_editor/theme/highlighting/comment_color = Color(0.764706, 0.769608, 0.77451, 0.5) + # text_editor/theme/highlighting/doc_comment_color = Color(0.6, 0.7, 0.8, 0.8) + # text_editor/theme/highlighting/string_color = Color(1, 0.93, 0.63, 1) + # text_editor/theme/highlighting/background_color = Color(0.0323529, 0.0431373, 0.0539216, 1) + # text_editor/theme/highlighting/completion_background_color = Color(0.0588235, 0.0784314, 0.0980392, 1) + # text_editor/theme/highlighting/completion_selected_color = Color(1, 1, 1, 0.07) + # text_editor/theme/highlighting/completion_existing_color = Color(1, 1, 1, 0.14) + # text_editor/theme/highlighting/completion_font_color = Color(0.764706, 0.769608, 0.77451, 1) + # text_editor/theme/highlighting/text_color = Color(0.764706, 0.769608, 0.77451, 1) + # text_editor/theme/highlighting/line_number_color = Color(0.764706, 0.769608, 0.77451, 0.5) + # text_editor/theme/highlighting/safe_line_number_color = Color(0.764706, 0.923529, 0.77451, 0.75) + # text_editor/theme/highlighting/caret_color = Color(1, 1, 1, 1) + # text_editor/theme/highlighting/selection_color = Color(0.941176, 0.443137, 0.470588, 0.4) + # text_editor/theme/highlighting/brace_mismatch_color = Color(1, 0.47, 0.42, 1) + # text_editor/theme/highlighting/current_line_color = Color(1, 1, 1, 0.07) + # text_editor/theme/highlighting/line_length_guideline_color = Color(0.0588235, 0.0784314, 0.0980392, 1) + # text_editor/theme/highlighting/word_highlighted_color = Color(1, 1, 1, 0.07) + # text_editor/theme/highlighting/number_color = Color(0.63, 1, 0.88, 1) + # text_editor/theme/highlighting/function_color = Color(0.34, 0.7, 1, 1) + # text_editor/theme/highlighting/member_variable_color = Color(0.736, 0.88, 1, 1) + # text_editor/theme/highlighting/mark_color = Color(1, 0.47, 0.42, 0.3) + # text_editor/theme/highlighting/breakpoint_color = Color(1, 0.47, 0.42, 1) + # text_editor/theme/highlighting/code_folding_color = Color(1, 1, 1, 0.27) + # text_editor/theme/highlighting/search_result_color = Color(1, 1, 1, 0.07) + # text_editor/appearance/whitespace/draw_tabs = false + # text_editor/behavior/indent/type = 1 + # text_editor/behavior/indent/size = 2 + # text_editor/behavior/files/trim_trailing_whitespace_on_save = true + # editors/panning/2d_editor_panning_scheme = 1 + # editors/panning/sub_editors_panning_scheme = 1 + # editors/panning/simple_panning = true + # project_manager/directory_naming_convention = 3 + # asset_library/available_urls = { + # "godotengine.org (Official)": "https://godotengine.org/asset-library/api" + # } + # asset_library/use_threads = true + # export/android/java_sdk_path = "" + # export/android/android_sdk_path = "" + # export/android/debug_keystore = "/home/emmet/.local/share/godot/keystores/debug.keystore" + # export/android/debug_keystore_user = "androiddebugkey" + # export/android/debug_keystore_pass = "android" + # export/android/force_system_user = false + # export/android/shutdown_adb_on_exit = true + # export/android/one_click_deploy_clear_previous_install = false + # export/android/use_wifi_for_remote_debug = false + # export/android/wifi_remote_debug_host = "localhost" + # export/macos/rcodesign = "" + # export/web/http_host = "localhost" + # export/web/http_port = 8060 + # export/web/use_tls = false + # export/web/tls_key = "" + # export/web/tls_certificate = "" + # export/windows/rcedit = "" + # export/windows/osslsigncode = "" + # export/windows/wine = "/home/emmet/.nix-profile/bin/wine64" + # _default_feature_profile = "" + # interface/editors/show_scene_tree_root_selection = true + # interface/editors/derive_script_globals_by_name = true + # docks/scene_tree/ask_before_deleting_related_animation_tracks = true + # _use_favorites_root_selection = false + # filesystem/file_server/port = 6010 + # filesystem/file_server/password = "" + # editors/3d/manipulator_gizmo_size = 80 + # editors/3d/manipulator_gizmo_opacity = 0.9 + # editors/3d/navigation/show_viewport_rotation_gizmo = true + # editors/3d/navigation/show_viewport_navigation_gizmo = false + # text_editor/behavior/files/auto_reload_and_parse_scripts_on_save = true + # text_editor/behavior/files/open_dominant_script_on_scene_change = false + # text_editor/external/use_external_editor = false + # text_editor/external/exec_path = "" + # text_editor/script_list/script_temperature_enabled = true + # text_editor/script_list/script_temperature_history_size = 15 + # text_editor/script_list/group_help_pages = true + # text_editor/script_list/sort_scripts_by = 0 + # text_editor/script_list/list_script_names_as = 0 + # text_editor/external/exec_flags = "{file}" + # version_control/username = "" + # version_control/ssh_public_key_path = "" + # version_control/ssh_private_key_path = "" + # editors/bone_mapper/handle_colors/unset = Color(0.3, 0.3, 0.3, 1) + # editors/bone_mapper/handle_colors/set = Color(0.1, 0.6, 0.25, 1) + # editors/bone_mapper/handle_colors/missing = Color(0.8, 0.2, 0.8, 1) + # editors/bone_mapper/handle_colors/error = Color(0.8, 0.2, 0.2, 1) + # network/debug_adapter/remote_port = 6006 + # network/debug_adapter/request_timeout = 1000 + # network/debug_adapter/sync_breakpoints = false + # editors/3d_gizmos/gizmo_settings/path3d_tilt_disk_size = 0.8 + # editors/3d_gizmos/gizmo_colors/path_tilt = Color(1, 1, 0.4, 0.9) + # editors/3d_gizmos/gizmo_colors/skeleton = Color(1, 0.8, 0.4, 1) + # editors/3d_gizmos/gizmo_colors/selected_bone = Color(0.8, 0.3, 0, 1) + # editors/3d_gizmos/gizmo_settings/bone_axis_length = 0.1 + # editors/3d_gizmos/gizmo_settings/bone_shape = 1 + # editors/3d_gizmos/gizmo_colors/csg = Color(0, 0.4, 1, 0.15) + # editors/grid_map/editor_side = 1 + # editors/grid_map/palette_min_width = 230 + # editors/grid_map/preview_size = 64 + # export/ssh/ssh = "" + # export/ssh/scp = "" + # network/language_server/remote_host = "127.0.0.1" + # network/language_server/remote_port = 6005 + # network/language_server/enable_smart_resolve = true + # network/language_server/show_native_symbols_in_editor = false + # network/language_server/use_thread = false + # network/language_server/poll_limit_usec = 100000 + # text_editor/theme/highlighting/gdscript/function_definition_color = Color(0.4, 0.9, 1, 1) + # text_editor/theme/highlighting/gdscript/global_function_color = Color(0.64, 0.64, 0.96, 1) + # text_editor/theme/highlighting/gdscript/node_path_color = Color(0.72, 0.77, 0.49, 1) + # text_editor/theme/highlighting/gdscript/node_reference_color = Color(0.39, 0.76, 0.35, 1) + # text_editor/theme/highlighting/gdscript/annotation_color = Color(1, 0.7, 0.45, 1) + # text_editor/theme/highlighting/gdscript/string_name_color = Color(1, 0.76, 0.65, 1) + # text_editor/theme/highlighting/comment_markers/critical_color = Color(0.77, 0.35, 0.35, 1) + # text_editor/theme/highlighting/comment_markers/warning_color = Color(0.72, 0.61, 0.48, 1) + # text_editor/theme/highlighting/comment_markers/notice_color = Color(0.56, 0.67, 0.51, 1) + # text_editor/theme/highlighting/comment_markers/critical_list = "ALERT,ATTENTION,CAUTION,CRITICAL,DANGER,SECURITY" + # text_editor/theme/highlighting/comment_markers/warning_list = "BUG,DEPRECATED,FIXME,HACK,TASK,TBD,TODO,WARNING" + # text_editor/theme/highlighting/comment_markers/notice_list = "INFO,NOTE,NOTICE,TEST,TESTING" + # editors/3d_gizmos/gizmo_colors/camera = Color(0.8, 0.4, 0.8, 1) + # editors/3d_gizmos/gizmo_colors/stream_player_3d = Color(0.4, 0.8, 1, 1) + # editors/3d_gizmos/gizmo_colors/occluder = Color(0.8, 0.5, 1, 1) + # editors/3d_gizmos/gizmo_colors/visibility_notifier = Color(0.8, 0.5, 0.7, 1) + # editors/3d_gizmos/gizmo_colors/particles = Color(0.8, 0.7, 0.4, 1) + # editors/3d_gizmos/gizmo_colors/particle_attractor = Color(1, 0.7, 0.5, 1) + # editors/3d_gizmos/gizmo_colors/particle_collision = Color(0.5, 0.7, 1, 1) + # editors/3d_gizmos/gizmo_colors/reflection_probe = Color(0.6, 1, 0.5, 1) + # editors/3d_gizmos/gizmo_colors/decal = Color(0.6, 0.5, 1, 1) + # editors/3d_gizmos/gizmo_colors/voxel_gi = Color(0.5, 1, 0.6, 1) + # editors/3d_gizmos/gizmo_colors/lightmap_lines = Color(0.5, 0.6, 1, 1) + # editors/3d_gizmos/gizmo_colors/lightprobe_lines = Color(0.5, 0.6, 1, 1) + # editors/3d_gizmos/gizmo_colors/joint_body_a = Color(0.6, 0.8, 1, 1) + # editors/3d_gizmos/gizmo_colors/joint_body_b = Color(0.6, 0.9, 1, 1) + # editors/3d_gizmos/gizmo_colors/fog_volume = Color(0.5, 0.7, 1, 1) + # text_editor/help/sort_functions_alphabetically = true + # metadata/script_setup_templates_dictionary = { + # "AnimatedSprite2D": "0NodeDefault", + # "Area2D": "0NodeDefault", + # "CanvasLayer": "0NodeDefault", + # "Node": "0NodeDefault", + # "Node2D": "0NodeDefault" + # } + # metadata/export_template_download_directory = "/home/emmet/.cache/godot" + #''; }; } diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index 13fe522..49dec73 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -49,7 +49,6 @@ in XCURSOR_THEME = config.gtk.cursorTheme.name; GDK_DEBUG = "portals"; GTK_USE_PORTALS = 1; - GRIM_DEFAULT_DIR = config.xdg.userDirs.extraConfig.XDG_SCREENSHOT_DIR; }; xdg.portal = diff --git a/modules/user/recording/default.nix b/modules/user/recording/default.nix index 065a278..ba44907 100644 --- a/modules/user/recording/default.nix +++ b/modules/user/recording/default.nix @@ -10,13 +10,8 @@ in { }; config = lib.mkIf cfg.enable { - programs.obs-studio.enable = true; - programs.obs-studio.plugins = with pkgs.obs-studio-plugins; [ - obs-gstreamer - obs-vaapi - obs-scale-to-sound - ]; home.packages = with pkgs; [ + obs-studio kdePackages.kdenlive tenacity ardour diff --git a/modules/user/xdg/default.nix b/modules/user/xdg/default.nix index 65ddca7..98c1f95 100644 --- a/modules/user/xdg/default.nix +++ b/modules/user/xdg/default.nix @@ -32,7 +32,6 @@ in { XDG_VM_DIR = "${config.home.homeDirectory}/Machines"; XDG_NOTES_DIR = "${config.home.homeDirectory}/Notes"; XDG_KP_DIR = "${config.home.homeDirectory}/KP"; - XDG_SCREENSHOT_DIR = "${config.home.homeDirectory}/Screenshots"; }; }; xdg.mime.enable = true; diff --git a/modules/user/yazi/default.nix b/modules/user/yazi/default.nix index 92a15fe..e3eda20 100644 --- a/modules/user/yazi/default.nix +++ b/modules/user/yazi/default.nix @@ -13,41 +13,8 @@ in { programs.yazi = { enable = true; enableZshIntegration = true; - theme.icon = { - dirs = [ - { name = ".config"; text = ""; } - { name = ".git"; text = ""; } - { name = ".github"; text = ""; } - { name = ".npm"; text = ""; } - { name = "Desktop"; text = ""; } - { name = "Development"; text = ""; } - { name = "Documents"; text = ""; } - { name = "Downloads"; text = ""; } - { name = "Library"; text = ""; } - { name = "Movies"; text = ""; } - { name = "Music"; text = ""; } - { name = "Pictures"; text = ""; } - { name = "Public"; text = ""; } - { name = "Videos"; text = ""; } - { name = "nixos"; text = ""; } - { name = "Archive"; text = ""; } - { name = "Media"; text = ""; } - { name = "Podcasts"; text = ""; } - { name = "Drive"; text = ""; } - { name = "KP"; text = ""; } - { name = "Books"; text = ""; } - { name = "Games"; text = ""; } - { name = "Game Saves"; text = ""; } - { name = "Templates"; text = ""; } - { name = "Notes"; text = ""; } - { name = "Projects"; text = ""; } - { name = "Screenshots"; text = ""; } - ]; - }; keymap.manager.prepend_keymap = [ - { run = "cd ~/Projects"; on = [ "g" "p" ]; desc = "Go to projects"; } - { run = "cd ~/Screenshots"; on = [ "g" "s" ]; desc = "Go to screenshots"; } { run = "shell ' \"$@\"' --cursor=0 --interactive"; on = [ "@" ]; } { run = "hidden toggle"; on = [ "" ]; } { run = "yank"; on = [ "y" "y" ]; }