diff --git a/flake.lock b/flake.lock index 2611226..12078fc 100644 --- a/flake.lock +++ b/flake.lock @@ -637,27 +637,23 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "nixpkgs-stable": [ - "nixpkgs" - ], - "nixpkgs-unstable": [ + "nixpkgs": [ "nixpkgs" ], "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1746806042, - "narHash": "sha256-Hx92i3f5IjHaWpReyCKvGdqG55bZFU3wxGzA3wv9VLA=", + "lastModified": 1755793784, + "narHash": "sha256-rRUTLQJViPB7yPzCGGB1ff1lv2HppPmaPtW9ozgVGTQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "7f9bb3c0e54f585e11259bc0c9064813d061929c", + "rev": "66e5081721e4e2158343a4b239b7ffc09dc8cbf2", "type": "github" }, "original": { "owner": "ghostty-org", "repo": "ghostty", - "rev": "7f9bb3c0e54f585e11259bc0c9064813d061929c", "type": "github" } }, @@ -2352,7 +2348,8 @@ "zig": { "inputs": { "flake-compat": [ - "ghostty" + "ghostty", + "flake-compat" ], "flake-utils": [ "ghostty", @@ -2360,7 +2357,7 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { @@ -2385,7 +2382,7 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { @@ -2398,8 +2395,8 @@ }, "original": { "owner": "jcollie", - "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "type": "github" } } diff --git a/flake.nix b/flake.nix index 676bc4d..ee05f96 100644 --- a/flake.nix +++ b/flake.nix @@ -22,9 +22,9 @@ }; ghostty = { - url = "github:ghostty-org/ghostty?rev=7f9bb3c0e54f585e11259bc0c9064813d061929c"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.nixpkgs-unstable.follows = "nixpkgs"; + # url = "github:ghostty-org/ghostty?rev=7f9bb3c0e54f585e11259bc0c9064813d061929c"; + url = "github:ghostty-org/ghostty"; + inputs.nixpkgs.follows = "nixpkgs"; }; yazi = { diff --git a/home/config/btop/btop.conf b/home/config/btop/btop.conf deleted file mode 100755 index 609e3e2..0000000 --- a/home/config/btop/btop.conf +++ /dev/null @@ -1,64 +0,0 @@ -color_theme = "catppuccin_macchiato.theme" -theme_background = False -truecolor = True -force_tty = False -presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty" -vim_keys = True -rounded_corners = True -graph_symbol = "braille" -graph_symbol_cpu = "default" -graph_symbol_mem = "default" -graph_symbol_net = "default" -graph_symbol_proc = "default" -shown_boxes = "cpu mem net proc" -update_ms = 1000 -proc_sorting = "cpu lazy" -proc_reversed = False -proc_tree = False -proc_colors = True -proc_gradient = True -proc_per_core = False -proc_mem_bytes = True -proc_cpu_graphs = True -proc_info_smaps = False -proc_left = False -proc_filter_kernel = False -cpu_graph_upper = "total" -cpu_graph_lower = "total" -cpu_invert_lower = True -cpu_single_graph = False -cpu_bottom = False -show_uptime = True -check_temp = True -cpu_sensor = "Auto" -show_coretemp = True -cpu_core_map = "" -temp_scale = "celsius" -base_10_sizes = False -show_cpu_freq = True -clock_format = "%X" -background_update = True -custom_cpu_name = "" -disks_filter = "" -mem_graphs = True -mem_below_net = False -zfs_arc_cached = True -show_swap = True -swap_disk = True -show_disks = True -only_physical = True -use_fstab = True -zfs_hide_datasets = False -disk_free_priv = False -show_io_stat = True -io_mode = False -io_graph_combined = False -io_graph_speeds = "" -net_download = 100 -net_upload = 100 -net_auto = True -net_sync = True -net_iface = "" -show_battery = True -selected_battery = "Auto" -log_level = "WARNING" diff --git a/home/config/btop/themes/catppuccin_macchiato.theme b/home/config/btop/themes/catppuccin_macchiato.theme deleted file mode 100755 index 7abd0bf..0000000 --- a/home/config/btop/themes/catppuccin_macchiato.theme +++ /dev/null @@ -1,42 +0,0 @@ -theme[main_bg]="#24273A" -theme[main_fg]="#CAD3F5" -theme[title]="#CAD3F5" -theme[hi_fg]="#8AADF4" -theme[selected_bg]="#494D64" -theme[selected_fg]="#8AADF4" -theme[inactive_fg]="#8087A2" -theme[graph_text]="#F4DBD6" -theme[meter_bg]="#494D64" -theme[proc_misc]="#F4DBD6" -theme[cpu_box]="#7DC4E4" -theme[mem_box]="#A6DA95" -theme[net_box]="#C6A0F6" -theme[proc_box]="#F0C6C6" -theme[div_line]="#6E738D" -theme[temp_start]="#EED49F" -theme[temp_mid]="#F5A97F" -theme[temp_end]="#ED8796" -theme[cpu_start]="#7DC4E4" -theme[cpu_mid]="#91D7E3" -theme[cpu_end]="#8BD5CA" -theme[free_start]="#8BD5CA" -theme[free_mid]="#8BD5CA" -theme[free_end]="#A6DA95" -theme[cached_start]="#F5BDE6" -theme[cached_mid]="#F5BDE6" -theme[cached_end]="#C6A0F6" -theme[available_start]="#F4DBD6" -theme[available_mid]="#F0C6C6" -theme[available_end]="#F0C6C6" -theme[used_start]="#F5A97F" -theme[used_mid]="#F5A97F" -theme[used_end]="#ED8796" -theme[download_start]="#B7BDF8" -theme[download_mid]="#B7BDF8" -theme[download_end]="#C6A0F6" -theme[upload_start]="#B7BDF8" -theme[upload_mid]="#B7BDF8" -theme[upload_end]="#C6A0F6" -theme[process_start]="#7DC4E4" -theme[process_mid]="#91D7E3" -theme[process_end]="#8BD5CA" diff --git a/home/user/config.nix b/home/user/config.nix index 6026da2..be6c247 100644 --- a/home/user/config.nix +++ b/home/user/config.nix @@ -15,14 +15,6 @@ in recursive = true; source = "${configDir}/gh"; }; - # ".local/share/fcitx5/themes/fcitx5-dark-transparent" = { - # recursive = true; - # source = "${configDir}/fcitx5-dark-transparent"; - # }; - # ".config/fcitx5/conf" = { - # recursive = true; - # source = "${configDir}/fcitx5"; - # }; ".face".source = "${configDir}/.face"; }; diff --git a/home/user/packages.nix b/home/user/packages.nix index 7cda8e0..d5a91f6 100644 --- a/home/user/packages.nix +++ b/home/user/packages.nix @@ -15,6 +15,14 @@ }; }; + programs.btop = { + enable = true; + settings = { + theme_background = false; + update_ms = 1000; + }; + }; + programs.ghostty = { enable = true; installBatSyntax = true; diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix index ecbaafa..d58ff72 100644 --- a/system/dev/dn-pre7780/default.nix +++ b/system/dev/dn-pre7780/default.nix @@ -197,7 +197,11 @@ in environment.systemPackages = with pkgs; [ rustdesk - blender + ((blender.override { cudaSupport = true; }).overrideAttrs (prev: { + postInstall = '' + sed -i 's|Exec=blender %f|Exec=/run/current-system/sw/bin/nvidia-offload blender %f|' $out/share/applications/blender.desktop + ''; + })) ]; services.openssh = { @@ -215,5 +219,4 @@ in ]; }; }; - }