diff --git a/.config/bottom/bottom.toml b/.config/bottom/bottom.toml new file mode 100644 index 0000000..8057f1a --- /dev/null +++ b/.config/bottom/bottom.toml @@ -0,0 +1,182 @@ +# This is a default config file for bottom. All of the settings are commented +# out by default; if you wish to change them uncomment and modify as you see +# fit. + +# This group of options represents a command-line flag/option. Flags explicitly +# added when running (ie: btm -a) will override this config file if an option +# is also set here. + +[flags] +# Whether to hide the average cpu entry. +#hide_avg_cpu = false +# Whether to use dot markers rather than braille. +#dot_marker = false +# The update rate of the application. +#rate = 1000 +# Whether to put the CPU legend to the left. +#left_legend = false +# Whether to set CPU% on a process to be based on the total CPU or just current usage. +#current_usage = false +# Whether to set CPU% on a process to be based on the total CPU or per-core CPU% (not divided by the number of cpus). +#unnormalized_cpu = false +# Whether to group processes with the same name together by default. +#group_processes = false +# Whether to make process searching case sensitive by default. +#case_sensitive = false +# Whether to make process searching look for matching the entire word by default. +#whole_word = false +# Whether to make process searching use regex by default. +#regex = false +# Defaults to Celsius. Temperature is one of: +#temperature_type = "k" +#temperature_type = "f" +#temperature_type = "c" +#temperature_type = "kelvin" +#temperature_type = "fahrenheit" +#temperature_type = "celsius" +# The default time interval (in milliseconds). +#default_time_value = 60000 +# The time delta on each zoom in/out action (in milliseconds). +#time_delta = 15000 +# Hides the time scale. +#hide_time = false +# Override layout default widget +#default_widget_type = "proc" +#default_widget_count = 1 +# Expand selected widget upon starting the app +#expanded_on_startup = true +# Use basic mode +#basic = false +# Use the old network legend style +#use_old_network_legend = false +# Remove space in tables +#hide_table_gap = false +# Show the battery widgets +#battery = false +# Disable mouse clicks +#disable_click = false +# Built-in themes. Valid values are "default", "default-light", "gruvbox", "gruvbox-light", "nord", "nord-light" +#color = "default" +# Show memory values in the processes widget as values by default +#mem_as_value = false +# Show tree mode by default in the processes widget. +#tree = false +# Shows an indicator in table widgets tracking where in the list you are. +#show_table_scroll_position = false +# Show processes as their commands by default in the process widget. +#process_command = false +# Displays the network widget with binary prefixes. +#network_use_binary_prefix = false +# Displays the network widget using bytes. +#network_use_bytes = false +# Displays the network widget with a log scale. +#network_use_log = false +# Hides advanced options to stop a process on Unix-like systems. +#disable_advanced_kill = false +# Shows GPU(s) memory +#enable_gpu_memory = false +# How much data is stored at once in terms of time. +#retention = "10m" + +# These are all the components that support custom theming. Note that colour support +# will depend on terminal support. + +#[colors] # Uncomment if you want to use custom colors +# Represents the colour of table headers (processes, CPU, disks, temperature). +#table_header_color="LightBlue" +# Represents the colour of the label each widget has. +#widget_title_color="Gray" +# Represents the average CPU color. +#avg_cpu_color="Red" +# Represents the colour the core will use in the CPU legend and graph. +#cpu_core_colors=["LightMagenta", "LightYellow", "LightCyan", "LightGreen", "LightBlue", "LightRed", "Cyan", "Green", "Blue", "Red"] +# Represents the colour RAM will use in the memory legend and graph. +#ram_color="LightMagenta" +# Represents the colour SWAP will use in the memory legend and graph. +#swap_color="LightYellow" +# Represents the colour ARC will use in the memory legend and graph. +#arc_color="LightCyan" +# Represents the colour the GPU will use in the memory legend and graph. +#gpu_core_colors=["LightGreen", "LightBlue", "LightRed", "Cyan", "Green", "Blue", "Red"] +# Represents the colour rx will use in the network legend and graph. +#rx_color="LightCyan" +# Represents the colour tx will use in the network legend and graph. +#tx_color="LightGreen" +# Represents the colour of the border of unselected widgets. +#border_color="Gray" +# Represents the colour of the border of selected widgets. +#highlighted_border_color="LightBlue" +# Represents the colour of most text. +#text_color="Gray" +# Represents the colour of text that is selected. +#selected_text_color="Black" +# Represents the background colour of text that is selected. +#selected_bg_color="LightBlue" +# Represents the colour of the lines and text of the graph. +#graph_color="Gray" +# Represents the colours of the battery based on charge +#high_battery_color="green" +#medium_battery_color="yellow" +#low_battery_color="red" + +# Layout - layouts follow a pattern like this: +# [[row]] represents a row in the application. +# [[row.child]] represents either a widget or a column. +# [[row.child.child]] represents a widget. +# +# All widgets must have the type value set to one of ["cpu", "mem", "proc", "net", "temp", "disk", "empty"]. +# All layout components have a ratio value - if this is not set, then it defaults to 1. +# The default widget layout: +[[row]] + ratio=20 + [[row.child]] + type="cpu" +[[row]] + ratio=50 + [[row.child]] + type="proc" + default=true +[[row]] + ratio=30 + [[row.child]] + ratio=4 + type="mem" + [[row.child]] + type="net" + [[row.child]] + ratio=3 + [[row.child.child]] + type="temp" + [[row.child.child]] + type="disk" + + +# Filters - you can hide specific temperature sensors, network interfaces, and disks using filters. This is admittedly +# a bit hard to use as of now, and there is a planned in-app interface for managing this in the future: +#[disk_filter] +#is_list_ignored = true +#list = ["/dev/sda\\d+", "/dev/nvme0n1p2"] +#regex = true +#case_sensitive = false +#whole_word = false + +#[mount_filter] +#is_list_ignored = true +#list = ["/mnt/.*", "/boot"] +#regex = true +#case_sensitive = false +#whole_word = false + +#[temp_filter] +#is_list_ignored = true +#list = ["cpu", "wifi"] +#regex = false +#case_sensitive = false +#whole_word = false + +#[net_filter] +#is_list_ignored = true +#list = ["virbr0.*"] +#regex = true +#case_sensitive = false +#whole_word = false diff --git a/flake.lock b/flake.lock index e1af751..200b2cd 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1688716072, - "narHash": "sha256-FP3QTbGZN23SemynwphrCDhMCXcQEAl209owaSMStyU=", + "lastModified": 1690204837, + "narHash": "sha256-YrvbqM9WXr3/cgFVwc1EjIaQq4aI4DdrB1fhHfAW/d4=", "owner": "Kirottu", "repo": "anyrun", - "rev": "509cb95b68fd64191a78b30672d3d556d4a7d86f", + "rev": "da97c9287f01f7d85ecf5e4ab8819bde3ae0e79a", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1689070547, - "narHash": "sha256-15U1xds8yc1HVg49aKce43xzbtw1cgri27CNgayu7qc=", + "lastModified": 1691057766, + "narHash": "sha256-jm2QYZdj94HVJMS9NNZBT+hPNKJwZHkdXI0tQxqqvys=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "735f70b83ac7ea5a0234359786e5a80e5ffa291c", + "rev": "791acfa700b9f96c35635fde2a17a66b4ed88c9e", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1686423460, - "narHash": "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4=", + "lastModified": 1690660426, + "narHash": "sha256-YUuH1BZ3G5dhHRZ1Z9XPXyorm8vV8G+jYbcdIGxOcOs=", "owner": "elkowar", "repo": "eww", - "rev": "25e50eda46379bccd8a7887c18ee35833e0460e8", + "rev": "dc3129aee2806823bdad87785f7ef80651d5245c", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1688999869, - "narHash": "sha256-gLD2UI6+Nb9JV5Wh4FnLHAZwLMiY11RHYBKmBZCxLXc=", + "lastModified": 1691039228, + "narHash": "sha256-iPNZJ1LvfUf1Y456ewC0DXgf99TNssG8OLObOyqxO6M=", "owner": "nix-community", "repo": "home-manager", - "rev": "a6d1d954b81caf4c9291b8ac35452fef842f289b", + "rev": "86dd48d70a2e2c17e84e747ba4faa92453e68d4a", "type": "github" }, "original": { @@ -241,11 +241,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1689075445, - "narHash": "sha256-OGqAO+mFF1I4yWO2ZVETqS1a06r7wKESNyEiu4dKj78=", + "lastModified": 1690975298, + "narHash": "sha256-MYrsuMcQdV1wuqB0ZPrGvsGk66KjFRjaN2fI0weGH8k=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "64e7d5345dddd755e361a6fce5a7f58b06a8b546", + "rev": "5c50fac907df3463492a019f01f84d547ab93650", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1688870701, - "narHash": "sha256-Ce19zGClzKQRHBVvTroEvIFGI87sbfEFTeCicpo2R2s=", + "lastModified": 1689132660, + "narHash": "sha256-+sC2EZH7WepsvFskXhIGth/KMHe2kSnIuVR3UQ4C/9Q=", "owner": "chriscochrun", "repo": "church-presenter", - "rev": "3f00cf7abd5163aeb9c328e27284aa6c1beceae0", + "rev": "2ccc98a9547be0802bec95c49583b539c0e1eaba", "type": "gitlab" }, "original": { @@ -321,11 +321,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1687896790, - "narHash": "sha256-FMZxfmpBdyXypFXwsfQz3A2P7QO/U/7SBuUAaxlV7Qc=", + "lastModified": 1690663306, + "narHash": "sha256-W0FGaSmnXUJa54T5c2SMHyAG3i/U2CJo9IMGFiCv74U=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "01c6148056e86282bedbb28d4c6d389f96c494da", + "rev": "2e53fd2e512872684f0619ac1540b7f229dbd206", "type": "github" }, "original": { @@ -337,11 +337,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1689060619, - "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", + "lastModified": 1690957133, + "narHash": "sha256-0Y4CiOIszhHDDXHFmvHUpmhUotKOIn0m3jpMlm6zUTE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c", + "rev": "24f9162b26f0debd163f6d94752aa2acb9db395a", "type": "github" }, "original": { @@ -353,11 +353,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688500189, - "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", + "lastModified": 1690179384, + "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", + "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1688939073, - "narHash": "sha256-jYhYjeK5s6k8QS3i+ovq9VZqBJaWbxm7awTKNhHL9d0=", + "lastModified": 1690927903, + "narHash": "sha256-D5gCaCROnjEKDOel//8TO/pOP87pAEtT0uT8X+0Bj/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8df7a67abaf8aefc8a2839e0b48f92fdcf69a38b", + "rev": "bd836ac5e5a7358dea73cb74a013ca32864ccb86", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1687518131, - "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", + "lastModified": 1690593349, + "narHash": "sha256-i6jdORO+YiP19pFNeR7oYIIwmzQvdxwNO+BmtATcYpA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", + "rev": "11cf5e1c74fe6892e860afeeaf3bfb84fdb7b1c3", "type": "github" }, "original": { @@ -462,27 +462,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1687376262, - "narHash": "sha256-xtenf0Nc6So/5uaQqe8u3GVoAs/YdMUFsysPUuK8w1s=", + "lastModified": 1690558459, + "narHash": "sha256-5W7y1l2cLYPkpJGNlAja7XW2X2o9rjf0O1mo9nxS9jQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7859e9c101fabbd62551b8f4260124a6e2f01a46", + "rev": "48e82fe1b1c863ee26a33ce9bd39621d2ada0a33", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1689008574, - "narHash": "sha256-VFMgyHDiqsGDkRg73alv6OdHJAqhybryWHv77bSCGIw=", + "lastModified": 1691006197, + "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a729ce4b1fe5ec4fffc71c67c96aa5184ebb462", + "rev": "66aedfd010204949cb225cf749be08cb13ce1813", "type": "github" }, "original": { @@ -630,17 +630,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1686753331, - "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", + "lastModified": 1690165843, + "narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=", "owner": "wlroots", "repo": "wlroots", - "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", + "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", + "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3", "type": "gitlab" } }, diff --git a/home/home.nix b/home/home.nix index 726f5cc..226806e 100644 --- a/home/home.nix +++ b/home/home.nix @@ -224,6 +224,11 @@ # }; #}; + home.file.".config/bottom" = { + source = ../.config/bottom; + recursive = true; + }; + home.file.".config/rofi" = { source = ../.config/rofi; recursive = true; @@ -439,7 +444,7 @@ enable = true; enableAutosuggestions = true; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; autocd = true; dotDir = ".config/zsh"; shellAliases = { diff --git a/modules/desktop.nix b/modules/desktop.nix index 06637a1..230b52c 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -40,6 +40,7 @@ with lib; sddm = { enable = false; }; + gdm.enable = false; session = [ { manage = "desktop"; @@ -63,16 +64,16 @@ with lib; enableKwallet = true; }; - fonts.fonts = with pkgs; [ - nerdfonts - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - liberation_ttf - mplus-outline-fonts.githubRelease - dina-font - proggyfonts - ]; + fonts.packages = with pkgs; [ + nerdfonts + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + liberation_ttf + mplus-outline-fonts.githubRelease + dina-font + proggyfonts + ]; hardware = { keyboard.qmk.enable = true; diff --git a/modules/emacs.nix b/modules/emacs.nix index ef46fea..fbb8bbd 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -1,5 +1,7 @@ { pkgs, lib, config, ... }: - +let +myEmacs = pkgs.emacs-pgtk; +in with lib; { services.emacs = { diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index 08e7fbb..0e5840f 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -44,6 +44,7 @@ neofetch fwupd ts + du-dust ]; } diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 1fc5e73..9469b4f 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -18,11 +18,10 @@ with lib; dash brightnessctl dunst + dvdbackup bottom ungoogled-chromium qutebrowser - via - vial brave ttyper kget @@ -46,7 +45,7 @@ with lib; tagutil python310Packages.mutagen python310Packages.audiotools - (mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock thumbfast ];}) + (mpv.override {scripts = with pkgs.mpvScripts; [ mpris quality-menu sponsorblock ];}) haruna ani-cli mov-cli @@ -117,7 +116,11 @@ with lib; plasma5Packages.qt5ct lxappearance spotdl - kdenlive + (kdenlive.override { + mlt = mlt.override { + ffmpeg = ffmpeg-full; + }; + }) glaxnimate mediainfo libmediainfo diff --git a/systems/kaladin/configuration.nix b/systems/kaladin/configuration.nix index bea82ad..f2f364f 100644 --- a/systems/kaladin/configuration.nix +++ b/systems/kaladin/configuration.nix @@ -34,6 +34,7 @@ # powerManagement.enable = true; # }; }; + services.xserver.videoDrivers = [ "amdgpu" ]; # services.xserver.screenSection = '' # Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"