diff --git a/CHANGELOG.md b/CHANGELOG.md index a2a130c..cc09091 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,37 +1,164 @@ -## ๐Ÿ—’๏ธ Changelog +### ๐Ÿ—’๏ธ Changelog -**ZaneyOS 2.0** +## ZaneyOS v2.3.3 -- Release Notes -With this new update of ZaneyOS it is a big rewrite of how things are being -done. This update fixes many issues that you guys were facing. As well as makes -things a little easier to understand. You now have a lot being stored inside the -specific host directory, making use of modules, condensing seperate files down, -etc. My hope is that with this update your ability to grasp the flake and expand -it to what you need is much improved. I want to thank everyone for being so -supportive! +** Updated: August 18th, 2025 ** -- Most configuration put into specific hosts directories for the best - portability. -- Using modules to condense configuration complexity. -- Simplified options and the complexity around understanding their - implementation. -- Rewrote the documentation for improved readability. +- Fixed: Two issues in `install-zaneyos.sh` script prevented updating of + `flake.nix` -**ZaneyOS 2.1** +- NeoVIM Enhancements: + - Enhanced DirtytalkUpdate automation with smart detection to skip if wordlist + exists + - Added Nix LSP auto-eval-inputs support for better flake evaluation + - Improved home.activation script with better error handling and DAG ordering + - Programming wordlist is now automatically downloaded only when needed -Simple bug fixes. +- Added `rebuild-boot` command to `zcli` + - New command rebuilds system and sets as boot default + - Changes activate on next restart instead of immediately + - Useful for testing configurations safely -- Fixed Waybar icons to make them look a bit better. -- Centered the Wofi window always. -- Should have fixed some Steam issues, but I have had some crashes due to Steam - so be aware of that. -- The flake got an update, so all the packages are fresh. +- Added new waybars -`waybar-dwm.nix` -`waybar-dwm2.nix` + - Inspired by Matt @TheLinuxCast +- `VirtualBox` + - After user requests I added VirtualBox + - It's in `~/zaneyos/modules/core/virtualisation.nix` + - It is disabled by default +- `General Updates` + - Updated flake + - Update to `neovim` and `nvf` causes a prompt to download a dictionary + - Enter `yes` then run `:DirtytalkUpdate` (case sensitive) to resolve it + - No, I did not make up that command (nerd alert) + - ** Update: ** Added a home.activation to run command to resolve it + - Changed from `nvim-cmp` to `blink-cmp` for code completion + - works better but has reputation for breaking time will tell + - Changed version to ZaneyOS v2.3.3 in fastfetch + - Added `tealdeer.nix` (TLDR) + - Added `fzf.nix` to customize fzf util + - Added preview to `fzf.nix` Enter to edit + - Added `onefetch` to show current build info for zaneyos + - Fixed 'hm-find' script was not being built + - Added `lazygit.nix` to theme, customize lazygit util + - Disabled the `df` command in the disk module. Doesn't work w/zaneyos +- `ZCLI Updates:` + - Updated `zcli.nix` to v1.0 code cleanup, logging + - Created `zcli` command `modules/home/scripts/zcli` + - `zcli` will update flake, rebuild, run diags, garbage collect and fstrim + - `zcli ` `rebuild` `update` `cleanup` `diags` `trim` +- `Yazi Updates:` + - Added `BASH/ZSH/FISH` integration to `yazi` + - Set `shellWrapperName = "yy";` + - `yy` will start `yazi` and on exit leave you in current directory + - This resolves issue where running `yazi` from rofi uses xterm + - Merged yazi fix for errors after rebuilds. Thank you Daniel + - Current `yazi` chg'd `manager` to `mgr` in `theme.toml` and `keymap.toml` +- `VSCODE Updates:` + - Added `vscode.nix` with configured plugins + - Thanks to `delciak` for the NIX code for `vscode.nix` +- `NeoVIM Updates:` + - Enabled `neovim` and set it as `defaultEditor` + - Restored relative line numbering to nvim `lineNumberMode = "relNumber";` + - Fixed `css` formatting thanks to `mister_simon` for the fix + - NVIM `languages.enableLSP` changed to `vim.settings.lsp.enable` + - Removed extraneous LUA code for diags w/debug messages from `nvf.nix` + - Re-enabled `language formater` `css` was disabled b/c rebuilds failed + - Restored diagnostic messages inline as errors are detected + - When you save a file the LSP will show any applicable hints + - Updated `nvf.nix`to use a clipboard provider as "useSystemClipobard" is no +- `GIT Updates:` + - Added options and aliases to `git.nix` + - Added three more `git`aliases `com` commit a, `gs` stash, and `gp` pull + - Run `gs com`, `git gs` and `git gp` to use them +- `EZA Updates:` + - Moved aliases for `eza` to `eza.nix` + - Now regardless of shell aliases will be same + - Added `eza.nx` to configure basic eza settings + - Added default features to `eza` in `eza.nix` + - Allowing default behavior to be set on all shells + - Added Shell integration for `eza` to `bash`, `zsh` and `fish` -**ZaneyOS 2.2** +- Modified zsh config -This release has a big theming change as well as including the move back to -rofi. It is a massive improvement in many ways. + ```nix + syntaxHighlighting = { + enable = true; + highlighters = ["main" "brackets" "pattern" "regexp" "root" "line"]; + }; + historySubstringSearch.enable = true; + history = { + ignoreDups = true; + save = 10000; + size = 10000; + }; + ``` + +- `Hyprland Updates:` + - Disabled AQ_DRM_DEVICES env variable Retuned to default auto + - Set `Virtual-1` monitior default to `1920x1080@60,auto,1` + - Added `waybar-ddubs-2.nix` Modified version of Jerry's waybar + - Adjusted some colors in Jerry's waybar + - Added examples for monitor setup in `variables.nix` + - Added Jerry's waybar as option. `Jerry-waybar.nix` + - Added option to enable blur on waybar on `hyprland.nix` Thx SchotjeChrisman + - Added new Window animation option `animation-moving`from ML4W repo + - Fixed regression in `windowrules.nix` + - Stylix was set to unstable - now 25.05 to stop mismatched version warning + - Hyprland ENV variables were set in two files, now in `env.nix` + - Hyprland animation files had `inherit`statements that weren't used + - Pyprland drop down termina size changed from 75% to 70% + - Disabled hyprland donation messages + - Set `Application Not Responding (ANR)` dialog threshold to 20 (def 1) + - Set `TERMINAL` and `XDG_TERMINAL_EMULATOR` to kitty in `env.nix` + +- `GA Release Notes:` + + - With this release there are improvements to Neovim + - The entire file structure has been improved. + - Switched from nixvim to nvf for neovim configuration. + - Improved bat config and includes extras now. + - Added profiles for what kind of system you have based of GPU / VM. + - Reduced the host specific files and made the entire flake more modular. + - Fixed git getting set to wrong user settings. + - Fixed hyprlock conflicting with stylix. + - Setup`nh`in a better fashion. + - Added support for `qmk` out of the box. + - Added usbutils for lsusb functionality. + - Massive improvement to Hyprland window rules. + - Removed broken support for Apple Silicon (this may return). + - Install script improved. + - Fixed `nix flake check` not working. + - Added nvidia prime PCI ID variables to host `variables.nix`. + - Added vim keybindings zsh `(alt+hjkl)`. + - Added `(ctrl+hjkl)` keybinds for vim movement while in insert mode in + neovim. + - Supports adb out of the box. + - `Ddubs/dwilliam62` helped with the addition of pyprland and scratchpad + support. He is now also a maintainer. + - Can now summon a drop-down terminal with `SUPER, T`. + - Added image used by Stylix into the host variables file. + - Made printing and NFS variables so they can be easily toggled between hosts. + - Added waybar styling choice. + - Kitty, Wezterm, Neovim/nvf, and even Flatpaks all properly themed with + Stylix. + - Moved to hyprpolkitagent and fixed qt theming. + - Stylix options that I wanted forced us back on the unstable branch. + - Made Thunar an optional thing, enabled by default. _But for me Yazi is + enough._ + + + + + +
+
+**ZaneyOS v2.2** + +
+ +- This release has a big theming change +- Move back to rofi. It is a massive improvement in many ways. - Revert the switch from rofi to wofi. Rofi is just better. - Switch from Nix Colors to Stylix. It can build colorschemes from a wallpaper. - Simplified the notification center. @@ -55,36 +182,52 @@ rofi. It is a massive improvement in many ways. - Switching to Brave as the default to protect user privacy. - Replaced lsd with eza for a better looking experience. -**ZaneyOS 2.3** +
-With this release there are improvements to Neovim and the entire file structure -has been improved. +
+
-- Switched from nixvim to nvf for neovim configuration. -- Improved bat config and includes extras now. -- Added profiles for what kind of system you have based of GPU / VM. -- Reduced the host specific files and made the entire flake more modular. -- Fixed git getting set to wrong user settings. -- Fixed hyprlock conflicting with stylix. -- Setup nh in a better fashion. -- Added support for qmk out of the box and added usbutils for lsusb - functionality. -- Massive improvement to Hyprland window rules. -- Removed broken support for Apple Silicon (this may return). -- Install script improved. -- Fixed `nix flake check` not working. -- Added nvidia prime PCI ID variables to host `variables.nix`. -- Added vim keybindings zsh (alt+hjkl). -- Added (ctrl+hjkl) keybinds for vim movement while in insert mode in neovim. -- Supports adb out of the box. -- Ddubs/dwilliam62 helped with the addition of pyprland and scratchpad support. - He is now also a maintainer. -- Can now summon a drop-down terminal with `SUPER, T`. -- Added image used by Stylix into the host variables file. -- Made printing and NFS variables so they can be easily toggled between hosts. -- Added waybar styling choice. -- Kitty, Wezterm, Neovim/nvf, and even Flatpaks all properly themed with Stylix. -- Moved to hyprpolkitagent and fixed qt theming. -- Stylix options that I wanted forced us back on the unstable branch. -- Made Thunar an optional thing, enabled by default. _But for me Yazi is - enough._ +
+ +**ZaneyOS v2.1** + +
+ +Simple bug fixes. + +- Fixed Waybar icons to make them look a bit better. +- Centered the Wofi window always. +- Should have fixed some Steam issues, but I have had some crashes due to Steam + so be aware of that. +- The flake got an update, so all the packages are fresh. + +
+ +
+ +
+ +
+ +**ZaneyOS v2.0** + +
+ +With this new update of ZaneyOS it is a big rewrite of how things are being +done. This update fixes many issues that you guys were facing. As well as makes +things a little easier to understand. You now have a lot being stored inside the +specific host directory, making use of modules, condensing seperate files down, +etc. My hope is that with this update your ability to grasp the flake and expand +it to what you need is much improved. I want to thank everyone for being so +supportive! + +- Most configuration put into specific hosts directories for the best + portability. +- Using modules to condense configuration complexity. +- Simplified options and the complexity around understanding their + implementation. +- Rewrote the documentation for improved readability. + +
+ +
diff --git a/FAQ.md b/FAQ.md index 3eea8c6..e09f766 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,26 +1,201 @@ -# ZaneyOS FAQ for v2.3 -- **Revision v1.04** -- **Date:** 18-Mar-2025 +# ๐Ÿ’ฌ ZaneyOS FAQ for v2.3 -## Why did you create ZaneyOS ? - -Orginally, it was simply my configuration saved on a GIT repository. It was there to promote NixOS and Hyprland. Providing a stable, working configuration. It has never been intended as a full NixOS distro. The `ZaneyOS` was an inside joke among friends. The intent is this can be used as a daily driver, play games via steam, and be modified to fit your needs. +- **Revision v1.19** +- **Date:** 30-May-2025 -## How do I change the Timezone? +## ZaneyOS related -1. In the file, `~/zaneyos/modules/core/system.nix` -2. Edit the line: time.timeZone = "America/New_York"; -3. Save the file and rebuild using the `fr` alias. - -## How do I change the monitor settings? +**โŒจ Where can I see the Hyprland keybindings?** - Monitor settings are in the file: `~/zaneyos/hosts//variables.nix` +- The SUPER key + K opens a searchable menu with the bindings +- The "keys" icon on the right side of the waybar will also bring up this menu. - Inside the quotes the syntax is "monitor=video apapter,resolution@refresh rate, auto,scale" - Monitor must be in all lowercase. If you are not sure of your video devices run - `hyprctl monitors` at a terminal CLI. The output will look similar to this: +
+**๐Ÿ–ฅ๏ธ ZCLI: What is it and how do I use it?** +
+The `zcli` utility is a command-line tool designed to simplify the management of +your ZanyeOS environment. It provides a set of commands to perform common tasks +such as updating your system, managing hosts, and cleaning up old generations. + +To use it, open a terminal and type `zcli` followed by one of the commands +listed below: + +- `cleanup`: Clean up old system generations. -- You can specify the number of + generations to keep. +- `diag`: Create a system diagnostic report, saved to `~/diag.txt`. +- `list-gens`: List user and system generations. +- `rebuild`: Rebuild the NixOS system configuration. +- `trim`: Trim filesystems to improve SSD performance. +- `update`: Update the flake and rebuild the system. +- `update-host`: Automatically set the host and profile in `flake.nix`. -- It + will get current hostname and run GPU detect code +- `add-host`: Add a new host configuration. -- It runs hostname and GPU + auto-detect -- You can specify the `hostname` and GPU `profile` +- `zcli add-host [hostname] [profile]` -- Profiles (GPU) are `amd`, `intel`, + `nvidia`, `nvidia-hybrid`, and `vm` +- `del-host`: Delete a host configuration. `del-host [hostname]` +- `help`: Show the help message. + +```text +โฏ zcli +Error: No command provided. +ZaneyOS CLI Utility -- version 0.9 + +Usage: zcli [command] + +Commands: + cleanup - Clean up old system generations. Can specify a number to keep. + diag - Create a system diagnostic report. + (Filename: homedir/diag.txt) + list-gens - List user and system generations. + rebuild - Rebuild the NixOS system configuration. + trim - Trim filesystems to improve SSD performance. + update - Update the flake and rebuild the system. + update-host - Auto set host and profile in flake.nix. + (Opt: zcli update-host [hostname] [profile]) + add-host - Adds a new host. (Opt: zcli add-host [hostname] [profile]) + del-host - Deletes a host. (Opt: zcli del-host [hostname]) + + help - Show this help message. +~ +โฏ + +ex: +>zcli add-host myhost amd +>zcli rebuild ``` + +
+
+ +## Major Hyprland Keybindings + +Below are the keybindings for Hyprland, formatted for easy reference. + +## Application Launching + +- `$modifier + Return` โ†’ Launch `Terminal` +- `$modifier + K` โ†’ List keybinds +- `$modifier + Shift + Return` โ†’ Launch `rofi-launcher` +- `$modifier + Shift + W` โ†’ Open `web-search` +- `$modifier + Alt + W` โ†’ Open `wallsetter` +- `$modifier + Shift + N` โ†’ Run `swaync-client -rs` +- `$modifier + W` โ†’ Launch `Web Browser` +- `$modifier + Y` โ†’ Open `kitty` with `yazi` +- `$modifier + E` โ†’ Open `emopicker9000` +- `$modifier + S` โ†’ Take a screenshot +- `$modifier + D` โ†’ Open `Discord` +- `$modifier + O` โ†’ Launch `OBS Studio` +- `$modifier + C` โ†’ Run `hyprpicker -a` +- `$modifier + G` โ†’ Open `GIMP` +- `$modifier + V` โ†’ Show clipboard history via `cliphist` +- `$modifier + T` โ†’ Toggle terminal with `pypr` +- `$modifier + M` โ†’ Open `pavucontrol` + +## Window Management + +- `$modifier + Q` โ†’ Kill active window +- `$modifier + P` โ†’ Toggle pseudo tiling +- `$modifier + Shift + I` โ†’ Toggle split mode +- `$modifier + F` โ†’ Toggle fullscreen +- `$modifier + Shift + F` โ†’ Toggle floating mode +- `$modifier + Alt + F` โ†’ Float all windows +- `$modifier + Shift + C` โ†’ Exit Hyprland + +## Window Movement + +- `$modifier + Shift + โ† / โ†’ / โ†‘ / โ†“` โ†’ Move window left/right/up/down +- `$modifier + Shift + H / L / K / J` โ†’ Move window left/right/up/down +- `$modifier + Alt + โ† / โ†’ / โ†‘ / โ†“` โ†’ Swap window left/right/up/down +- `$modifier + Alt + 43 / 46 / 45 / 44` โ†’ Swap window left/right/up/down + +## Focus Movement + +- `$modifier + โ† / โ†’ / โ†‘ / โ†“` โ†’ Move focus left/right/up/down +- `$modifier + H / L / K / J` โ†’ Move focus left/right/up/down + +## Workspaces + +- `$modifier + 1-10` โ†’ Switch to workspace 1-10 +- `$modifier + Shift + Space` โ†’ Move window to special workspace +- `$modifier + Space` โ†’ Toggle special workspace +- `$modifier + Shift + 1-10` โ†’ Move window to workspace 1-10 +- `$modifier + Control + โ†’ / โ†` โ†’ Switch workspace forward/backward + +## Window Cycling + +- `Alt + Tab` โ†’ Cycle to next window +- `Alt + Tab` โ†’ Bring active window to top + +
+ +**โ„ Why did you create ZaneyOS ? ** + +
+ +- Orginally, it was simply my configuration saved on a GIT repository. +- It was there to promote NixOS and Hyprland. +- Providing a stable, working configuration. +- It has never been intended as a full NixOS distro. +- The `ZaneyOS` name is an inside joke among friends. +- The intent is this configration can be used as a daily driver +- Develop software, play games via steam, etc. +- My hope is that it helpful, and will modify it to fit your needs. +- That is the key take away. Make it your own. +- You create a fork of ZaneyOS, then modify it. +- If you find an issue and fix it, or provide a new feature, please share it. +- ZaneyOS is not a distro. At this time there are no plans to create an install + ISO. + +
+
+ +
+**๐Ÿ–ผ๏ธ Settings and configuration** + +
+ +
+**How to I change the waybar?** + +- Go to the `~/zaneyos/host/HOSTNAME` +- Edit the `variables.nix` file +- Find the line that starts `waybarChoice` +- Change the name to one of the available files +- `waybar-simple.nix`, `waybar-curved.nix`, or `waybar-ddubs.nix` +- Save the file and exit +- You need to do a rebuild to make the change effective +- Run `fr` "flake rebuild" to start the rebuild process + +```json +# Set Waybar +# Includes alternates such as waybar-simple.nix, waybar-curved.nix & waybar-ddubs.nix +waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; +``` + +
+ +
+** How do I change the Timezone? ** + +1. In the file, `~/zaneyos/modules/core/system.nix` +2. Edit the line: time.timeZone = "America/New_York"; +3. Save the file and rebuild using the `fr` alias. + +
+ +
+**How do I change the monitor settings? ** + +Monitor settings are in the file: `~/zaneyos/hosts//variables.nix` + +Inside the quotes the syntax is "monitor=video apapter,resolution@refresh rate, +auto,scale" Monitor must be in all lowercase. If you are not sure of your video +devices run `hyprctl monitors` at a terminal CLI. The output will look similar +to this: + +```text hyprctl monitors Monitor HDMI-A-1 (ID 0): 2560x1440@143.91200 at 0x0 @@ -45,33 +220,61 @@ Monitor HDMI-A-1 (ID 0): availableModes: 2560x1440@59.95Hz 2560x1440@143.91Hz 2560x1440@120.00Hz 1920x1200@59.95Hz 1920x1080@143.86Hz 1920x1080@120.00Hz 1920x1080@119.88Hz 1920x1080@60.00Hz 1920x1080@60.00Hz 1920x1080@59.94Hz 1920x1080@50.00Hz 1600x1200@60.00Hz 1680x1050@59.88Hz 1280x1024@75.03Hz 1280x1024@60.02Hz 1440x900@59.95Hz 1280x800@59.91Hz 1152x864@75.00Hz 1280x720@120.00Hz 1280x720@119.88Hz 1280x720@60.00Hz 1280x720@59.94Hz 1280x720@50.00Hz 1024x768@75.03Hz 1024x768@60.00Hz 800x600@75.00Hz 800x600@60.32Hz 720x576@50.00Hz 720x576@50.00Hz 720x480@60.00Hz 720x480@60.00Hz 720x480@59.94Hz 720x480@59.94Hz 640x480@75.00Hz 640x480@60.00Hz 640x480@59.94Hz 640x480@59.94Hz 720x400@70.08Hz ``` -Edit the `extraMonitorSettings` line. -**Examples:** -- Single Monitor: - `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";` +Edit the `extraMonitorSettings` line. **Examples:** + +- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";` - Multiple Monitors: - `extraMonitorSettins = " + `extraMonitorSettings = " monitor=eDP-1,1920x1080@60,auto,auto monitor=HDMI-A-1,2560x1440@75,auto,auto - ";` + ";` -Information on configuring monitors is available on the [Hyprland Wiki](https://wiki.hyprland.org/Configuring/Monitors/) +- For more complex, multi-monitor configurations, you may wish to use the GUI + application, `nwg-displays` This will show your currently connected monitors + allowing you to use the mouse match how they are physicall arranged. E.g. what + monitor is to the left, right, up or down. It is very similar to the X11 based + tool, `arandr` It will then create a Hyprland compatible configuration file at + `~/.config/hypr/monitors.conf` -## How do I add applications to ZaneyOS? + -### There are two options. One for all hosts you have, another for a specific host. - -1. For applications to be included in all defined hosts edit the - `~/zaneyos/modules/core/packages.nix` file. - -There is a section that begins with: - ` environment.systemPackages = with pkgs; ` - -Followed by a list of packages These are required for ZaneyOS. - -We suggest you add a comment at the end of the package names. Then add in your packages. +After you finish configring the monitors as you wish, hit `Apply` to save the +changes to `~/.config/hypr/monitors.conf`\ +The contents will look something like this: +```text +# Generated by nwg-displays on 2025-03-20 at 13:13:49. Do not edit manually. +monitor=HDMI-A-1,1920x1080@74.97,2136x268,1.0 +monitor=eDP-1,1920x1080@144.0,216x268,1.0 ``` + +You only need to copy the `monitor=` lines and paste them into the +`variables.nix` file as described in the process above. + +Once you have that done. Run the command alias `fr` to build a new generation to +make the chnages effective. + +More information on configuring monitors is available on the +[Hyprland Wiki](https://wiki.hyprland.org/Configuring/Monitors/) + +
+ +
+**How do I add applications to ZaneyOS? ** + +### There are two options. One for all hosts you have, another for a specific host. + +1. For applications to be included in all defined hosts edit the + `~/zaneyos/modules/core/packages.nix` file. + +There is a section that begins with: `environment.systemPackages = with pkgs;` + +Followed by a list of packages These are required for ZaneyOS. + +We suggest you add a comment at the end of the package names. Then add in your +packages. + +```text ... virt-viewer wget @@ -98,11 +301,12 @@ We suggest you add a comment at the end of the package names. Then add in your p } ``` -2. For applications that will only be on specific host. - -You edit the `host-packages.nix` associated with that host. `~/zaneyos/hosts//host-packages.nix` +2. For applications that will only be on specific host. -The part of the file you need to edit, looks like this: +You edit the `host-packages.nix` associated with that host. +`~/zaneyos/hosts//host-packages.nix` + +The part of the file you need to edit, looks like this: ```nix { pkgs, ... }: { @@ -114,104 +318,205 @@ The part of the file you need to edit, looks like this: ]; } ``` - -You can add additional packages, or for example change `discord` to `discord-canary` to get the beta version of Discord but only on this host. -## I added the package names, now how do I install them ? +You can add additional packages, or for example change `discord` to +`discord-canary` to get the beta version of Discord but only on this host. -- Use the `fr`, Flake Rebuild alias. +
-If the rebuild completes successfully, a new generation with your added packages will be created. +
-## How do I update the packages I've already installed? +** I added the package names, now how do I install them ? ** -- Use the `fu`, Flake Update alias. This will check for updated packages, download and install them. +- Use the `fr`, Flake Rebuild alias. -## I made a change to my ZaneyOS configuration, how do I activate it? +If the rebuild completes successfully, a new generation with your added packages +will be created. -- Use the `fr` Flake Rebuild alias. If you **created a new file** please note you will need to run a `git add .` command in the zaneyos folder. If successful, a new generation will be generated with your changes. A logout or reboot could be required depending on what you changed. +
-## How can I configure a different kernel on a specific host? -1. You have to edit the `hardware.nix` file for that host in `~/zaneyos/hosts/HOSTNAME/hardware.nix` and override the default. -2. Near the top you will find this section of the `hardware.nix` file. -``` - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; +
+** How do I update the packages I've already installed? ** +- Use the `fu`, Flake Update alias. This will check for updated packages, + download and install them. + +
+ +
+** I made a change to my ZaneyOS configuration, how do I activate it? ** + +- Use the `fr` Flake Rebuild alias. If you **created a new file** please note + you will need to run a `git add .` command in the zaneyos folder. If + successful, a new generation will be generated with your changes. A logout or + reboot could be required depending on what you changed. + +
+ +
+** How can I configure a different kernel on a specific host? ** + +1. You have to edit the `hardware.nix` file for that host in + `~/zaneyos/hosts/HOSTNAME/hardware.nix` and override the default. +2. Near the top you will find this section of the `hardware.nix` file. + +```nix +boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"]; +boot.initrd.kernelModules = []; +boot.kernelModules = ["kvm-intel"]; +boot.extraModulePackages = []; ``` -3. Add the override. E.g. to set the kernel to 6.12. -- `boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;` -4. The updated code should look like this: +3. Add the override. E.g. to set the kernel to 6.12. + +- `boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;` + +4. The updated code should look like this: + +```nix +boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"]; +boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12; +boot.initrd.kernelModules = []; +boot.kernelModules = ["kvm-intel"]; +boot.extraModulePackages = []; ``` - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"]; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; -``` -5. Use the command alias `fr` to create a new generation and reboot to take effect. +5. Use the command alias `fr` to create a new generation and reboot to take + effect. +
-### What are the major Kernel options in NixOS? +
+ +** What are the major Kernel options in NixOS? ** NixOS offers several major kernel types to cater to different needs and preferences. Below are the available options, excluding specific kernel versions: -1. **`linuxPackages`** +1. **`linuxPackages`** - The default stable kernel, typically an LTS (Long-Term Support) version. + LTS in 25.05 (warbler) is 6.12.x Older kernels, 6.6.x, 6.8.x are not + supported. -2. **`linuxPackages_latest`** - - The latest mainline kernel, which may include newer features but could be less stable. +2. **`linuxPackages_latest`** + - The latest mainline kernel, which may include newer features but could be + less stable. -3. **`linuxPackages_zen`** - - A performance-optimized kernel with patches aimed at improving responsiveness and interactivity. Commonly used by gamers and desktop users. +3. **`linuxPackages_zen`** + - A performance-optimized kernel with patches aimed at improving + responsiveness and interactivity. Commonly used by gamers and desktop + users. -4. **`linuxPackages_hardened`** - - A security-focused kernel with additional hardening patches for enhanced protection. +4. **`linuxPackages_hardened`** + - A security-focused kernel with additional hardening patches for enhanced + protection. -5. **`linuxPackages_rt`** - - A real-time kernel designed for low-latency and time-sensitive applications, such as audio production or robotics. +5. **`linuxPackages_rt`** + - A real-time kernel designed for low-latency and time-sensitive + applications, such as audio production or robotics. -6. **`linuxPackages_libre`** - - A kernel stripped of proprietary firmware and drivers, adhering to free software principles. +6. **`linuxPackages_libre`** + - A kernel stripped of proprietary firmware and drivers, adhering to free + software principles. -7. **`linuxPackages_xen_dom0`** - - A kernel tailored for running as the host (dom0) in Xen virtualization environments. +7. **`linuxPackages_xen_dom0`** + - A kernel tailored for running as the host (dom0) in Xen virtualization + environments. -8. **`linuxPackages_mptcp`** - - A kernel with support for Multipath TCP, useful for advanced networking scenarios. +8. **`linuxPackages_mptcp`** + - A kernel with support for Multipath TCP, useful for advanced networking + scenarios. ---- +
-## I have older generations I want to delete, how can I do that? +
-- The `ncg` NixOS Clean Generations alias will remove **ALL** but the most current generation. Make sure you have booted from that generation before using this alias. There is also a schedule that will remove older generations automatically over time. +** I have older generations I want to delete, how can I do that? ** -## How do I change the hostname? +- The `ncg` NixOS Clean Generations alias will remove **ALL** but the most + current generation. Make sure you have booted from that generation before + using this alias. There is also a schedule that will remove older generations + automatically over time. -To change the hostname, there are several steps and you will have to reboot to make the change effective. +
-1. Copy the directory of the host you want to rename to a directory with the new name. +
-- `cp -rpv ~/zaneyos/hosts/OLD-HOSTNAME ~/zaneyos/hosts/NEW-HOSTNAME ` +**How do I change the hostname? ** + +To change the hostname, there are several steps and you will have to reboot to +make the change effective. + +1. Copy the directory of the host you want to rename to a directory with the new + name. + +- `cp -rpv ~/zaneyos/hosts/OLD-HOSTNAME ~/zaneyos/hosts/NEW-HOSTNAME` 2. Edit the `~/zaneyos/flake.nix` file. Change the line: -- `host = "NEW-HOSTNAME"` - -3. In the `~/zaneyos` Directory run `git add .` *The rebuild will fail with a 'file not found' error if you forget this step.* +- `host = "NEW-HOSTNAME"` -4. Use the `fr` alias to create a new generation with the new hostname. You must reboot to make the change effective. +3. In the `~/zaneyos` Directory run `git add .` _The rebuild will fail with a + 'file not found' error if you forget this step._ -## How do I enable or disable Stylix? +4. Use the `fr` alias to create a new generation with the new hostname. You must + reboot to make the change effective. -- To Enable: -1. Edit the `~/zaneyos/modules/core/stylix.nix` file. -2. Comment out from `base16Scheme` to the `};` after `base0F` +
+
+** How do I disable the spinning snowflake at startup? ** +1. Edit the `~/zaneyos/modules/core/boot.nix` file. +2. Look for: + +```nix +}; + plymouth.enable = true; +}; ``` + +3. Change it to `false` +4. Run the command alias `fr` to create a new generation. + +
+ +
+ ** How do I configure my hybrid laptop with Intel/NVIDIA GPUs? ** + +1. Either run the `install-zaneyos.sh` script and select `nvidia-laptop` + template or if configuring manually, set the template in the `flake.nix` to + `nvidia-prime` + +2. In the `~/zaneyos/hosts/HYBRID-HOST/variables.nix` file you will need to set + the PCI IDs for the Intel and NVIDIA GPUs. Refer to + [this page](https://nixos.wiki/wiki/Nvidia) to help determine those values. + +3. Once you have everything configured properly, use the `fr` Flake Rebuild + alias to create a new generation. + +4. In the `~/zaneyos/modules/home/hyprland/config.nix` file is an ENV + setting`"AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1"` This sets the primary + and secondary GPUs. Using the info from the weblink above you might have to + change the order of these values. + +
+ +
+ +
+ +
+**๐ŸŽจ Stylix** + +
+ +
+How do I enable or disable Stylix? + +- To Enable: + +1. Edit the `~/zaneyos/modules/core/stylix.nix` file. +2. Comment out from `base16Scheme` to the `};` after `base0F` + +```nix # Styling Options stylix = { enable = true; @@ -244,168 +549,474 @@ To change the hostname, there are several steps and you will have to reboot to m size = 24; }; ``` -3. Select the image you wasnt stylex to use for the colorpalette. + +3. Select the image you want stylix to use for the colorpalette. 4. Run `fr` command alias to create a new generation with this colorscheme. -- To disable uncomment -1. Edit the `~/zaneyos/modules/core/stylix.nix` file. -2. Uncomment out from `base16Scheme` to the `};` after `base0F` +- To disable uncomment -``` - base16Scheme = { - base00 = "282936"; - base01 = "3a3c4e"; - base02 = "4d4f68"; - base03 = "626483"; - base04 = "62d6e8"; - base05 = "e9e9f4"; - base06 = "f1f2f8"; - base07 = "f7f7fb"; - base08 = "ea51b2"; - base09 = "b45bcf"; - base0A = "00f769"; - base0B = "ebff87"; - base0C = "a1efe4"; - base0D = "62d6e8"; - base0E = "b45bcf"; - base0F = "00f769"; - }; +1. Edit the `~/zaneyos/modules/core/stylix.nix` file. +2. Uncomment out from `base16Scheme` to the `};` after `base0F` -``` -3. Run the `fr`command alias to build a new generation with either the default dracula or set your own custom colors - -## How do I change the image for Stylix? - -1. Edit the `~/zaneyos/hosts/HOSTNAME/varibles.nix` -2. Change the `stylixImage = ` to the filename you want to use. Wallpapers are in `~/zaneyos/wallpapers` - -``` # Set Stylix Image - stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; +```nix + base16Scheme = { + base00 = "282936"; + base01 = "3a3c4e"; + base02 = "4d4f68"; + base03 = "626483"; + base04 = "62d6e8"; + base05 = "e9e9f4"; + base06 = "f1f2f8"; + base07 = "f7f7fb"; + base08 = "ea51b2"; + base09 = "b45bcf"; + base0A = "00f769"; + base0B = "ebff87"; + base0C = "a1efe4"; + base0D = "62d6e8"; + base0E = "b45bcf"; + base0F = "00f769"; +}; ``` -## How do I add more wallpapers? +3. Run the `fr`command alias to build a new generation with either the default + dracula or set your own custom colors -- Wallpapers are stored in the `~/zaneyos/wallpapers` directory. +
-## How do I change the background? +
+ How do I change the image Stylix uses to theme with? -- SUPER + ALT + W will select a new background +1. Edit the `~/zaneyos/hosts/HOSTNAME/varibles.nix` +2. Change the `stylixImage =` to the filename you want to use. Wallpapers are in + `~/zaneyos/wallpapers` -## How can I set a timer to change the wallpaper automatically? +```nix +# Set Stylix Image +stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; +``` -1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. +
+ +
+ +
+ +
+**๐ŸŒƒ Wallpapers** + +
+ +
+** How do I add more wallpapers? ** + +- Wallpapers are stored in the `~/zaneyos/wallpapers` directory. +- Simply copy the new ones to that directory. +- Run `git add .` To add them to the local GIT repo +- You must do a rebuild after adding new wallpapers. +- Run `fr` or `zcli rebuild` at the CLI. + +
+ +
+ +** How do I change the background? ** + +- SUPER + ALT + W will select a new background + +
+ +
+ +** How can I set a timer to change the wallpaper automatically? ** + +1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. 2. Comment out the line `sleep 1.5 && swww img ...` -3. Add new line after that with `sleep 1 && wallsetter` +3. Add new line after that with `sleep 1 && wallsetter` +```json +settings = { + exec-once = [ + "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" + "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" + "killall -q swww;sleep .5 && swww init" + "killall -q waybar;sleep .5 && waybar" + "killall -q swaync;sleep .5 && swaync" + "nm-applet --indicator" + "lxqt-policykit-agent" + "pypr &" + #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + "sleep 1 && wallsetter" + ]; ``` - settings = { - exec-once = [ - "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q swww;sleep .5 && swww init" - "killall -q waybar;sleep .5 && waybar" - "killall -q swaync;sleep .5 && swaync" - "nm-applet --indicator" - "lxqt-policykit-agent" - "pypr &" - #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" - "sleep 1 && wallsetter" - ]; -``` -4. Run the command alias `fr` to create a new generation. -5. You will need to logout or reboot to make the change effective. -## How do I change the interval the wallpaper changes? +4. Run the command alias `fr` to create a new generation. +5. You will need to logout or reboot to make the change effective. -1. Edit the `~/zaneyos/modules/home/scripts/wallsetter` -2. Change the `TIMEOUT = ` value. Which is in seconds. -3. Run the command alias `fr` to create a new generation. -4. You will need to logout or reboot to make the change effective. +
-## How do I disable the spinning snowflake at startup? +
-1. Edit the `~/zaneyos/modules/core/boot.nix` file. -2. Look for: - ``` - }; - plymouth.enable = true; - }; - ``` - 3. Change it to `false` - 4. Run the command alias `fr` to create a new generation. +**How do I change the interval the wallpaper changes? ** - ## My cursor in Kitty is "janky" and it jumps around. How do I fix that? +1. Edit the `~/zaneyos/modules/home/scripts/wallsetter` +2. Change the `TIMEOUT =` value. Which is in seconds. +3. Run the command alias `fr` to create a new generation. +4. You will need to logout or reboot to make the change effective. - - That feature is called "cursor_trail" in the `~/zaneyos/modules/home/kitty.nix` file. +
- 1. Edit that file and change the `cursor_trail 1` to `cursor_trail 0` or comment out that line. - 2. Use the command alias `fr` to create a new generation with the change. - +
-## How do I update my version ZaneyOS ? +
-### For versions v2.3+ +
+**โฌ† How do I update ZaneyOS? ** -1. First backup your existing `zaneyos` directory. +
+ +
+ For versions v2.3+ + +1. First backup your existing `zaneyos` directory. - `cp -rpv ~/zaneyos ~/Backup-ZaneyOS` -*Any changes you made to the ZaneyOS config will need to be re-done* +_Any changes you made to the ZaneyOS config will need to be re-done_ -2. In the `zaneyos` directory run `git stash && git pull` +2. In the `zaneyos` directory run `git stash && git pull` -3. Copy back your previously created host(s). +3. Copy back your previously created host(s). -- `cp -rpv ~/Backup-ZaneyOS/hosts/HOSTNAME ~/zaneyos/hosts ` +- `cp -rpv ~/Backup-ZaneyOS/hosts/HOSTNAME ~/zaneyos/hosts` 4. If you did not use the `default` host during your initial install -- Then do not copy the `default` host from your backup. The new default host might have updates or fixes you will need for the next host you create.** -- Then you will have to manually compare your backup to the new updated `default` host template, and potentially merge the changes and overwrite your `hardware.nix` file to the `~/zaneyos/hosts/default/hardware.nix` file.** +- Then do not copy the `default` host from your backup. The new default host + might have updates or fixes you will need for the next host you create.** +- Then you will have to manually compare your backup to the new updated + `default` host template, and potentially merge the changes and overwrite your + `hardware.nix` file to the `~/zaneyos/hosts/default/hardware.nix` file.** -5. In the `zaneyos` directory run `git add .` when you have finished copying your host(s). +5. In the `zaneyos` directory run `git add .` when you have finished copying + your host(s). -6. For any other changes you've made. For example: hyprland keybinds, waybar config, if you added additional packages to the `modules/packages.nix` file. Those you will have to manually merge back into the new version. +6. For any other changes you've made. For example: hyprland keybinds, waybar + config, if you added additional packages to the `modules/packages.nix` file. + Those you will have to manually merge back into the new version. -### For versions v2.0->2.2 +
-1. First backup your existing `zaneyos` directory. e.g. `cp -r ~/zaneyos ~/zaneyos-backup` - -2. There is no direct update. When you clone the the new config the config files and layout have changed. +
+ For versions v2.0->2.2 -3. You need to install zaneyos like a new install. `./install-zaneyos.sh` +1. First backup your existing `zaneyos` directory. e.g. + `cp -r ~/zaneyos ~/zaneyos-backup` -4. Once the build completes and you have rebooted you can review the new layout and decide what if any changes you made on the earlier version can be migrated to v2.3. +2. There is no direct update. When you clone the the new config the config files + and layout have changed. -### For version v1.x +3. You need to install zaneyos like a new install. `./install-zaneyos.sh` -1. The layout and configuration are completely different. Virtually noting from 1.x is applicable to v2.3. +4. Once the build completes and you have rebooted you can review the new layout + and decide what if any changes you made on the earlier version can be + migrated to v2.3. + +
+ +
+ For version v1.x + +1. The layout and configuration are completely different. Virtually noting from + 1.x is applicable to v2.3. 2. Backup your `zaneyos` directory e.g. `cp -r ~/zaneyos ~/zaneyos-backup` -3. Run the `./install-zaneyos.sh` script and follow the new install instructions. +3. Run the `./install-zaneyos.sh` script and follow the new install + instructions. -## How do I know when a new version of ZaneyOS is released? +
+ +
+ How do I know when a new version of ZaneyOS is released? It will be announced on the Zaney [Discord](https://discord.gg/W7efsSDS) server. -## How do I configure my hybrid laptop with Intel/NVIDIA GPUs? +
-1. Either run the `install-zaneyos.sh` script and select `nvidia-laptop` template or if configuring manually, set the template in the `flake.nix` to `nvidia-prime` +
-2. In the `~/zaneyos/hosts/HYBRID-HOST/variables.nix` file you will need to set the PCI IDs for the Intel and NVIDIA GPUs. Refer to [this page](https://nixos.wiki/wiki/Nvidia) to help determine those values. +
-3. Once you have everything configured properly, use the `fr` Flake Rebuild alias to create a new generation. + -4. In the `~/zaneyos/modules/home/hyprland/config.nix` file is an ENV setting` "AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1"` This sets the primary and secondary GPUs. Using the info from the weblink above you might have to change the order of these values. +
**๐Ÿ“‚ ZaneyOS v2.3 Layout** -## What are the Kitty keybindings and how can I change them? +
+ +#### ๐Ÿ“‚ ~/zaneyos + +```text +~/zaneyos/ + โ”œโ”€โ”€ hosts/ # Folder where host configs are saved + โ”‚ โ”œโ”€โ”€ default # Default host template + โ”‚ โ””โ”€โ”€ nixstation # Zaney's host + โ”œโ”€โ”€ img/ # Images for README.md + โ”œโ”€โ”€ modules/ # Core, HomeMgr, drivers config files + โ”‚ โ””โ”€โ”€ drivers/ # AMD,NVIDA,Intel,VM config files + โ”‚ โ””โ”€โ”€ core/ # Services, packages, fonts, etc + โ”‚ โ””โ”€โ”€ home/ # Home Manager config files + โ”‚ โ”œโ”€โ”€ fastfetch/ # Fastfetch config + โ”‚ โ”œโ”€โ”€ hyprland/ # Hyrprland configs + โ”‚ โ”œโ”€โ”€ rofi/ # rofi menu configs + โ”‚ โ”œโ”€โ”€ scripts/ # screenshots, wallpaper, etc. + โ”‚ โ”œโ”€โ”€ waybar/ # waybar configs in NIX format + โ”‚ โ”œโ”€โ”€ wlogout/ # Theme, config for logout menu + โ”‚ โ”œโ”€โ”€ yazi/ # TUI filemgr config file + โ”‚ โ””โ”€โ”€ zsh/ # Theme and settings for ZSH + โ”œโ”€โ”€ profiles/ # Video hardware templates + โ”‚ โ”œโ”€โ”€ amd/ # AMD Video config files + โ”‚ โ”œโ”€โ”€ intel/ # Intel video config files + โ”‚ โ”œโ”€โ”€ nvidia/ # NVIDIA discrete video config files + โ”‚ โ”œโ”€โ”€ nvidia-laptop/ # NVIDIA Hybrid video config files + โ”‚ โ””โ”€โ”€ vm/ # Virtual Machine config files + โ”œโ”€โ”€ wallpapers/ # Add your wallpapers here + โ”œโ”€โ”€ CHANGELOG.md # List of changes + โ”œโ”€โ”€ CONTRIBUTING.md # How you can help + โ”œโ”€โ”€ FAQ.md # Frequently Asked Questions + โ”œโ”€โ”€ flake.lock # Saves version info on all installed packages + โ”œโ”€โ”€ flake.nix # flake that controls ZaneyOS config + โ”œโ”€โ”€ install-zaneyos.sh # Install script for ZaneyOS + โ”œโ”€โ”€ LICENSE # MIT license ZaneyOS is using + โ””โ”€โ”€ README.md # Intro document for ZaneyOS +``` + +
+ +
+ +## ๐Ÿงฐ Miscellaneous + +
+ +**๐Ÿชง Rebuild or update fails with Home Manager error can't backup a file** + +
+
+ +```text +May 08 18:33:57 explorer hm-activate-dwilliams[92420]: Please do one of the following: +May 08 18:33:57 explorer hm-activate-dwilliams[92420]: - Move or remove the above files and try again. +May 08 18:33:57 explorer hm-activate-dwilliams[92420]: - In standalone mode, use 'home-manager switch -b backup' to back up +May 08 18:33:57 explorer hm-activate-dwilliams[92420]: files automatically. +May 08 18:33:57 explorer hm-activate-dwilliams[92420]: - When used as a NixOS or nix-darwin module, set +May 08 18:33:57 explorer hm-activate-dwilliams[92420]: 'home-manager.backupFileExtension' +May 08 18:33:57 explorer hm-activate-dwilliams[92420]: to, for example, 'backup' and rebuild. +May 08 18:33:57 explorer systemd[1]: home-manager-dwilliams.service: Main process exited, code=exited, status=1/FAILURE +May 08 18:33:57 explorer systemd[1]: home-manager-dwilliams.service: Failed with result 'exit-code'. +May 08 18:33:57 explorer systemd[1]: Failed to start Home Manager environment for dwilliams. +``` + +- There is a script `hm-find` That will search the journal and if found, +- It will prompt you to delete these backups +- It creates a log as well +- Note: The script is not perfect +- If you get this msg but `hm-find` doesn't report any you will have to search + manually e.g `journalctl | grep hm-activate` +- You can now redo your rebuild +- If you ran `fu` for `flake update` you can now do `fr` for `flake rebuild` +- The flake has already been updated + +
+
+ +
+ +**๐Ÿ“š What is the difference between Master and Dwindle layouts** + +
+
+ +**1. Master Layout** + +- The **Master** layout divides the workspace into two main areas: + - A **master area** for the primary window, which takes up a larger portion of + the screen. + - A **stack area** for all other windows, which are tiled in the remaining + space. +- This layout is ideal for workflows where you want to focus on a single main + window while keeping others accessible. + +**2. Dwindle Layout** + +- The **Dwindle** layout is a binary tree-based tiling layout: + - Each new window splits the available space dynamically, alternating between + horizontal and vertical splits. + - The splits are determined by the aspect ratio of the parent container (e.g., + wider splits horizontally, taller splits vertically). +- This layout is more dynamic and evenly distributes space among all windows. + +--- + +**How to Verify the Current Layout** + +To check which layout is currently active, use the `hyprctl` command: + +`hyprctl getoption general:layout` + +
+ + + + +
+**๐Ÿ“ฆ What are the Yazi keybindings and how can I change them? ** + +

+ +The Yazi configuration file is located in `~/zaneyos/modules/home/yazi.nix` + +Yazi is configured like VIM and VIM motions + +The keymap is in the `~/zaneyos/modules/home/yazi/keymap.toml` file + +
+
+ +
+ +** What fonts are avialable in NixOS** + +```nix +{pkgs, ...}: { + fonts = { + packages = with pkgs; [ + dejavu_fonts + fira-code + fira-code-symbols + font-awesome + hackgen-nf-font + ibm-plex + inter + jetbrains-mono + material-icons + maple-mono.NF + minecraftia + nerd-fonts.im-writing + nerd-fonts.blex-mono + noto-fonts + noto-fonts-emoji + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-monochrome-emoji + powerline-fonts + roboto + roboto-mono + symbola + terminus_font + # NERD fonts + nerd-fonts.0xproto + nerd-fonts._3270 + nerd-fonts.agave + nerd-fonts.anonymice + nerd-fonts.arimo + nerd-fonts.aurulent-sans-mono + nerd-fonts.bigblue-terminal + nerd-fonts.bitstream-vera-sans-mono + nerd-fonts.blex-mono + nerd-fonts.caskaydia-cove + nerd-fonts.caskaydia-mono + nerd-fonts.code-new-roman + nerd-fonts.comic-shanns-mono + nerd-fonts.commit-mono + nerd-fonts.cousine + nerd-fonts.d2coding + nerd-fonts.daddy-time-mono + nerd-fonts.departure-mono + nerd-fonts.dejavu-sans-mono + nerd-fonts.droid-sans-mono + nerd-fonts.envy-code-r + nerd-fonts.fantasque-sans-mono + nerd-fonts.fira-code + nerd-fonts.fira-mono + nerd-fonts.geist-mono + nerd-fonts.go-mono + nerd-fonts.gohufont + nerd-fonts.hack + nerd-fonts.hasklug + nerd-fonts.heavy-data + nerd-fonts.hurmit + nerd-fonts.im-writing + nerd-fonts.inconsolata + nerd-fonts.inconsolata-go + nerd-fonts.inconsolata-lgc + nerd-fonts.intone-mono + nerd-fonts.iosevka + nerd-fonts.iosevka-term + nerd-fonts.iosevka-term-slab + nerd-fonts.jetbrains-mono + nerd-fonts.lekton + nerd-fonts.liberation + nerd-fonts.lilex + nerd-fonts.martian-mono + nerd-fonts.meslo-lg + nerd-fonts.monaspace + nerd-fonts.monofur + nerd-fonts.monoid + nerd-fonts.mononoki + nerd-fonts.mplus + nerd-fonts.noto + nerd-fonts.open-dyslexic + nerd-fonts.overpass + nerd-fonts.profont + nerd-fonts.proggy-clean-tt + nerd-fonts.recursive-mono + nerd-fonts.roboto-mono + nerd-fonts.shure-tech-mono + nerd-fonts.sauce-code-pro + nerd-fonts.space-mono + nerd-fonts.symbols-only + nerd-fonts.terminess-ttf + nerd-fonts.tinos + nerd-fonts.ubuntu + nerd-fonts.ubuntu-mono + nerd-fonts.ubuntu-sans + nerd-fonts.victor-mono + nerd-fonts.zed-mono + + ]; + }; +} +``` + +
+ +## ๐Ÿ–ฅ๏ธ Terminals + +
+**๐Ÿฑ Kitty** + +
+ +My cursor in Kitty is "janky" and it jumps around. How do I fix that? + +- That feature is called "cursor_trail" in the + `~/zaneyos/modules/home/kitty.nix` file. + +1. Edit that file and change the `cursor_trail 1` to `cursor_trail 0` or comment + out that line. +2. Use the command alias `fr` to create a new generation with the change. + +
+ +
+ What are the Kitty keybindings and how can I change them? + +The kitty bindings are configured in `~/zaneyos/modules/home/kitty.nix` -The kitty bindings are configured in `~/zaneyos/modules/home/kitty.nix` - The defaults are: -``` +```text # Clipboard map ctrl+shift+v paste_from_selection map shift+insert paste_from_selection @@ -422,7 +1033,8 @@ The defaults are: map ctrl+shift+h show_scrollback # Window management - map alt+n new_os_window + map alt+n new_window_with_cwd #Opens new window in current directory + #map alt+n new_os_window #Opens new window in $HOME dir map alt+w close_window map ctrl+shift+enter launch --location=hsplit map ctrl+shift+s launch --location=vsplit @@ -455,21 +1067,24 @@ The defaults are: map ctrl+shift+up increase_font_size map ctrl+shift+down decrease_font_size map ctrl+shift+backspace restore_font_size - ``` -## What are the Yazi keybindings and how can I change them? +
+
-The Yazi configuration file is located in `~/zaneyos/modules/home/yazi.nix` +
-Yazi is configured like VIM and VIM motions +**๐Ÿ‡ผ WezTerm** -The keymap is in the `~/zaneyos/modules/home/yazi/keymap.toml` file +
-## How do I enable WezTerm? +
- Edit the `/zaneyos/modules/home/wezterm.nix` Change `enable = false` to `enable = true;` - Save the file and rebuild zaneyos with the `fr` command. +How do I enable WezTerm? + +Edit the `/zaneyos/modules/home/wezterm.nix` Change `enable = false` to +`enable = true;`\ +Save the file and rebuild zaneyos with the `fr` command. ``` {pkgs, ...}: { @@ -477,14 +1092,18 @@ The keymap is in the `~/zaneyos/modules/home/yazi/keymap.toml` file enable = false; package = pkgs.wezterm; }; - -``` -## What are the WezTerm keybindings and how can I change them? - -The kitty bindings are configured in `~/zaneyos/modules/home/wezterm.nix` - -The defaults are: ``` + +
+ +
+ What are the WezTerm keybindings and how can I change them? + +The kitty bindings are configured in `~/zaneyos/modules/home/wezterm.nix` + +The defaults are: + +```text ALT is the defined META key for WezTerm -- Tab management ALT + t Open new Tab @@ -500,32 +1119,49 @@ ALT + Left Arrow Move to pane -- Left ALT + Right Arrow Move to pane -- Right ALT + Down Arrow Move to pane -- Down ALT + Up Arrow Move to pane -- Down - ``` -## How do I enable the ghostty terminal? +
+
+
-1. Edit the `~/zaneyos/modules/home/ghostty.nix` file. +
+**๐Ÿ‘ป Ghostty ** + +
+ +
+ How do I enable the ghostty terminal? + +1. Edit the `~/zaneyos/modules/home/ghostty.nix` file. 2. Change `enable = true;` -3. Run the command alias `fr` to create a new generation. +3. Run the command alias `fr` to create a new generation. -## How do I change the ghostty theme? +
+ +
+ + How do I change the ghostty theme? 1. Edit the `~/zaneyos/modules/home/ghostty.nix` file. 2. There are several example themes included but commented out. +```text +#theme = Aura +theme = Dracula +#theme = Aardvark Blue +#theme = GruvboxDarkHard ``` - #theme = Aura - theme = Dracula - #theme = Aardvark Blue - #theme = GruvboxDarkHard -``` -3. Comment out `Dracula` and either uncomment one of the others or add one of ghostty's many themes. +3. Comment out `Dracula` and either uncomment one of the others or add one of + ghostty's many themes. -## What are the default ghostty keybindings? +
-``` +
+ What are the default ghostty keybindings? + +```text # keybindings keybind = alt+s>r=reload_config keybind = alt+s>x=close_surface @@ -564,16 +1200,131 @@ ALT + Up Arrow Move to pane -- Down keybind = alt+s>e=equalize_splits ``` -## I am new to NIXOS where can I go to get more info? +
+
+
+ +## ๐Ÿชง General NixOS related topics + +
+**โ„ What are Flakes in NixOS? ** + +
+ +**Flakes** are a feature of the Nix package manager that simplifies and +standardizes how configurations, dependencies, and packages are managed. If +you're familiar with tools like `package.json` in JavaScript or `Cargo.toml` in +Rust, flakes serve a similar purpose in the Nix ecosystem. + +#### Key Features of Flakes: + +1. **Pin Dependencies**: + - Flakes lock the versions of dependencies in a `flake.lock` file, ensuring + reproducibility across systems. + +2. **Standardize Configurations**: + - They use a `flake.nix` file to define how to build, run, or deploy a + project or system, making setups more predictable. + +3. **Improve Usability**: + - Flakes simplify sharing and reusing configurations across different systems + or projects by providing a consistent structure. + +In essence, flakes help manage NixOS setups or Nix-based projects in a more +portable and reliable way. + +
+ +
+ +
+**๐Ÿก What is NixOS Home Manager? ** + +**Home Manager** is a powerful tool in the Nix ecosystem that allows you to +declaratively manage user-specific configurations and environments. With Home +Manager, you can streamline the setup of dotfiles, shell settings, applications, +and system packages for your user profile. + +### Key Features of Home Manager: + +1. **Declarative Configuration**: + - Define all your settings and preferences in a single `home.nix` file, + making it easy to track, share, and replicate your setup. + +2. **Cross-Distribution Support**: + - Home Manager works not only on NixOS but also on other Linux distributions + and macOS, allowing you to standardize configurations across devices. + +3. **User Environment Management**: + - Manage applications, environment variables, shell configurations, and + moreโ€”all isolated to your user profile. + +### Why Use Home Manager? + +Home Manager simplifies system management by offering consistency, +reproducibility, and portability. Whether youโ€™re customizing your development +environment or sharing configurations between machines, it provides an efficient +way to tailor your user experience. + +
+ +
+**๐Ÿญ What are Atomic Builds?** + +**Atomic builds** in NixOS ensure that any system change (like installing +software or updating the configuration) is applied in a safe and fail-proof way. +This means that a system update is either fully successful or has no effect at +all, eliminating the risk of a partially applied or broken system state. + +### How Atomic Builds Work: + +1. **Immutable System Generation**: + - Every configuration change creates a new "generation" of the system, while + the previous ones remain untouched. You can easily roll back to an earlier + generation if something goes wrong. + +2. **Transaction-Like Behavior**: + - Similar to database transactions, changes are applied atomically: either + they succeed and become the new active system, or they fail and leave the + current system unchanged. + +3. **Seamless Rollbacks**: + - In case of errors or issues, you can reboot and select a previous system + generation from the boot menu to return to a working state. + +### Benefits of Atomic Builds: + +- **Reliability**: Your system is always in a consistent state, even if a + configuration change fails. +- **Reproducibility**: The same configuration will always produce the same + system state, making it easy to debug or replicate. +- **Ease of Rollback**: Reverting to a working configuration is as simple as + rebooting and selecting the previous generation. + +### Why NixOS Uses Atomic Builds: + +This feature is a cornerstone of NixOS's declarative and reproducible design +philosophy, ensuring that system management is predictable and stress-free. + +
+ +
+**โ“ I am new to NIXOS where can I go to get more info? ** - [NIXOS Config Guide](https://www.youtube.com/watch?v=AGVXJ-TIv3Y&t=34s) - [VIMJOYER YouTube Channel](https://www.youtube.com/@vimjoyer/videos) - [Librephoenix YouTube Channel](https://www.youtube.com/@librephoenix) - [8 Part Video Series on NIXOS](https://www.youtube.com/watch?v=QKoQ1gKJY5A&list=PL-saUBvIJzOkjAw_vOac75v-x6EzNzZq-) +- [Great guide for NixOS and Flakes](https://nixos-and-flakes.thiscute.world/preface) -## Where can I get info on using GIT repositories +
+ +
+**๐Ÿค Where can I get info on using GIT repositories ** - [Managing NIXOS config with GIT](https://www.youtube.com/watch?v=20BN4gqHwaQ) - [GIT for dummies](https://www.youtube.com/watch?v=K6Q31YkorUE) - [How GIT works](https://www.youtube.com/watch?v=e9lnsKot_SQ) - [In depth 1hr video on GIT](https://www.youtube.com/watch?v=S7XpTAnSDL4&t=123s) + +
diff --git a/README.md b/README.md index 4477206..97e875e 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ This includes the wallpaper, scripts, applications, config files, and more. #### ๐Ÿ– Requirements -- You must be running on NixOS, version 23.11+. +- You must be running on NixOS, version 23.11+. - The zaneyos folder (this repo) is expected to be in your home directory. -- Must have installed using **GPT** & **UEFI**. Systemd-boot is what is supported, for - GRUB you will have to brave the internet for a how-to. โ˜บ๏ธ +- Must have installed using **GPT** & **UEFI**. Systemd-boot is what is + supported, for GRUB you will have to brave the internet for a how-to. โ˜บ๏ธ - Manually editing your host specific files. The host is the specific computer your installing on. @@ -78,6 +78,65 @@ Please do yourself a favor and - Contact me on [Discord](https://discord.gg/2cRdBs8) as well, for a potentially faster response. +# Hyprland Keybindings + +Below are the keybindings for Hyprland, formatted for easy reference. + +## Application Launching + +- `$modifier + Return` โ†’ Launch `Terminal` +- `$modifier + K` โ†’ List keybinds +- `$modifier + Shift + Return` โ†’ Launch `rofi-launcher` +- `$modifier + Shift + W` โ†’ Open `web-search` +- `$modifier + Alt + W` โ†’ Open `wallsetter` +- `$modifier + Shift + N` โ†’ Run `swaync-client -rs` +- `$modifier + W` โ†’ Launch `Web Browser` +- `$modifier + Y` โ†’ Open `kitty` with `yazi` +- `$modifier + E` โ†’ Open `emopicker9000` +- `$modifier + S` โ†’ Take a screenshot +- `$modifier + D` โ†’ Open `Discord` +- `$modifier + O` โ†’ Launch `OBS Studio` +- `$modifier + C` โ†’ Run `hyprpicker -a` +- `$modifier + G` โ†’ Open `GIMP` +- `$modifier + V` โ†’ Show clipboard history via `cliphist` +- `$modifier + T` โ†’ Toggle terminal with `pypr` +- `$modifier + M` โ†’ Open `pavucontrol` + +## Window Management + +- `$modifier + Q` โ†’ Kill active window +- `$modifier + P` โ†’ Toggle pseudo tiling +- `$modifier + Shift + I` โ†’ Toggle split mode +- `$modifier + F` โ†’ Toggle fullscreen +- `$modifier + Shift + F` โ†’ Toggle floating mode +- `$modifier + Alt + F` โ†’ Float all windows +- `$modifier + Shift + C` โ†’ Exit Hyprland + +## Window Movement + +- `$modifier + Shift + โ† / โ†’ / โ†‘ / โ†“` โ†’ Move window left/right/up/down +- `$modifier + Shift + H / L / K / J` โ†’ Move window left/right/up/down +- `$modifier + Alt + โ† / โ†’ / โ†‘ / โ†“` โ†’ Swap window left/right/up/down +- `$modifier + Alt + 43 / 46 / 45 / 44` โ†’ Swap window left/right/up/down + +## Focus Movement + +- `$modifier + โ† / โ†’ / โ†‘ / โ†“` โ†’ Move focus left/right/up/down +- `$modifier + H / L / K / J` โ†’ Move focus left/right/up/down + +## Workspaces + +- `$modifier + 1-10` โ†’ Switch to workspace 1-10 +- `$modifier + Shift + Space` โ†’ Move window to special workspace +- `$modifier + Space` โ†’ Toggle special workspace +- `$modifier + Shift + 1-10` โ†’ Move window to workspace 1-10 +- `$modifier + Control + โ†’ / โ†` โ†’ Switch workspace forward/backward + +## Window Cycling + +- `Alt + Tab` โ†’ Cycle to next window +- `Alt + Tab` โ†’ Bring active window to top + ## โฌ‡๏ธ Install Don't forget to checkout the [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq) @@ -95,7 +154,7 @@ Simply copy this and run it: ![ZaneyOS First Install Command](img/first-install-cmd.jpg) ``` -nix-shell -p git curl +nix-shell -p git curl pciutils ``` Then: @@ -103,7 +162,7 @@ Then: ![ZaneyOS Install Script Command](img/install-script.jpg) ``` -sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh) +sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.3/install-zaneyos.sh) ``` #### The install process will look something like this: @@ -131,7 +190,7 @@ nix-shell -p git vim 2. Clone this repo & enter it: ``` -cd && git clone https://gitlab.com/zaney/zaneyos.git +cd && git clone -b stable-2.3 --single-branch https://gitlab.com/Zaney/zaneyos.git cd zaneyos ``` @@ -141,6 +200,7 @@ cd zaneyos ``` cp -r hosts/default hosts/ +git add . ``` 4. Edit `hosts//variables.nix`. diff --git a/flake.lock b/flake.lock index 10d7c12..255ba75 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1741628778, - "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -84,30 +84,34 @@ } }, "flake-compat": { + "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "ref": "refs/heads/main", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "revCount": 92, + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -120,16 +124,15 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -138,45 +141,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -193,67 +157,19 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -265,47 +181,27 @@ ] }, "locked": { - "lastModified": 1742326330, - "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741635347, - "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "mnw": { "locked": { - "lastModified": 1742255973, - "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -314,70 +210,29 @@ "type": "github" } }, - "nil": { - "inputs": { - "flake-utils": [ - "nvf", - "flake-utils" - ], - "nixpkgs": [ - "nvf", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", - "owner": "oxalica", - "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1756696532, + "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", "type": "github" }, "original": { @@ -389,39 +244,26 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -429,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741693509, - "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "lastModified": 1751320053, + "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "owner": "nix-community", "repo": "NUR", - "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "type": "github" }, "original": { @@ -444,20 +286,18 @@ }, "nvf": { "inputs": { + "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "mnw": "mnw", - "nil": "nil", "nixpkgs": "nixpkgs_2", - "nmd": "nmd", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1742330074, - "narHash": "sha256-wZFnf72PZACOgH4pXbB2noAWoU51o+/8P6IY2tr6e7k=", + "lastModified": 1757397598, + "narHash": "sha256-v/FANUOWyeWlWCD61HDLSNO9nHnQALAtvLf2VtE1+WU=", "owner": "notashelf", "repo": "nvf", - "rev": "a5dee946a9eb749649d17a9d4cd78271600247d0", + "rev": "c7944a48a3c61cb3ca08ac2dc8b8de124d15dcb8", "type": "github" }, "original": { @@ -474,28 +314,6 @@ "stylix": "stylix" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -503,14 +321,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "git-hooks": "git-hooks", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -518,15 +333,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742387260, - "narHash": "sha256-qZMb5nzhQE+CEfFWLTsAqeF7s2vzft1Y7JnLF2UEAqY=", + "lastModified": 1757361712, + "narHash": "sha256-GwObJtrAqVim66e4Jb5VzAKT6zGFJ3KOi63rfcrfMV4=", "owner": "danth", "repo": "stylix", - "rev": "cca176fce11ba11dca6ea3ad9d44dca742b9f732", + "rev": "3bf1430ed85a4484e4e1facee2344d2bb20288e6", "type": "github" }, "original": { "owner": "danth", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -561,21 +377,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -596,28 +397,27 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1741468895, - "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -629,11 +429,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740877430, - "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -645,11 +445,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4466e23..f5ecf96 100644 --- a/flake.nix +++ b/flake.nix @@ -3,19 +3,19 @@ inputs = { home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nvf.url = "github:notashelf/nvf"; - stylix.url = "github:danth/stylix"; + stylix.url = "github:danth/stylix/release-25.05"; }; outputs = {nixpkgs, ...} @ inputs: let system = "x86_64-linux"; - host = "nixstation"; - profile = "nvidia"; - username = "zaney"; + host = "zaneyos-23-vm"; + profile = "vm"; + username = "dwilliams"; in { nixosConfigurations = { amd = nixpkgs.lib.nixosSystem { diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index 86863d7..f44b200 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -3,6 +3,5 @@ audacity discord nodejs - obs-studio ]; } diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index a2aa75b..2249b2d 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -1,10 +1,14 @@ { # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Tyler Kelley"; - gitEmail = "tylerzanekelley@gmail.com"; + gitUsername = "Don Williams"; + gitEmail = "don.e.williams@gmail.com"; # Hyprland Settings - extraMonitorSettings = ""; + # ex "monitor=HDMI-A-1, 1920x1080@60,auto,1" + # + extraMonitorSettings = " + monitor = Virtual-1, 1920x1080@60,auto,1 + "; # Waybar Settings clock24h = false; @@ -25,20 +29,38 @@ # Enable Printing Support printEnable = false; + # Enable Thunar GUI File Manager + thunarEnable = false; + # Set Stylix Image stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; + #stylixImage = ../../wallpapers/nix-wallpaper-stripes-logo.png; + #stylixImage = ../../wallpapers/beautifulmountainscape.png; + #stylixImage = ../../wallpapers/mountainscapedark.jpg; + #stylixImage = ../../wallpapers/Rainnight.jpg; + #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; # Set Waybar - # Includes alternates such as waybar-curved.nix & waybar-ddubs.nix - waybarChoice = ../../modules/home/waybar/waybar-simple.nix; + # Includes alternates such as: + # Just uncomment the one you want and comment out the others + + #waybarChoice = ../../modules/home/waybar/Jerry-waybars.nix; + #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; + waybarChoice = ../../modules/home/waybar/waybar-curved.nix; + #waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; + #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; # Set Animation style # Available options are: - # animations-def.nix (default) + # animations-def.nix (standard) # animations-end4.nix (end-4 project) # animations-dynamic.nix (ml4w project) - animChoice = ../../modules/home/hyprland/animations-def.nix; - - # Enable Thunar GUI File Manager - thunarEnable = false; + # animations-moving.nix (ml4w project) + # Just change the name after the - and rebuild + animChoice = ../../modules/home/hyprland/animations-end4.nix; + #animChoice = ../../modules/home/hyprland/animations-def.nix; + #animChoice = ../../modules/home/hyprland/animations-dynamix.nix; + # Note: Moving changes window resizing it shrinks then pops back + #animChoice = ../../modules/home/hyprland/animations-moving.nix; } diff --git a/hosts/nixstation/host-packages.nix b/hosts/nixstation/host-packages.nix index 60dbba4..2f9f2f8 100644 --- a/hosts/nixstation/host-packages.nix +++ b/hosts/nixstation/host-packages.nix @@ -3,7 +3,6 @@ audacity discord nodejs - obs-studio handbrake yt-dlp android-studio diff --git a/hosts/zaneyos-23-vm/default.nix b/hosts/zaneyos-23-vm/default.nix new file mode 100644 index 0000000..6faad47 --- /dev/null +++ b/hosts/zaneyos-23-vm/default.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ./hardware.nix + ./host-packages.nix + ]; +} diff --git a/hosts/zaneyos-23-vm/hardware.nix b/hosts/zaneyos-23-vm/hardware.nix new file mode 100644 index 0000000..80ea1a5 --- /dev/null +++ b/hosts/zaneyos-23-vm/hardware.nix @@ -0,0 +1,42 @@ +{ + lib, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot = { + initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + initrd.kernelModules = []; + kernelModules = ["kvm-intel"]; + extraModulePackages = []; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/52c176b4-8de0-4607-b52f-8ca391f8b469"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/6EA3-CBC7"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + "/mnt/nas" = { + device = "192.168.40.11:/volume1/DiskStation54TB"; + fsType = "nfs"; + options = ["rw" "bg" "soft" "tcp" "_netdev"]; + }; + }; + + swapDevices = []; + + security.sudo.wheelNeedsPassword = false; + + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.ens18.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/zaneyos-23-vm/host-packages.nix b/hosts/zaneyos-23-vm/host-packages.nix new file mode 100644 index 0000000..d43b193 --- /dev/null +++ b/hosts/zaneyos-23-vm/host-packages.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + audacity + discord + nodejs + ]; +} diff --git a/hosts/zaneyos-23-vm/variables.nix b/hosts/zaneyos-23-vm/variables.nix new file mode 100644 index 0000000..239445f --- /dev/null +++ b/hosts/zaneyos-23-vm/variables.nix @@ -0,0 +1,52 @@ +{ + # Git Configuration ( For Pulling Software Repos ) + gitUsername = "Don Williams"; + gitEmail = "don.e.williams@gmail.com"; + + # Hyprland Settings + extraMonitorSettings = " + monitor=Virtual-1,1920x1080@60,auto,1 + "; + + # Waybar Settings + clock24h = false; + + # Program Options + browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) + terminal = "kitty"; # Set Default System Terminal + keyboardLayout = "us"; + consoleKeyMap = "us"; + + # For Nvidia Prime support + intelID = "PCI:1:0:0"; + nvidiaID = "PCI:0:2:0"; + + # Enable NFS + enableNFS = true; + + # Enable Printing Support + printEnable = false; + + # Set Stylix Image + stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; + + # Set Waybar + # # Available options are: + # waybar-simple.nix + # waybar-curved.nix + # waybar-ddubs.nix + # waybar-ddubs-2.nix + # Jerry-waybar.nix + waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; + + # Set Animation style + # Available options are: + # animations-def.nix (default) + # animations-end4.nix (end-4 project) + # animations-dynamic.nix (ml4w project) + # animations-moving.nix (ml4w project) + animChoice = ../../modules/home/hyprland/animations-moving.nix; + + # Enable Thunar GUI File Manager + thunarEnable = true; +} diff --git a/install-zaneyos.sh b/install-zaneyos.sh old mode 100644 new mode 100755 index 5e3efa7..72cbce5 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -1,41 +1,168 @@ #!/usr/bin/env bash +###################################### +# Install script for zaneyos +# Author: Don Williams +# Date: June 27, 2005 +####################################### + +# Define colors +RED='\033[0;31m' +GREEN='\033[0;32m' +NC='\033[0m' # No Color + +# Define log file +LOG_DIR="$(dirname "$0")" +LOG_FILE="${LOG_DIR}/install_$(date +"%Y-%m-%d_%H-%M-%S").log" + +mkdir -p "$LOG_DIR" +exec > >(tee -a "$LOG_FILE") 2>&1 + +# Function to print a section header +print_header() { + echo -e "${GREEN}โ•”โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•—${NC}" + echo -e "${GREEN}โ•‘ ${1} ${NC}" + echo -e "${GREEN}โ•šโ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•${NC}" +} + +# Function to print an error message +print_error() { + echo -e "${RED}Error: ${1}${NC}" +} + +# Function to print a success banner +print_success_banner() { + echo -e "${GREEN}โ•”โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•—${NC}" + echo -e "${GREEN}โ•‘ ZaneyOS Installation Successful! โ•‘${NC}" + echo -e "${GREEN}โ•‘ โ•‘${NC}" + echo -e "${GREEN}โ•‘ Please reboot your system for changes to take full effect. โ•‘${NC}" + echo -e "${GREEN}โ•‘ โ•‘${NC}" + echo -e "${GREEN}โ•šโ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•${NC}" +} + +# Function to print a failure banner +print_failure_banner() { + echo -e "${RED}โ•”โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•—${NC}" + echo -e "${RED}โ•‘ ZaneyOS Installation Failed! โ•‘${NC}" + echo -e "${RED}โ•‘ โ•‘${NC}" + echo -e "${RED}โ•‘ Please review the log file for details: โ•‘${NC}" + echo -e "${RED}โ•‘ ${LOG_FILE} โ•‘${NC}" + echo -e "${RED}โ•‘ โ•‘${NC}" + echo -e "${RED}โ•šโ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•${NC}" +} + +print_header "Verifying System Requirements" + +# Check for git +if ! command -v git &> /dev/null; then + print_error "Git is not installed." + echo -e "Please install git and pciutils are installed, then re-run the install script." + echo -e "Example: nix-shell -p git pciutils" + exit 1 +fi + +# Check for lspci (pciutils) +if ! command -v lspci &> /dev/null; then + print_error "pciutils is not installed." + echo -e "Please install git and pciutils, then re-run the install script." + echo -e "Example: nix-shell -p git pciutils" + exit 1 +fi + if [ -n "$(grep -i nixos < /etc/os-release)" ]; then - echo "Verified this is NixOS." - echo "-----" + echo -e "${GREEN}Verified this is NixOS.${NC}" else - echo "This is not NixOS or the distribution information is not available." - exit + print_error "This is not NixOS or the distribution information is not available." + exit 1 fi -if command -v git &> /dev/null; then - echo "Git is installed, continuing with installation." - echo "-----" -else - echo "Git is not installed. Please install Git and try again." - echo "Example: nix-shell -p git" - exit -fi +print_header "Initial Setup" -echo "Default options are in brackets []" -echo "Just press enter to select the default" +echo -e "Default options are in brackets []" +echo -e "Just press enter to select the default" sleep 2 -echo "-----" +print_header "Ensure In Home Directory" +cd "$HOME" || exit 1 +echo -e "${GREEN}Current directory: $(pwd)${NC}" -echo "Ensure In Home Directory" -cd || exit +print_header "Hostname Configuration" -echo "-----" - -read -rp "Enter Your New Hostname: [ default ] " hostName +# Critical warning about using "default" as hostname +echo -e "${RED}โš ๏ธ IMPORTANT WARNING: Do NOT use 'default' as your hostname!${NC}" +echo -e "${RED} The 'default' hostname is a template and will be overwritten during updates.${NC}" +echo -e "${RED} This will cause you to lose your configuration!${NC}" +echo "" +echo -e "๐Ÿ’ก Suggested hostnames: my-desktop, gaming-rig, workstation, nixos-laptop" +read -rp "Enter Your New Hostname: [ my-desktop ] " hostName if [ -z "$hostName" ]; then - hostName="default" + hostName="my-desktop" fi -echo "-----" +# Double-check if user accidentally entered "default" +if [ "$hostName" = "default" ]; then + echo -e "${RED}โŒ Error: You cannot use 'default' as hostname. Please choose a different name.${NC}" + read -rp "Enter a different hostname: " hostName + if [ -z "$hostName" ] || [ "$hostName" = "default" ]; then + echo -e "${RED}Setting hostname to 'my-desktop' to prevent configuration loss.${NC}" + hostName="my-desktop" + fi +fi -read -rp "Enter Your Hardware Profile (GPU) +echo -e "${GREEN}โœ“ Hostname set to: $hostName${NC}" + +print_header "GPU Profile Detection" + +# Attempt automatic detection +DETECTED_PROFILE="" + +has_nvidia=false +has_intel=false +has_amd=false +has_vm=false + +if lspci | grep -qi 'vga\|3d'; then + while read -r line; do + if echo "$line" | grep -qi 'nvidia'; then + has_nvidia=true + elif echo "$line" | grep -qi 'amd'; then + has_amd=true + elif echo "$line" | grep -qi 'intel'; then + has_intel=true + elif echo "$line" | grep -qi 'virtio\|vmware'; then + has_vm=true + fi + done < <(lspci | grep -i 'vga\|3d') + + if $has_vm; then + DETECTED_PROFILE="vm" + elif $has_nvidia && $has_intel; then + DETECTED_PROFILE="nvidia-laptop" # Hybrid systems typically use nvidia-laptop profile + elif $has_nvidia; then + DETECTED_PROFILE="nvidia" + elif $has_amd; then + DETECTED_PROFILE="amd" + elif $has_intel; then + DETECTED_PROFILE="intel" + fi +fi + +# Handle detected profile or fall back to manual input +if [ -n "$DETECTED_PROFILE" ]; then + profile="$DETECTED_PROFILE" + echo -e "${GREEN}Detected GPU profile: $profile${NC}" + read -p "Correct? (Y/N): " -n 1 -r + echo + if [[ ! $REPLY =~ ^[Yy]$ ]]; then + echo -e "${RED}GPU profile not confirmed. Falling back to manual selection.${NC}" + profile="" # Clear profile to force manual input + fi +fi + +# If profile is still empty (either not detected or not confirmed), prompt manually +if [ -z "$profile" ]; then + echo -e "${RED}Automatic GPU detection failed or no specific profile found.${NC}" + read -rp "Enter Your Hardware Profile (GPU) Options: [ amd ] nvidia @@ -43,77 +170,178 @@ nvidia-laptop intel vm Please type out your choice: " profile -if [ -z "$profile" ]; then - profile="amd" + if [ -z "$profile" ]; then + profile="amd" + fi + echo -e "${GREEN}Selected GPU profile: $profile${NC}" fi -echo "-----" +# Validate profile is supported +valid_profiles=("amd" "nvidia" "nvidia-laptop" "intel" "vm") +if [[ ! " ${valid_profiles[@]} " =~ " ${profile} " ]]; then + print_error "Invalid profile '$profile'. Valid options are: ${valid_profiles[*]}" + echo -e "${RED}Please run the script again and select a valid profile.${NC}" + exit 1 +fi -backupname=$(date "+%Y-%m-%d-%H-%M-%S") +print_header "Backup Existing ZaneyOS (if any)" + +backupname=$(date +"%Y-%m-%d-%H-%M-%S") if [ -d "zaneyos" ]; then - echo "ZaneyOS exists, backing up to .config/zaneyos-backups folder." + echo -e "${GREEN}zaneyos exists, backing up to .config/zaneyos-backups folder.${NC}" if [ -d ".config/zaneyos-backups" ]; then - echo "Moving current version of ZaneyOS to backups folder." + echo -e "${GREEN}Moving current version of ZaneyOS to backups folder.${NC}" mv "$HOME"/zaneyos .config/zaneyos-backups/"$backupname" sleep 1 else - echo "Creating the backups folder & moving ZaneyOS to it." + echo -e "${GREEN}Creating the backups folder & moving ZaneyOS to it.${NC}" mkdir -p .config/zaneyos-backups mv "$HOME"/zaneyos .config/zaneyos-backups/"$backupname" sleep 1 fi else - echo "Thank you for choosing ZaneyOS." - echo "I hope you find your time here enjoyable!" + echo -e "${GREEN}Thank you for choosing ZaneyOS.${NC}" + echo -e "${GREEN}I hope you find your time here enjoyable!${NC}" fi -echo "-----" +print_header "Cloning ZaneyOS Repository" +git clone https://gitlab.com/zaney/zaneyos.git --depth=1 -b stable-2.3 ~/zaneyos +cd ~/zaneyos || exit 1 -echo "Cloning & Entering ZaneyOS Repository" -git clone https://gitlab.com/zaney/zaneyos.git -cd zaneyos || exit -mkdir hosts/"$hostName" -cp hosts/default/*.nix hosts/"$hostName" +print_header "Git Configuration" +echo "๐Ÿ‘ค Setting up git configuration for version control:" +echo " This is needed for system updates and configuration management." +echo "" installusername=$(echo $USER) -git config --global user.name "$installusername" -git config --global user.email "$installusername@gmail.com" -git add . -git config --global --unset-all user.name -git config --global --unset-all user.email -sed -i "/^\s*host[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$hostName\"/" ./flake.nix -sed -i "/^\s*profile[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$profile\"/" ./flake.nix +echo -e "Current username: ${GREEN}$installusername${NC}" +read -rp "Enter your full name for git commits [ $installusername ]: " gitUsername +if [ -z "$gitUsername" ]; then + gitUsername="$installusername" +fi +echo "๐Ÿ“ง Examples: john@example.com, jane.doe@company.org" +read -rp "Enter your email address for git commits [ $installusername@example.com ]: " gitEmail +if [ -z "$gitEmail" ]; then + gitEmail="$installusername@example.com" +fi +echo -e "${GREEN}โœ“ Git name: $gitUsername${NC}" +echo -e "${GREEN}โœ“ Git email: $gitEmail${NC}" + +print_header "Timezone Configuration" +echo "๐ŸŒŽ Common timezones:" +echo " โ€ข US: America/New_York, America/Chicago, America/Denver, America/Los_Angeles" +echo " โ€ข Europe: Europe/London, Europe/Berlin, Europe/Paris, Europe/Rome" +echo " โ€ข Asia: Asia/Tokyo, Asia/Shanghai, Asia/Seoul, Asia/Kolkata" +echo " โ€ข Australia: Australia/Sydney, Australia/Melbourne" +echo " โ€ข UTC (Universal): UTC" +read -rp "Enter your timezone [ America/New_York ]: " timezone +if [ -z "$timezone" ]; then + timezone="America/New_York" +fi +echo -e "${GREEN}โœ“ Timezone set to: $timezone${NC}" + +print_header "Keyboard Layout Configuration" +echo "๐ŸŒ Common keyboard layouts:" +echo " โ€ข us (US English) - default" +echo " โ€ข us-intl (US International)" +echo " โ€ข uk (UK English)" +echo " โ€ข de (German)" +echo " โ€ข fr (French)" +echo " โ€ข es (Spanish)" +echo " โ€ข it (Italian)" +echo " โ€ข ru (Russian)" +echo " โ€ข dvorak (Dvorak)" read -rp "Enter your keyboard layout: [ us ] " keyboardLayout if [ -z "$keyboardLayout" ]; then keyboardLayout="us" fi +echo -e "${GREEN}โœ“ Keyboard layout set to: $keyboardLayout${NC}" -sed -i "/^\s*keyboardLayout[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$keyboardLayout\"/" ./hosts/$hostName/variables.nix - -echo "-----" - -read -rp "Enter your console keymap: [ us ] " consoleKeyMap -if [ -z "$consoleKeyMap" ]; then - consoleKeyMap="us" +print_header "Console Keymap Configuration" +echo "โŒจ๏ธ Console keymap (usually matches your keyboard layout):" +echo " Most common: us, uk, de, fr, es, it, ru" +# Smart default: use keyboard layout as console keymap default if it's a common one +defaultConsoleKeyMap="$keyboardLayout" +if [[ ! "$keyboardLayout" =~ ^(us|uk|de|fr|es|it|ru|us-intl|dvorak)$ ]]; then + defaultConsoleKeyMap="us" fi +read -rp "Enter your console keymap: [ $defaultConsoleKeyMap ] " consoleKeyMap +if [ -z "$consoleKeyMap" ]; then + consoleKeyMap="$defaultConsoleKeyMap" +fi +echo -e "${GREEN}โœ“ Console keymap set to: $consoleKeyMap${NC}" -sed -i "/^\s*consoleKeyMap[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$consoleKeyMap\"/" ./hosts/$hostName/variables.nix +print_header "Configuring Host and Profile" +mkdir -p hosts/"$hostName" +cp hosts/default/*.nix hosts/"$hostName" -echo "-----" +git config --global user.name "$gitUsername" +git config --global user.email "$gitEmail" +git add . +git config --global --unset-all user.name +git config --global --unset-all user.email -sed -i "/^\s*username[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$installusername\"/" ./flake.nix +echo "Updating configuration files with working awk commands..." -echo "-----" +# Update flake.nix (fix pattern matching to handle leading whitespace) +# Create backup first, before any changes +cp ./flake.nix ./flake.nix.bak +# Update hostname with proper pattern matching +awk -v newhost="$hostName" '/^[[:space:]]*host[[:space:]]*=/ { gsub(/"[^"]*"/, "\"" newhost "\""); } { print }' ./flake.nix.bak > ./flake.nix +cp ./flake.nix ./flake.nix.bak +# Update profile with proper pattern matching +awk -v newprof="$profile" '/^[[:space:]]*profile[[:space:]]*=/ { gsub(/"[^"]*"/, "\"" newprof "\""); } { print }' ./flake.nix.bak > ./flake.nix +cp ./flake.nix ./flake.nix.bak +# Update username with proper pattern matching +awk -v newuser="$installusername" '/^[[:space:]]*username[[:space:]]*=/ { gsub(/"[^"]*"/, "\"" newuser "\""); } { print }' ./flake.nix.bak > ./flake.nix +rm ./flake.nix.bak -echo "Generating The Hardware Configuration" +# Update timezone in system.nix +cp ./modules/core/system.nix ./modules/core/system.nix.bak +awk -v newtz="$timezone" '/^ time\.timeZone = / { gsub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak > ./modules/core/system.nix +rm ./modules/core/system.nix.bak + +# Update variables in host file +cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak +awk -v newuser="$gitUsername" '/^ gitUsername = / { gsub(/"[^"]*"/, "\"" newuser "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix +cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak +awk -v newemail="$gitEmail" '/^ gitEmail = / { gsub(/"[^"]*"/, "\"" newemail "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix +cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak +awk -v newkb="$keyboardLayout" '/^ keyboardLayout = / { gsub(/"[^"]*"/, "\"" newkb "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix +cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak +awk -v newckm="$consoleKeyMap" '/^ consoleKeyMap = / { gsub(/"[^"]*"/, "\"" newckm "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix +rm ./hosts/$hostName/variables.nix.bak + +echo "Configuration files updated successfully!" + +# Verify the updates worked +echo -e "${GREEN}Verifying configuration updates:${NC}" +echo -e " Host: $(grep -E '^[[:space:]]*host[[:space:]]*=' ./flake.nix | head -1 | sed 's/.*"\([^"]*\)".*/\1/')" +echo -e " Profile: $(grep -E '^[[:space:]]*profile[[:space:]]*=' ./flake.nix | head -1 | sed 's/.*"\([^"]*\)".*/\1/')" +echo -e " Username: $(grep -E '^[[:space:]]*username[[:space:]]*=' ./flake.nix | head -1 | sed 's/.*"\([^"]*\)".*/\1/')" +echo -e " Build target: ${GREEN}${profile}${NC} (flake configuration)" +echo -e " Host directory: ${GREEN}./hosts/${hostName}/${NC}" + +print_header "Generating Hardware Configuration -- Ignore ERROR: cannot access /bin" sudo nixos-generate-config --show-hardware-config > ./hosts/$hostName/hardware.nix -echo "-----" - -echo "Setting Required Nix Settings Then Going To Install" +print_header "Setting Nix Configuration" NIX_CONFIG="experimental-features = nix-command flakes" -echo "-----" +print_header "Initiating NixOS Build" +read -p "Ready to run initial build? (Y/N): " -n 1 -r +echo +if [[ ! $REPLY =~ ^[Yy]$ ]]; then + echo -e "${RED}Build cancelled.${NC}" + exit 1 +fi -sudo nixos-rebuild switch --flake ~/zaneyos/#${profile} +sudo nixos-rebuild boot --flake ~/zaneyos/#${profile} + +# Check the exit status of the last command (nixos-rebuild) +if [ $? -eq 0 ]; then + print_success_banner +else + print_failure_banner +fi diff --git a/modules/core/fonts.nix b/modules/core/fonts.nix index 2fab81c..61483d9 100644 --- a/modules/core/fonts.nix +++ b/modules/core/fonts.nix @@ -1,15 +1,18 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { fonts = { packages = with pkgs; [ + dejavu_fonts + fira-code + fira-code-symbols + noto-fonts noto-fonts-emoji noto-fonts-cjk-sans font-awesome - symbola + jetbrains-mono material-icons - fira-code - fira-code-symbols + maple-mono.NF + #symbola #still 404 error + terminus_font ]; }; } diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 1c4a1a3..cb11a54 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,12 +1,14 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { programs = { + neovim = { + enable = true; + defaultEditor = true; + }; firefox.enable = false; # Firefox is not installed by default dconf.enable = true; seahorse.enable = true; + hyprland.enable = true; #create desktop file and depedencies if you switch to GUI login MGR + hyprlock.enable = true; #resolve pam issue https://gitlab.com/Zaney/zaneyos/-/issues/164 fuse.userAllowOther = true; mtr.enable = true; adb.enable = true; @@ -21,17 +23,22 @@ environment.systemPackages = with pkgs; [ amfora # Fancy Terminal Browser For Gemini Protocol appimage-run # Needed For AppImage Support + bottom # btop like util brave # Brave Browser brightnessctl # For Screen Brightness Control cmatrix # Matrix Movie Effect In Terminal cowsay # Great Fun Terminal Program docker-compose # Allows Controlling Docker From A Single File duf # Utility For Viewing Disk Usage In Terminal + dysk # disk usage util eza # Beautiful ls Replacement ffmpeg # Terminal Video / Audio Editing file-roller # Archive Manager + gdu # graphical disk usage gedit # Simple Graphical Text Editor gimp # Great Photo Editor + glxinfo # Needed for inxi -G GPU info + gping #graphical ping greetd.tuigreet # The Login Manager (Sometimes Referred To As Display Manager) htop # Simple Terminal Based System Monitor hyprpicker # Color Picker @@ -44,7 +51,9 @@ lshw # Detailed Hardware Information mpv # Incredible Video Player ncdu # Disk Usage Analyzer With Ncurses Interface + nitch # small fetch util nixfmt-rfc-style # Nix Formatter + onefetch #shows current build info and stats pavucontrol # For Editing Audio Levels & Devices pciutils # Collection Of Tools For Inspecting PCI Devices picard # For Changing Music Metadata & Getting Cover Art @@ -53,12 +62,13 @@ rhythmbox ripgrep # Improved Grep socat # Needed For Screenshots + sox # audio support for FFMPEG unrar # Tool For Handling .rar Files unzip # Tool For Handling .zip Files usbutils # Good Tools For USB Devices v4l-utils # Used For Things Like OBS Virtual Camera + waypaper # backup wallpaper GUI wget # Tool For Fetching Files With Links - yazi #TUI File Manager ytmdl # Tool For Downloading Audio From YouTube ]; } diff --git a/modules/core/packages.nix.orig b/modules/core/packages.nix.orig new file mode 100644 index 0000000..1096a0c --- /dev/null +++ b/modules/core/packages.nix.orig @@ -0,0 +1,73 @@ +{ + pkgs, + inputs, + ... +}: { + programs = { + firefox.enable = false; # Firefox is not installed by default + dconf.enable = true; + seahorse.enable = true; + hyprland.enable = true; #create desktop file and depedencies if you switch to GUI login MGR + hyprlock.enable = true; #resolve pam issue https://gitlab.com/Zaney/zaneyos/-/issues/164 + fuse.userAllowOther = true; + mtr.enable = true; + adb.enable = true; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + }; + + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + amfora # Fancy Terminal Browser For Gemini Protocol + appimage-run # Needed For AppImage Support + bottom # btop like util + brave # Brave Browser + brightnessctl # For Screen Brightness Control + cmatrix # Matrix Movie Effect In Terminal + cowsay # Great Fun Terminal Program + docker-compose # Allows Controlling Docker From A Single File + duf # Utility For Viewing Disk Usage In Terminal + dysk # disk usage util + eza # Beautiful ls Replacement + ffmpeg # Terminal Video / Audio Editing + file-roller # Archive Manager + gdu # graphical disk usage + gedit # Simple Graphical Text Editor + gimp # Great Photo Editor + glxinfo # Needed for inxi -G GPU info + gpijng #graphical ping + greetd.tuigreet # The Login Manager (Sometimes Referred To As Display Manager) + htop # Simple Terminal Based System Monitor + hyprpicker # Color Picker + eog # For Image Viewing + inxi # CLI System Information Tool + killall # For Killing All Instances Of Programs + libnotify # For Notifications + lm_sensors # Used For Getting Hardware Temps + lolcat # Add Colors To Your Terminal Command Output + lshw # Detailed Hardware Information + mpv # Incredible Video Player + ncdu # Disk Usage Analyzer With Ncurses Interface + nixfmt-rfc-style # Nix Formatter + pavucontrol # For Editing Audio Levels & Devices + pciutils # Collection Of Tools For Inspecting PCI Devices + picard # For Changing Music Metadata & Getting Cover Art + pkg-config # Wrapper Script For Allowing Packages To Get Info On Others + playerctl # Allows Changing Media Volume Through Scripts + rhythmbox + ripgrep # Improved Grep + socat # Needed For Screenshots + sox # audio support for FFMPEG + unrar # Tool For Handling .rar Files + unzip # Tool For Handling .zip Files + usbutils # Good Tools For USB Devices + v4l-utils # Used For Things Like OBS Virtual Camera + waypaper # backup wallpaper GUI + wget # Tool For Fetching Files With Links + yazi #TUI File Manager + ytmdl # Tool For Downloading Audio From YouTube + ]; +} diff --git a/modules/core/system.nix b/modules/core/system.nix index ccb912a..33e4a7b 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -27,7 +27,7 @@ in { LC_TIME = "en_US.UTF-8"; }; environment.variables = { - ZANEYOS_VERSION = "2.3"; + ZANEYOS_VERSION = "2.3.1"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; diff --git a/modules/core/user.nix b/modules/core/user.nix index 192db94..db94f63 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -21,7 +21,6 @@ in { homeDirectory = "/home/${username}"; stateVersion = "23.11"; }; - programs.home-manager.enable = true; }; }; users.mutableUsers = true; @@ -31,11 +30,12 @@ in { extraGroups = [ "adbusers" "docker" - "libvirtd" + "libvirtd" #For VirtManagerr "lp" "networkmanager" "scanner" - "wheel" + "wheel" # sudo access + "vboxusers" # For VirtualBox ]; shell = pkgs.zsh; ignoreShellProgramCheck = true; diff --git a/modules/core/virtualisation.nix b/modules/core/virtualisation.nix index 60da19b..a3973ad 100644 --- a/modules/core/virtualisation.nix +++ b/modules/core/virtualisation.nix @@ -1,14 +1,29 @@ {pkgs, ...}: { # Only enable either docker or podman -- Not both virtualisation = { - libvirtd.enable = false; - docker.enable = true; + docker = { + enable = true; + }; + podman.enable = false; + + libvirtd = { + enable = true; + }; + + virtualbox.host = { + enable = false; + enableExtensionPack = false; + }; }; + programs = { virt-manager.enable = false; }; + environment.systemPackages = with pkgs; [ - # virt-viewer # View Virtual Machines + virt-viewer # View Virtual Machines + lazydocker + docker-client ]; } diff --git a/modules/home/bash.nix b/modules/home/bash.nix index 409c17e..ba4de54 100644 --- a/modules/home/bash.nix +++ b/modules/home/bash.nix @@ -12,13 +12,10 @@ sv = "sudo nvim"; fr = "nh os switch --hostname ${profile}"; fu = "nh os switch --hostname ${profile} --update"; - zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)"; + zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/releases/latest/download/install-zaneyos.sh)"; ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; v = "nvim"; cat = "bat"; - ls = "eza --icons"; - ll = "eza -lh --icons --grid --group-directories-first"; - la = "eza -lah --icons --grid --group-directories-first"; ".." = "cd .."; }; }; diff --git a/modules/home/bat.nix b/modules/home/bat.nix index 98b4826..898b65a 100644 --- a/modules/home/bat.nix +++ b/modules/home/bat.nix @@ -1,8 +1,18 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { programs.bat = { enable = true; config = { pager = "less -FR"; + # other styles available and cane be combined + # style = "numbers,changes,headers,rule,grid"; + style = "full"; + # Bat has other thems as well + # ansi,Catppuccin,base16,base16-256,GitHub,Nord,etc + theme = lib.mkForce "Dracula"; }; extraPackages = with pkgs.bat-extras; [ batman @@ -10,4 +20,8 @@ batgrep ]; }; + home.sessionVariables = { + MANPAGER = "sh -c 'col -bx | bat -l man -p'"; + MANROFFOPT = "-c"; + }; } diff --git a/modules/home/bottom.nix b/modules/home/bottom.nix new file mode 100644 index 0000000..63814fc --- /dev/null +++ b/modules/home/bottom.nix @@ -0,0 +1,35 @@ +{...}: { + programs.bottom = { + enable = true; + settings = { + enable_gpu = true; + theme = "nord"; + flags.group_processes = true; + row = [ + { + ratio = 2; + child = [ + {type = "cpu";} + {type = "temp";} + ]; + } + { + ratio = 2; + child = [ + {type = "network";} + ]; + } + { + ratio = 3; + child = [ + { + type = "proc"; + ratio = 1; + default = true; + } + ]; + } + ]; + }; + }; +} diff --git a/modules/home/default.nix b/modules/home/default.nix index 008a4ea..c930b10 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -6,10 +6,13 @@ in { ./bash.nix ./bashrc-personal.nix ./bat.nix + ./bottom.nix ./btop.nix ./cava.nix ./emoji.nix + ./eza.nix ./fastfetch + ./fzf.nix ./gh.nix ./ghostty.nix ./git.nix @@ -17,7 +20,9 @@ in { ./htop.nix ./hyprland ./kitty.nix + ./lazygit.nix ./nvf.nix + ./obs-studio.nix ./rofi ./qt.nix ./scripts @@ -25,7 +30,10 @@ in { ./stylix.nix ./swappy.nix ./swaync.nix + ./tealdeer.nix + ./tmux.nix ./virtmanager.nix + ./vscode.nix waybarChoice ./wezterm.nix ./wlogout diff --git a/modules/home/eza.nix b/modules/home/eza.nix new file mode 100644 index 0000000..63de65a --- /dev/null +++ b/modules/home/eza.nix @@ -0,0 +1,30 @@ +# Eza is a ls replacement +{ + programs.eza = { + enable = true; + icons = "auto"; + enableBashIntegration = true; + enableZshIntegration = true; + enableFishIntegration = true; + git = true; + + extraOptions = [ + "--group-directories-first" + "--no-quotes" + "--header" # Show header row + "--git-ignore" + "--icons=always" + # "--time-style=long-iso" # ISO 8601 extended format for time + "--classify" # append indicator (/, *, =, @, |) + "--hyperlink" # make paths clickable in some terminals + ]; + }; + # Aliases to make `ls`, `ll`, `la` use eza + home.shellAliases = { + ls = "eza"; + lt = "eza --tree --level=2"; + ll = "eza -lh --no-user --long"; + la = "eza -lah "; + tree = "eza --tree "; + }; +} diff --git a/modules/home/fastfetch/default.nix b/modules/home/fastfetch/default.nix index 36f941a..04b6cb9 100644 --- a/modules/home/fastfetch/default.nix +++ b/modules/home/fastfetch/default.nix @@ -26,7 +26,7 @@ "break" { type = "os"; - key = "OS - ZaneyOS v2.3"; + key = "OS - ZaneyOS v2.3.2"; keyColor = "31"; } { diff --git a/modules/home/fzf.nix b/modules/home/fzf.nix new file mode 100644 index 0000000..9c36d8b --- /dev/null +++ b/modules/home/fzf.nix @@ -0,0 +1,36 @@ +# Fzf is a general-purpose command-line fuzzy finder. +{ + config, + lib, + ... +}: let + accent = "#" + config.lib.stylix.colors.base0D; + foreground = "#" + config.lib.stylix.colors.base05; + muted = "#" + config.lib.stylix.colors.base03; +in { + programs.fzf = { + enable = true; + enableZshIntegration = true; + colors = lib.mkForce { + "fg+" = accent; + "bg+" = "-1"; + "fg" = foreground; + "bg" = "-1"; + "prompt" = muted; + "pointer" = accent; + }; + defaultOptions = [ + "--margin=1" + "--layout=reverse" + "--border=none" + "--info='hidden'" + "--header=''" + "--prompt='--> '" + "-i" + "--no-bold" + "--bind='enter:execute(nvim {})'" + "--preview='bat --style=numbers --color=always --line-range :500 {}'" + "--preview-window=right:60%:wrap" + ]; + }; +} diff --git a/modules/home/git.nix b/modules/home/git.nix index 01b08c3..823388b 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -1,11 +1,31 @@ -{ host, ... }: -let +{host, ...}: let inherit (import ../../hosts/${host}/variables.nix) gitUsername gitEmail; -in -{ +in { programs.git = { enable = true; userName = "${gitUsername}"; userEmail = "${gitEmail}"; + + extraConfig = { + # FOSS-friendly settings + push.default = "simple"; # Match modern push behavior + credential.helper = "cache --timeout=7200"; + init.defaultBranch = "main"; # Set default new branches to 'main' + log.decorate = "full"; # Show branch/tag info in git log + log.date = "iso"; # ISO 8601 date format + # Conflict resolution style for readable diffs + merge.conflictStyle = "diff3"; + }; + # Optional: FOSS-friendly Git aliases + aliases = { + br = "branch --sort=-committerdate"; + co = "checkout"; + df = "diff"; + com = "commit -a"; + gs = "stash"; + gp = "pull"; + lg = "log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %C(green)(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit"; + st = "status"; + }; }; } diff --git a/modules/home/hyprland/animations-def.nix b/modules/home/hyprland/animations-def.nix index d869450..e7fbe6e 100644 --- a/modules/home/hyprland/animations-def.nix +++ b/modules/home/hyprland/animations-def.nix @@ -1,8 +1,4 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +{...}: { wayland.windowManager.hyprland.settings = { animations = { enabled = true; diff --git a/modules/home/hyprland/animations-dynamic.nix b/modules/home/hyprland/animations-dynamic.nix index eadcb25..8977f7e 100644 --- a/modules/home/hyprland/animations-dynamic.nix +++ b/modules/home/hyprland/animations-dynamic.nix @@ -1,30 +1,25 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +{...}: { wayland.windowManager.hyprland.settings = { # name "Dynamic" - # credit https://github.com/mylinuxforwork/dotfiles - animations = [ + # credit https://github.com/mylinuxforwork/dotfiles + animations = { enabled = true; bezier = [ - "wind, 0.05, 0.9, 0.1, 1.05" - "winIn, 0.1, 1.1, 0.1, 1.1" - "winOut, 0.3, -0.3, 0, 1" - "liner, 1, 1, 1, 1" - ]; + "wind, 0.05, 0.9, 0.1, 1.05" + "winIn, 0.1, 1.1, 0.1, 1.1" + "winOut, 0.3, -0.3, 0, 1" + "liner, 1, 1, 1, 1" + ]; animation = [ - "windows, 1, 6, wind, slide" - "windowsIn, 1, 6, winIn, slide" - "windowsOut, 1, 5, winOut, slide" - "windowsMove, 1, 5, wind, slide" - "border, 1, 1, liner" - "borderangle, 1, 30, liner, loop" - "fade, 1, 10, default" - "workspaces, 1, 5, wind" - ]; - ]; - + "windows, 1, 6, wind, slide" + "windowsIn, 1, 6, winIn, slide" + "windowsOut, 1, 5, winOut, slide" + "windowsMove, 1, 5, wind, slide" + "border, 1, 1, liner" + "borderangle, 1, 30, liner, loop" + "fade, 1, 10, default" + "workspaces, 1, 5, wind" + ]; + }; }; } diff --git a/modules/home/hyprland/animations-end4.nix b/modules/home/hyprland/animations-end4.nix index b7b2036..18369a8 100644 --- a/modules/home/hyprland/animations-end4.nix +++ b/modules/home/hyprland/animations-end4.nix @@ -1,41 +1,37 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - ; -in { +{...}: { wayland.windowManager.hyprland.settings = { # Name: END-4 # Credit: END-4 project https://github.com/end-4/dots-hyprland animations = { enabled = true; bezier = [ - "linear, 0, 0, 1, 1" - "md3_standard, 0.2, 0, 0, 1" - "md3_decel, 0.05, 0.7, 0.1, 1" - "md3_accel, 0.3, 0, 0.8, 0.15" - "overshot, 0.05, 0.9, 0.1, 1.1" - "crazyshot, 0.1, 1.5, 0.76, 0.92 " - "hyprnostretch, 0.05, 0.9, 0.1, 1.0" - "menu_decel, 0.1, 1, 0, 1" - "menu_accel, 0.38, 0.04, 1, 0.07" - "easeInOutCirc, 0.85, 0, 0.15, 1" - "easeOutCirc, 0, 0.55, 0.45, 1" - "easeOutExpo, 0.16, 1, 0.3, 1" - "softAcDecel, 0.26, 0.26, 0.15, 1" - "md2, 0.4, 0, 0.2, 1 # use with .2s duration" + "linear, 0, 0, 1, 1" + "md3_standard, 0.2, 0, 0, 1" + "md3_decel, 0.05, 0.7, 0.1, 1" + "md3_accel, 0.3, 0, 0.8, 0.15" + "overshot, 0.05, 0.9, 0.1, 1.1" + "crazyshot, 0.1, 1.5, 0.76, 0.92 " + "hyprnostretch, 0.05, 0.9, 0.1, 1.0" + "menu_decel, 0.1, 1, 0, 1" + "menu_accel, 0.38, 0.04, 1, 0.07" + "easeInOutCirc, 0.85, 0, 0.15, 1" + "easeOutCirc, 0, 0.55, 0.45, 1" + "easeOutExpo, 0.16, 1, 0.3, 1" + "softAcDecel, 0.26, 0.26, 0.15, 1" + "md2, 0.4, 0, 0.2, 1 # use with .2s duration" ]; animation = [ - "windows, 1, 3, md3_decel, popin 60%" - "windowsIn, 1, 3, md3_decel, popin 60%" - "windowsOut, 1, 3, md3_accel, popin 60%" - "border, 1, 10, default" - "fade, 1, 3, md3_decel" - "layersIn, 1, 3, menu_decel, slide" - "layersOut, 1, 1.6, menu_accel" - "fadeLayersIn, 1, 2, menu_decel" - "fadeLayersOut, 1, 4.5, menu_accel" - "workspaces, 1, 7, menu_decel, slide" - ]; + "windows, 1, 3, md3_decel, popin 60%" + "windowsIn, 1, 3, md3_decel, popin 60%" + "windowsOut, 1, 3, md3_accel, popin 60%" + "border, 1, 10, default" + "fade, 1, 3, md3_decel" + "layersIn, 1, 3, menu_decel, slide" + "layersOut, 1, 1.6, menu_accel" + "fadeLayersIn, 1, 2, menu_decel" + "fadeLayersOut, 1, 4.5, menu_accel" + "workspaces, 1, 7, menu_decel, slide" + ]; }; }; } diff --git a/modules/home/hyprland/animations-moving.nix b/modules/home/hyprland/animations-moving.nix new file mode 100644 index 0000000..c162b5f --- /dev/null +++ b/modules/home/hyprland/animations-moving.nix @@ -0,0 +1,24 @@ +{...}: { + wayland.windowManager.hyprland.settings = { + # name "moving" + # credit https://github.com/mylinuxforwork/dotfiles + animations = { + enabled = true; + bezier = [ + "overshot, 0.05, 0.9, 0.1, 1.05" + "smoothOut, 0.5, 0, 0.99, 0.99" + "smoothIn, 0.5, -0.5, 0.68, 1.5" + ]; + animation = [ + "windows, 1, 5, overshot, slide" + "windowsOut, 1, 3, smoothOut" + "windowsIn, 1, 3, smoothOut" + "windowsMove, 1, 4, smoothIn, slide" + "border, 1, 5, default" + "fade, 1, 5, smoothIn" + "fadeDim, 1, 5, smoothIn" + "workspaces, 1, 6, default" + ]; + }; + }; +} diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index eba2880..9f9d77c 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -8,6 +8,7 @@ in { wayland.windowManager.hyprland.settings = { bind = [ "$modifier,Return,exec,${terminal}" + "$modifier,K,exec,list-keybinds" "$modifier SHIFT,Return,exec,rofi-launcher" "$modifier SHIFT,W,exec,web-search" "$modifier ALT,W,exec,wallsetter" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index add67d4..e5532a0 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -4,6 +4,7 @@ in { imports = [ animChoice ./binds.nix + ./env.nix ./hypridle.nix ./hyprland.nix ./hyprlock.nix diff --git a/modules/home/hyprland/env.nix b/modules/home/hyprland/env.nix new file mode 100644 index 0000000..908e4a1 --- /dev/null +++ b/modules/home/hyprland/env.nix @@ -0,0 +1,35 @@ +{...}: { + wayland.windowManager.hyprland = { + settings = { + env = [ + "NIXOS_OZONE_WL, 1" + "NIXPKGS_ALLOW_UNFREE, 1" + "XDG_CURRENT_DESKTOP, Hyprland" + "XDG_SESSION_TYPE, wayland" + "XDG_SESSION_DESKTOP, Hyprland" + "GDK_BACKEND, wayland, x11" + "CLUTTER_BACKEND, wayland" + "QT_QPA_PLATFORM=wayland;xcb" + "QT_WAYLAND_DISABLE_WINDOWDECORATION, 1" + "QT_AUTO_SCREEN_SCALE_FACTOR, 1" + "SDL_VIDEODRIVER, x11" + "MOZ_ENABLE_WAYLAND, 1" + # Disabling this by default as it can break configurations + # WIth more than two GPUs. + # Also added card2 as a further protection should it be enabled + # This is mostly needed for hybrid laptops + #"AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1:/dev/card2" + "GDK_SCALE,1" + "QT_SCALE_FACTOR,1" + "EDITOR,nvim" + # Setting terminal to kitty so running kitty from rofi + # won't launch in xterm. Which is horrible + # You can change this to your preferred terminal + # ToDo: Pull default terminal from host config + # This should not impact bindings, etc + "TERMINAL,kitty" + "XDG_TERMINAL_EMULATOR,kitty" + ]; + }; + }; +} diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 1301d2f..ed997be 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -19,6 +19,7 @@ in { swappy ydotool hyprpolkitagent + hyprland-qtutils # needed for banners and ANR messages ]; systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" @@ -45,6 +46,8 @@ in { }; settings = { exec-once = [ + "wl-paste --type text --watch cliphist store # Stores only text data" + "wl-paste --type image --watch cliphist store # Stores only image data" "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" @@ -103,11 +106,21 @@ in { key_press_enables_dpms = false; disable_hyprland_logo = true; disable_splash_rendering = true; + enable_swallow = false; + vfr = true; # Variable Frame Rate + vrr = 2; #Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES + # Screen flashing to black momentarily or going black when app is fullscreen + # Try setting vrr to 0 + + # Application not responding (ANR) settings + enable_anr_dialog = true; + anr_missed_pings = 20; }; dwindle = { pseudotile = true; preserve_split = true; + force_split = 2; }; decoration = { @@ -127,6 +140,11 @@ in { }; }; + ecosystem = { + no_donation_nag = true; + no_update_news = false; + }; + cursor = { sync_gsettings_theme = true; no_hardware_cursors = 2; # change to 1 if want to disable @@ -147,29 +165,19 @@ in { mfact = 0.5; }; - env = [ - "NIXOS_OZONE_WL, 1" - "NIXPKGS_ALLOW_UNFREE, 1" - "XDG_CURRENT_DESKTOP, Hyprland" - "XDG_SESSION_TYPE, wayland" - "XDG_SESSION_DESKTOP, Hyprland" - "GDK_BACKEND, wayland, x11" - "CLUTTER_BACKEND, wayland" - "QT_QPA_PLATFORM=wayland;xcb" - "QT_WAYLAND_DISABLE_WINDOWDECORATION, 1" - "QT_AUTO_SCREEN_SCALE_FACTOR, 1" - "SDL_VIDEODRIVER, x11" - "MOZ_ENABLE_WAYLAND, 1" - "AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" - "GDK_SCALE,1" - "QT_SCALE_FACTOR,1" - "EDITOR,nvim" - ]; + # Ensure Xwayland windows render at integer scale; compositor scales them + xwayland = { + force_zero_scaling = true; + }; }; extraConfig = " monitor=,preferred,auto,auto + monitor=Virtual-1,1920x1080@60,auto,1 ${extraMonitorSettings} + # To enable blur on waybar uncomment the line below + # Thanks to SchotjeChrisman + # layerrule = blur,waybar "; }; } diff --git a/modules/home/hyprland/pyprland.nix b/modules/home/hyprland/pyprland.nix index 45ebb5d..d7972c0 100644 --- a/modules/home/hyprland/pyprland.nix +++ b/modules/home/hyprland/pyprland.nix @@ -11,7 +11,7 @@ animation = "fromTop" command = "kitty --class kitty-dropterm" class = "kitty-dropterm" - size = "75% 60%" + size = "70% 70%" max_size = "1920px 100%" ''; } diff --git a/modules/home/hyprland/windowrules.nix b/modules/home/hyprland/windowrules.nix index a19ae19..6b6717c 100644 --- a/modules/home/hyprland/windowrules.nix +++ b/modules/home/hyprland/windowrules.nix @@ -6,9 +6,9 @@ in { wayland.windowManager.hyprland = { settings = { - windowrulev2 = [ + windowrule = [ "tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$" - "tag +terminal, class:^(Alacritty|kitty|kitty-dropterm)$" + "tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$" "tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$" "tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$" "tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$" @@ -32,8 +32,11 @@ in { "tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" "tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$" "tag +settings, class:(xdg-desktop-portal-gtk)" + "tag +settings, class:(.blueman-manager-wrapped)" + "tag +settings, class:(nwg-displays)" "move 72% 7%,title:^(Picture-in-Picture)$" "center, class:^([Ff]erdium)$" + "float, class:^([Ww]aypaper)$" "center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" "center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" "center, title:^(Authentication Required)$" @@ -70,30 +73,6 @@ in { "noblur, tag:games*" "fullscreen, tag:games*" ]; - - env = [ - "NIXOS_OZONE_WL, 1" - "NIXPKGS_ALLOW_UNFREE, 1" - "XDG_CURRENT_DESKTOP, Hyprland" - "XDG_SESSION_TYPE, wayland" - "XDG_SESSION_DESKTOP, Hyprland" - "GDK_BACKEND, wayland, x11" - "CLUTTER_BACKEND, wayland" - "QT_QPA_PLATFORM=wayland;xcb" - "QT_WAYLAND_DISABLE_WINDOWDECORATION, 1" - "QT_AUTO_SCREEN_SCALE_FACTOR, 1" - "SDL_VIDEODRIVER, x11" - "MOZ_ENABLE_WAYLAND, 1" - "AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" - "GDK_SCALE,1" - "QT_SCALE_FACTOR,1" - "EDITOR,nvim" - ]; }; - - extraConfig = " - monitor=,preferred,auto,auto - ${extraMonitorSettings} - "; }; } diff --git a/modules/home/lazygit.nix b/modules/home/lazygit.nix new file mode 100644 index 0000000..3b36794 --- /dev/null +++ b/modules/home/lazygit.nix @@ -0,0 +1,31 @@ +# Lazygit is a simple terminal UI for git commands. +{ config, lib, ... }: +let + accent = "#${config.lib.stylix.colors.base0D}"; + muted = "#${config.lib.stylix.colors.base03}"; +in { + programs.lazygit = { + enable = true; + settings = lib.mkForce { + disableStartupPopups = true; + notARepository = "skip"; + promptToReturnFromSubprocess = false; + update.method = "never"; + git = { + commit.signOff = true; + parseEmoji = true; + }; + gui = { + theme = { + activeBorderColor = [ accent "bold" ]; + inactiveBorderColor = [ muted ]; + }; + showListFooter = false; + showRandomTip = false; + showCommandLog = false; + showBottomLine = false; + nerdFontsVersion = "3"; + }; + }; + }; +} diff --git a/modules/home/nvf.nix b/modules/home/nvf.nix index 3b0f36f..b954e0b 100644 --- a/modules/home/nvf.nix +++ b/modules/home/nvf.nix @@ -12,14 +12,47 @@ vimAlias = true; viAlias = true; withNodeJs = true; - useSystemClipboard = true; - + lineNumberMode = "number"; + enableLuaLoader = true; + preventJunkFiles = true; options = { - tabstop = 2; + tabstop = 4; shiftwidth = 2; wrap = false; }; + clipboard = { + enable = true; + registers = "unnamedplus"; + providers = { + wl-copy = { + enable = true; + }; + xsel = { + enable = true; + }; + }; + }; + + maps = { + normal = { + "e" = { + action = "Neotree toggle"; + silent = false; + }; + }; + }; + + diagnostics = { + enable = true; + config = { + virtual_lines = { + enable = true; + }; + underline = true; + }; + }; + keymaps = [ { key = "jk"; @@ -75,129 +108,346 @@ action = ""; desc = "Move right in insert mode"; } + { + key = "dj"; + mode = ["n"]; + action = "Lspsaga diagnostic_jump_next"; + desc = "Go to next diagnostic"; + } + { + key = "dk"; + mode = ["n"]; + action = "Lspsaga diagnostic_jump_prev"; + desc = "Go to previous diagnostic"; + } + { + key = "dl"; + mode = ["n"]; + action = "Lspsaga show_line_diagnostics"; + desc = "Show diagnostic details"; + } + { + key = "dt"; + mode = ["n"]; + action = "Trouble diagnostics toggle"; + desc = "Toggle diagnostics list"; + } + { + key = "t"; + mode = ["n"]; + action = "ToggleTerm"; + desc = "Toggle terminal"; + } + { + key = "mp"; + mode = ["n"]; + action = ":MarkdownPreview"; + desc = "Toggle Markdown Preview"; + } ]; - telescope.enable = true; - - spellcheck = { + telescope = { enable = true; }; - lsp = { - formatOnSave = true; - lspkind.enable = false; - lightbulb.enable = true; - lspsaga.enable = false; - trouble.enable = true; - lspSignature.enable = true; - otter-nvim.enable = false; - lsplines.enable = false; - nvim-docs-view.enable = false; - }; - - languages = { - enableLSP = true; - enableFormat = true; - enableTreesitter = true; - enableExtraDiagnostics = true; - - nix.enable = true; - clang.enable = true; - zig.enable = true; - python.enable = true; - markdown.enable = true; - ts.enable = true; - html.enable = true; - }; - - visuals = { - nvim-web-devicons.enable = true; - nvim-cursorline.enable = true; - cinnamon-nvim.enable = true; - fidget-nvim.enable = true; - - highlight-undo.enable = true; - indent-blankline.enable = true; - }; - - statusline = { - lualine = { + spellcheck = { + enable = true; + languages = ["en"]; + programmingWordlist = { enable = true; - theme = "base16"; }; }; - autopairs.nvim-autopairs.enable = true; - - autocomplete.nvim-cmp.enable = true; - snippets.luasnip.enable = true; - - tabline = { - nvimBufferline.enable = true; + lsp = { + enable = true; + formatOnSave = true; + lspkind = { + enable = false; + }; + lightbulb = { + enable = false; #even with this disabled enabling lspaga sets lightbulb on + }; + lspsaga = { + enable = false; #when enabled getting annoying lightbulb + }; + trouble = { + enable = true; + }; + lspSignature = { + enable = false; + }; + otter-nvim = { + enable = false; + }; + nvim-docs-view = { + enable = false; + }; }; - treesitter.context.enable = true; + languages = { + enableFormat = true; + enableTreesitter = true; + enableExtraDiagnostics = true; + nix = { + enable = true; + lsp = { + server = "nil"; + }; + }; + clang = { + enable = true; + }; + zig = { + enable = true; + }; + python = { + enable = true; + }; + markdown = { + enable = true; + }; + ts = { + enable = true; + lsp = { + enable = true; + }; + format.type = "prettierd"; + extensions.ts-error-translator = { + enable = true; + }; + }; + html = { + enable = true; + }; + lua = { + enable = true; + }; + css = { + enable = true; + format.type = "prettierd"; + }; + typst = { + enable = true; + }; + rust = { + enable = true; + crates = { + enable = true; + }; + }; + }; + + visuals = { + nvim-web-devicons = { + enable = true; + }; + nvim-cursorline = { + enable = true; + }; + cinnamon-nvim = { + enable = true; + }; + fidget-nvim = { + enable = true; + }; + highlight-undo = { + enable = true; + }; + indent-blankline = { + enable = true; + }; + rainbow-delimiters = { + enable = true; + }; + }; + statusline.lualine = { + enable = true; + theme = "base16"; + }; + + autopairs = { + nvim-autopairs = { + enable = true; + }; + }; + + autocomplete = { + nvim-cmp = { + enable = false; + }; + blink-cmp = { + enable = true; + friendly-snippets.enable = true; + setupOpts = { + completion.documentation.auto_show_delay_ms = 50; + }; + }; + }; + + snippets = { + luasnip = { + enable = true; + }; + }; + + tabline = { + nvimBufferline = { + enable = true; + }; + }; + + treesitter = { + context = { + enable = false; + }; + }; binds = { - whichKey.enable = true; - cheatsheet.enable = true; + whichKey = { + enable = true; + }; + cheatsheet = { + enable = true; + }; }; git = { enable = true; - gitsigns.enable = true; - gitsigns.codeActions.enable = false; # throws an annoying debug message + gitsigns = { + enable = true; + codeActions = { + enable = false; + }; + }; }; - projects.project-nvim.enable = true; - dashboard.dashboard-nvim.enable = true; + projects = { + project-nvim = { + enable = true; + }; + }; - filetree.neo-tree.enable = true; + dashboard = { + dashboard-nvim = { + enable = true; + }; + alpha = { + enable = false; + }; + }; + + filetree = { + neo-tree = { + enable = true; + }; + }; notify = { - nvim-notify.enable = true; - nvim-notify.setupOpts.background_colour = "#${config.lib.stylix.colors.base01}"; + nvim-notify = { + enable = true; + setupOpts.background_colour = "#${config.lib.stylix.colors.base01}"; + }; }; utility = { - ccc.enable = false; - vim-wakatime.enable = false; - icon-picker.enable = true; - surround.enable = true; - diffview-nvim.enable = true; + preview.markdownPreview = { + enable = true; + }; + ccc = { + enable = false; + }; + vim-wakatime = { + enable = false; + }; + icon-picker = { + enable = true; + }; + surround = { + enable = true; + }; + diffview-nvim = { + enable = true; + }; motion = { - hop.enable = true; - leap.enable = true; - precognition.enable = false; + hop = { + enable = true; + }; + leap = { + enable = true; + }; + precognition = { + enable = false; + }; }; - images = { - image-nvim.enable = false; + image-nvim = { + enable = false; + }; }; }; ui = { - borders.enable = true; - noice.enable = true; - colorizer.enable = true; - illuminate.enable = true; + borders = { + enable = true; + }; + noice = { + enable = true; + }; + colorizer = { + enable = true; + }; + illuminate = { + enable = true; + }; breadcrumbs = { enable = false; - navbuddy.enable = false; + navbuddy = { + enable = false; + }; }; smartcolumn = { - enable = false; + enable = true; + }; + fastaction = { + enable = true; + }; + }; + + terminal = { + toggleterm = { + enable = true; + lazygit = { + enable = true; + }; }; - fastaction.enable = true; }; session = { - nvim-session-manager.enable = false; + nvim-session-manager = { + enable = false; + }; }; - comments = { comment-nvim.enable = true; }; }; }; + + home.activation = { + dirtytalkUpdate = config.lib.dag.entryAfter ["writeBoundary"] '' + # Check if programmingWordlist file already exists to avoid unnecessary downloads + WORDLIST_FILE="$HOME/.config/nvim/spell/programming.utf-8.add" + if [ ! -f "$WORDLIST_FILE" ]; then + echo "Programming wordlist not found, downloading via DirtytalkUpdate..." + if ${config.programs.nvf.finalPackage}/bin/nvim -c "DirtytalkUpdate" -c "qa!" 2>/dev/null; then + echo "DirtytalkUpdate completed successfully" + else + echo "DirtytalkUpdate failed, but continuing..." >&2 + fi + else + echo "Programming wordlist already exists at $WORDLIST_FILE, skipping download" + fi + ''; + }; } + diff --git a/modules/home/obs-studio.nix b/modules/home/obs-studio.nix new file mode 100644 index 0000000..05d8469 --- /dev/null +++ b/modules/home/obs-studio.nix @@ -0,0 +1,15 @@ +{pkgs, ...}: { + programs.obs-studio = { + enable = true; + #enableVirtualCamera = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-pipewire-audio-capture + obs-vkcapture + obs-source-clone + obs-move-transition + obs-composite-blur + obs-backgroundremoval + ]; + }; +} diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index a519741..9b02b3b 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -1,6 +1,7 @@ { pkgs, username, + profile, ... }: { home.packages = [ @@ -16,5 +17,12 @@ (import ./web-search.nix {inherit pkgs;}) (import ./rofi-launcher.nix {inherit pkgs;}) (import ./screenshootin.nix {inherit pkgs;}) + (import ./hm-find.nix {inherit pkgs;}) + (import ./zcli.nix { + inherit pkgs profile; + backupFiles = [ + ".config/mimeapps.list.backup" + ]; + }) ]; } diff --git a/modules/home/scripts/hm-find.nix b/modules/home/scripts/hm-find.nix new file mode 100644 index 0000000..d997469 --- /dev/null +++ b/modules/home/scripts/hm-find.nix @@ -0,0 +1,60 @@ +{pkgs}: +pkgs.writeShellScriptBin "hm-find" '' + #!/usr/bin/env bash + + # Script Metadata + #=============================================== + # This script searches recent journalctl entries for Home Manager errors + # It identifies backup files that prevent rebuilds and allows removal. + # Author: Don Williams + # Creation Date: May 6th, 2025 + # Revision History: + #----------------------------------------------- + # 0.1 - 5/6/25 - Initial version + # 0.2 - 5/7/25 - Improved messaging, added log directory check + + # Display WARNING message + echo "===============================================" + echo " โš ๏ธ WARNING โš ๏ธ " + echo "===============================================" + echo "*** This script is experimental! ***" + echo "It will attempt to find old backup files that are preventing Home Manager from rebuilding." + echo "If conflicting files are found, you will be prompted to remove them." + echo "A log of any deletions will be stored in \$HOME/hm-logs." + echo "===============================================" + + # Define the time range (default: last 30 minutes) + TIME_RANGE="30m" + LOG_DIR="$HOME/hm-logs" + LOG_FILE="$LOG_DIR/hm-cleanup-$(date +'%Y-%m-%d_%H-%M-%S').log" + + # Ensure the log directory exists + if [ ! -d "$LOG_DIR" ]; then + echo "Creating log directory: $LOG_DIR" + mkdir -p "$LOG_DIR" + fi + + # Search journal logs for backup conflicts and extract file paths + FILES=$(journalctl --since "-$TIME_RANGE" -xe | grep hm-activate | awk -F "'|'" '/would be clobbered by backing up/ {print $2}') + + # Check if any files were found + if [ -z "$FILES" ]; then + echo "No conflicting backup files found in the last $TIME_RANGE." + exit 0 + fi + + # Display found backup files + echo "๐Ÿšจ The following backup files are preventing Home Manager from rebuilding:" + echo "$FILES" | tr ' ' '\n' + + # Ask for user confirmation before deletion + read -p "โ“ Do you want to remove these files? (y/N): " confirm + + if [[ "$confirm" == "y" || "$confirm" == "Y" ]]; then + echo "๐Ÿ—‘๏ธ Deleting files..." | tee -a "$LOG_FILE" + echo "$FILES" | xargs rm -v | tee -a "$LOG_FILE" + echo "โœ… Cleanup completed at $(date)" | tee -a "$LOG_FILE" + else + echo "โ›” No files were removed." | tee -a "$LOG_FILE" + fi +'' diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix new file mode 100644 index 0000000..8502c1c --- /dev/null +++ b/modules/home/scripts/zcli.nix @@ -0,0 +1,325 @@ +{ + pkgs, + profile, + backupFiles ? [".config/mimeapps.list.backup"], + ... +}: let + backupFilesString = pkgs.lib.strings.concatStringsSep " " backupFiles; +in + pkgs.writeShellScriptBin "zcli" '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + # --- Configuration --- + PROJECT="zaneyos" #ddubos or zaneyos + PROFILE="${profile}" + BACKUP_FILES_STR="${backupFilesString}" + VERSION="1.0.1" + FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix" + + read -r -a BACKUP_FILES <<< "$BACKUP_FILES_STR" + + # --- Helper Functions --- + print_help() { + echo "ZaneyOS CLI Utility -- version $VERSION" + echo "" + echo "Usage: zcli [command]" + echo "" + echo "Commands:" + echo " cleanup - Clean up old system generations. Can specify a number to keep." + echo " diag - Create a system diagnostic report." + echo " (Filename: homedir/diag.txt)" + echo " list-gens - List user and system generations." + echo " rebuild - Rebuild the NixOS system configuration." + echo " rebuild-boot - Rebuild and set as boot default (activates on next restart)." + echo " trim - Trim filesystems to improve SSD performance." + echo " update - Update the flake and rebuild the system." + echo " update-host - Auto set host and profile in flake.nix." + echo " (Opt: zcli update-host [hostname] [profile])" + echo "" + echo " help - Show this help message." + } + + handle_backups() { + if [ ''${#BACKUP_FILES[@]} -eq 0 ]; then + echo "No backup files configured to check." + return + fi + + echo "Checking for backup files to remove..." + for file_path in "''${BACKUP_FILES[@]}"; do + full_path="$HOME/$file_path" + if [ -f "$full_path" ]; then + echo "Removing stale backup file: $full_path" + rm "$full_path" + fi + done + } + + detect_gpu_profile() { + local detected_profile="" + local has_nvidia=false + local has_intel=false + local has_amd=false + local has_vm=false + + if lspci &> /dev/null; then # Check if lspci is available + if lspci | grep -qi 'vga\|3d'; then + while read -r line; do + if echo "$line" | grep -qi 'nvidia'; then + has_nvidia=true + elif echo "$line" | grep -qi 'amd'; then + has_amd=true + elif echo "$line" | grep -qi 'intel'; then + has_intel=true + elif echo "$line" | grep -qi 'virtio\|vmware'; then + has_vm=true + fi + done < <(lspci | grep -i 'vga\|3d') + + if "$has_vm"; then + detected_profile="vm" + elif "$has_nvidia" && "$has_intel"; then + detected_profile="nvidia-laptop" + elif "$has_nvidia"; then + detected_profile="nvidia" + elif "$has_amd"; then + detected_profile="amd" + elif "$has_intel"; then + detected_profile="intel" + fi + fi + else + echo "Warning: lspci command not found. Cannot auto-detect GPU profile." >&2 + fi + echo "$detected_profile" # Return the detected profile + } + + # --- Main Logic --- + if [ "$#" -eq 0 ]; then + echo "Error: No command provided." >&2 + print_help + exit 1 + fi + + case "$1" in + cleanup) + echo "Warning! This will remove old generations of your system." + read -p "How many generations to keep (default: all)? " keep_count + + if [ -z "$keep_count" ]; then + read -p "This will remove all but the current generation. Continue (y/N)? " -n 1 -r + echo + if [[ $REPLY =~ ^[Yy]$ ]]; then + nh clean all -v + else + echo "Cleanup cancelled." + fi + else + read -p "This will keep the last $keep_count generations. Continue (y/N)? " -n 1 -r + echo + if [[ $REPLY =~ ^[Yy]$ ]]; then + nh clean all -k "$keep_count" -v + else + echo "Cleanup cancelled." + fi + fi + + LOG_DIR="$HOME/zcli-cleanup-logs" + mkdir -p "$LOG_DIR" + LOG_FILE="$LOG_DIR/zcli-cleanup-$(date +%Y-%m-%d_%H-%M-%S).log" + echo "Cleaning up old log files..." >> "$LOG_FILE" + find "$LOG_DIR" -type f -mtime +3 -name "*.log" -delete >> "$LOG_FILE" 2>&1 + echo "Cleanup process logged to $LOG_FILE" + ;; + diag) + echo "Generating system diagnostic report..." + inxi --full > "$HOME/diag.txt" + echo "Diagnostic report saved to $HOME/diag.txt" + ;; + help) + print_help + ;; + list-gens) + echo "--- User Generations ---" + nix-env --list-generations | cat || echo "Could not list user generations." + echo "" + echo "--- System Generations ---" + nix profile history --profile /nix/var/nix/profiles/system | cat || echo "Could not list system generations." + ;; + rebuild) + handle_backups + echo "Starting NixOS rebuild for host: $(hostname)" + if nh os switch --hostname "$PROFILE"; then + echo "Rebuild finished successfully" + else + echo "Rebuild Failed" >&2 + exit 1 + fi + ;; + rebuild-boot) + handle_backups + echo "Starting NixOS rebuild with boot option for host: $(hostname)" + if nh os boot --hostname "$PROFILE"; then + echo "Rebuild with boot option finished successfully" + echo "Changes will activate on next restart" + else + echo "Rebuild with boot option Failed" >&2 + exit 1 + fi + ;; + trim) + echo "Running 'sudo fstrim -v /' may take a few minutes and impact system performance." + read -p "Enter (y/Y) to run now or enter to exit (y/N): " -n 1 -r + echo # move to a new line + if [[ $REPLY =~ ^[Yy]$ ]]; then + echo "Running fstrim..." + sudo fstrim -v / + echo "fstrim complete." + else + echo "Trim operation cancelled." + fi + ;; + update) + handle_backups + echo "Updating flake and rebuilding system for host: $(hostname)" + if nh os switch --hostname "$PROFILE" --update; then + echo "Update and rebuild finished successfully" + else + echo "Update and rebuild Failed" >&2 + exit 1 + fi + ;; + update-host) + target_hostname="" + target_profile="" + + if [ "$#" -eq 3 ]; then # zcli update-host + target_hostname="$2" + target_profile="$3" + elif [ "$#" -eq 1 ]; then # zcli update-host (auto-detect) + echo "Attempting to auto-detect hostname and GPU profile..." + target_hostname=$(hostname) + target_profile=$(detect_gpu_profile) + + if [ -z "$target_profile" ]; then + echo "Error: Could not auto-detect a specific GPU profile. Please provide it manually." >&2 + echo "Usage: zcli update-host [hostname] [profile]" >&2 + exit 1 + fi + echo "Auto-detected Hostname: $target_hostname" + echo "Auto-detected Profile: $target_profile" + else + echo "Error: Invalid number of arguments for 'update-host'." >&2 + echo "Usage: zcli update-host [hostname] [profile]" >&2 + exit 1 + fi + + echo "Updating $FLAKE_NIX_PATH..." + + # Update host + if sed -i "s/^[[:space:]]*host[[:space:]]*=[[:space:]]*\".*\"/ host = \"$target_hostname\"/" "$FLAKE_NIX_PATH"; then + echo "Successfully updated host to: $target_hostname" + else + echo "Error: Failed to update host in $FLAKE_NIX_PATH" >&2 + exit 1 + fi + + # Update profile + if sed -i "s/^[[:space:]]*profile[[:space:]]*=[[:space:]]*\".*\"/ profile = \"$target_profile\"/" "$FLAKE_NIX_PATH"; then + echo "Successfully updated profile to: $target_profile" + else + echo "Error: Failed to update profile in $FLAKE_NIX_PATH" >&2 + exit 1 + fi + + echo "Flake.nix updated successfully!" + ;; + add-host) + hostname="" + profile_arg="" + + if [ "$#" -ge 2 ]; then + hostname="$2" + fi + if [ "$#" -eq 3 ]; then + profile_arg="$3" + fi + + if [ -z "$hostname" ]; then + read -p "Enter the new hostname: " hostname + fi + + if [ -d "$HOME/$PROJECT/hosts/$hostname" ]; then + echo "Error: Host '$hostname' already exists." >&2 + exit 1 + fi + + echo "Copying default host configuration..." + cp -r "$HOME/$PROJECT/hosts/default" "$HOME/$PROJECT/hosts/$hostname" + + detected_profile="" + if [[ -n "$profile_arg" && "$profile_arg" =~ ^(intel|amd|nvidia|nvidia-hybrid|vm)$ ]]; then + detected_profile="$profile_arg" + else + echo "Detecting GPU profile..." + detected_profile=$(detect_gpu_profile) + echo "Detected GPU profile: $detected_profile" + read -p "Is this correct? (y/n) " -n 1 -r + echo + if [[ $REPLY =~ ^[Nn]$ ]]; then + read -p "Enter the correct profile (intel, amd, nvidia, nvidia-hybrid, vm): " new_profile + while [[ ! "$new_profile" =~ ^(intel|amd|nvidia|nvidia-hybrid|vm)$ ]]; do + echo "Invalid profile. Please enter one of the following: intel, amd, nvidia, nvidia-hybrid, vm" + read -p "Enter the correct profile: " new_profile + done + detected_profile=$new_profile + fi + fi + + echo "Setting profile to '$detected_profile'..." + sed -i "s/profile = .*/profile = \"$detected_profile\";/" "$HOME/$PROJECT/hosts/$hostname/default.nix" + + read -p "Generate new hardware.nix? (y/n) " -n 1 -r + echo + if [[ $REPLY =~ ^[Yy]$ ]]; then + echo "Generating hardware.nix..." + sudo nixos-generate-config --show-hardware-config > "$HOME/$PROJECT/hosts/$hostname/hardware.nix" + echo "hardware.nix generated." + fi + + echo "Adding new host to git..." + git -C "$HOME/$PROJECT" add . + echo "hostname: $hostname added" + ;; + del-host) + hostname="" + if [ "$#" -eq 2 ]; then + hostname="$2" + else + read -p "Enter the hostname to delete: " hostname + fi + + if [ ! -d "$HOME/$PROJECT/hosts/$hostname" ]; then + echo "Error: Host '$hostname' does not exist." >&2 + exit 1 + fi + + read -p "Are you sure you want to delete the host '$hostname'? (y/N) " -n 1 -r + echo + if [[ $REPLY =~ ^[Yy]$ ]]; then + echo "Deleting host '$hostname'..." + rm -rf "$HOME/$PROJECT/hosts/$hostname" + git -C "$HOME/$PROJECT" add . + echo "hostname: $hostname removed" + else + echo "Deletion cancelled." + fi + ;; + *) + echo "Error: Invalid command '$1'" >&2 + print_help + exit 1 + ;; + esac + '' diff --git a/modules/home/starship.nix b/modules/home/starship.nix index 05e7772..5e2c273 100644 --- a/modules/home/starship.nix +++ b/modules/home/starship.nix @@ -1,6 +1,59 @@ -{pkgs, ...}: { +# starship is a minimal, fast, and extremely customizable prompt for any shell! +{ + config, + lib, + ... +}: let + accent = "#${config.lib.stylix.colors.base0D}"; + background-alt = "#${config.lib.stylix.colors.base01}"; +in { programs.starship = { - enable = false; - package = pkgs.starship; + enable = true; + settings = { + add_newline = false; + format = lib.concatStrings [ + "$nix_shell" + "$hostname" + "$directory" + "$git_branch" + "$git_state" + "$git_status" + "\n" + "$character" + ]; + directory = {style = accent;}; + + character = { + success_symbol = "[โฏ](${accent})"; + error_symbol = "[โฏ](red)"; + vimcmd_symbol = "[โฎ](cyan)"; + }; + + nix_shell = { + format = "[$symbol]($style) "; + symbol = "๐Ÿš"; + style = ""; + }; + + git_branch = { + symbol = "[๎‚ถ](${background-alt})๏˜ "; + style = "fg:${accent} bg:${background-alt}"; + format = "on [$symbol$branch]($style)[๎‚ด](${background-alt}) "; + }; + + git_status = { + format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218)($ahead_behind$stashed)]($style)"; + style = "cyan"; + conflicted = ""; + renamed = ""; + deleted = ""; + stashed = "โ‰ก"; + }; + + git_state = { + format = "([$state( $progress_current/$progress_total)]($style)) "; + style = "bright-black"; + }; + }; }; } diff --git a/modules/home/tealdeer.nix b/modules/home/tealdeer.nix new file mode 100644 index 0000000..a8e6c94 --- /dev/null +++ b/modules/home/tealdeer.nix @@ -0,0 +1,10 @@ +{...}: { + programs.tealdeer = { + enable = true; + settings = { + display.compact = false; + display.use_pager = true; + updates.auto_update = true; + }; + }; +} diff --git a/modules/home/tmux.nix b/modules/home/tmux.nix new file mode 100644 index 0000000..a23ecb0 --- /dev/null +++ b/modules/home/tmux.nix @@ -0,0 +1,118 @@ +# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window. +{pkgs, ...}: { + programs.tmux = { + enable = true; + mouse = true; + shell = "${pkgs.zsh}/bin/zsh"; + prefix = "C-a"; + terminal = "kitty"; + keyMode = "vi"; + + extraConfig = '' + set-option -g status-position top + + #set -g default-terminal "screen-256color" + set-option -g history-limit 5000 + unbind % + unbind '"' + + bind-key h select-pane -L + bind-key j select-pane -D + bind-key k select-pane -U + bind-key l select-pane -R + + set -gq allow-passthrough on + bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt + + bind-key -n C-Tab next-window + bind-key -n C-S-Tab previous-window + bind-key -n M-Tab new-window + + + # Start windows and panes index at 1, not 0. + set -g base-index 1 + setw -g pane-base-index 1 + + + bind-key "|" split-window -h -c "#{pane_current_path}" + bind-key "\\" split-window -fh -c "#{pane_current_path}" + + bind-key "-" split-window -v -c "#{pane_current_path}" + bind-key "_" split-window -fv -c "#{pane_current_path}" + + bind -r C-j resize-pane -D 15 + bind -r C-k resize-pane -U 15 + bind -r C-h resize-pane -L 15 + bind -r C-l resize-pane -R 15 + + # 'c' to new window + bind-key c new-window + + # 'n' next window + bind-key n next-window + + # 'p' next previous + bind-key n previous-window + + unbind r + bind r source-file ~/.config/tmux/tmux.conf + + bind -r m resize-pane -Z + + bind-key t clock-mode + bind-key q display-panes + bind-key u refresh-client + bind-key o select-pane -t :.+ + + + ##### Display Popups ##### + + bind C-y display-popup \ + -d "#{pane_current_path}" \ + -w 80% \ + -h 80% \ + -E "lazygit" + bind C-n display-popup -E 'bash -i -c "read -p \"Session name: \" name; tmux new-session -d -s \$name && tmux switch-client -t \$name"' + bind C-j display-popup -E "tmux list-sessions | sed -E 's/:.*$//' | grep -v \"^$(tmux display-message -p '#S')\$\" | fzf --reverse | xargs tmux switch-client -t" + #bind C-p display-popup -E "ipython" + #bind C-f display-popup \ + # -w 80% \ + # -h 80% \ + # -E 'rmpc' + bind C-r display-popup \ + -d "#{pane_current_path}" \ + -w 90% \ + -h 90% \ + -E "yazi" + bind C-z display-popup \ + -w 90% \ + -h 90% \ + -E 'nvim ~/ddubsos/flake.nix' + #bind C-g display-popup -E "bash -i ~/.tmux/scripts/chat-popup.sh" + bind C-t display-popup \ + -d "#{pane_current_path}" \ + -w 75% \ + -h 75% \ + -E "zsh" + + ##### Display Menu ##### + + bind d display-menu -T "#[align=centre]Dotfiles" -x C -y C \ + "ZaneyOS flake.nix" f "display-popup -E 'nvim ~/zaneyos/flake.nix'" \ + "ZaneyOS packages" p "display-popup -E 'nvim ~/zaneyos/modules/core/packages.nix'" \ + "ZaneyOS keybinds" k "display-popup -E 'nvim ~/zaneyos/modules/home/hyprland/binds.nix'" \ + "ZaneyOS env variables" e "display-popup -E 'nvim ~/zaneyos/modules/home/hyprland/env.nix'" \ + "ZaneyOS windowrules" w "display-popup -E 'nvim ~/zaneyos/modules/home/hyprland/windowrules.nix'" \ + "Exit" q "" + + + + ''; + + plugins = with pkgs; [ + tmuxPlugins.vim-tmux-navigator + tmuxPlugins.sensible + tmuxPlugins.tokyo-night-tmux + ]; + }; +} diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix new file mode 100644 index 0000000..280531d --- /dev/null +++ b/modules/home/vscode.nix @@ -0,0 +1,20 @@ +{pkgs, ...}: { + nixpkgs.config.allowUnfree = true; + + programs.vscode = { + enable = true; + profiles = { + default = { + extensions = with pkgs.vscode-extensions; [ + bbenoist.nix + jeff-hykin.better-nix-syntax + ms-vscode.cpptools-extension-pack + vscodevim.vim # Vim emulation + mads-hartmann.bash-ide-vscode + tamasfe.even-better-toml + zainchen.json + ]; + }; + }; + }; +} diff --git a/modules/home/waybar/Jerry-waybar.nix b/modules/home/waybar/Jerry-waybar.nix new file mode 100644 index 0000000..3d9890b --- /dev/null +++ b/modules/home/waybar/Jerry-waybar.nix @@ -0,0 +1,356 @@ +{ + pkgs, + config, + lib, + ... +}: let + terminal = "kitty"; + base00 = "0F1419"; + base01 = "131721"; + base03 = "3E4B59"; + base05 = "E6E1CF"; + base06 = "E6E1CF"; + base07 = "F3F4F5"; + base08 = "F07178"; + base09 = "FF8F40"; + base0A = "FFB454"; + base0B = "B8CC52"; + base0C = "95E6CB"; + base0D = "59C2FF"; + base0E = "D2A6FF"; + base0F = "E6B673"; +in + with lib; { + # Configure & Theme Waybar + programs.waybar = { + enable = true; + package = pkgs.waybar; + settings = [ + { + layer = "top"; + position = "top"; + + modules-center = ["network" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock"]; # Eterna: [ "hyprland/window" ] + modules-left = ["custom/startmenu" "hyprland/window"]; # Eternal: [ "hyprland/workspaces" "cpu" "memory" "network" ] + modules-right = ["tray" "idle_inhibitor" "custom/notification" "battery" "custom/exit"]; # Eternal: [ "idle_inhibitor" "pulseaudio" "clock" "custom/notification" "tray" ] + + "hyprland/workspaces" = { + format = "{name}"; + format-icons = { + default = " "; + active = " "; + urgent = " "; + }; + on-scroll-up = "hyprctl dispatch workspace e+1"; + on-scroll-down = "hyprctl dispatch workspace e-1"; + }; + "clock" = { + format = ''๏€— {:%H:%M}''; + /* + ''{:๏€— %I:%M %p}''; + */ + tooltip = true; + tooltip-format = "{:%A, %d.%B %Y }{calendar}"; + }; + "hyprland/window" = { + max-length = 60; + separate-outputs = false; + }; + "memory" = { + interval = 5; + format = "๏‡€ {}%"; + tooltip = true; + on-click = "${terminal} -e btop"; + }; + "cpu" = { + interval = 5; + format = "๏‹› {usage:2}%"; + tooltip = true; + on-click = "${terminal} -e btop"; + }; + "disk" = { + format = "๏€™ {free}"; + tooltip = true; + # Not working with zaneyos window open then closes + #on-click = "${terminal} -e sh -c df -h ; read"; + }; + "network" = { + format-icons = ["๓ฐคฏ" "๓ฐคŸ" "๓ฐคข" "๓ฐคฅ" "๓ฐคจ"]; + format-ethernet = "๏ฃ {bandwidthDownBits}"; + format-wifi = "๏ฃ {bandwidthDownBits}"; + format-disconnected = "๓ฐคฎ"; + tooltip = false; + on-click = "${terminal} -e btop"; + }; + "tray" = { + spacing = 12; + }; + "pulseaudio" = { + format = "{icon} {volume}% {format_source}"; + format-bluetooth = "{volume}% {icon}๏Š” {format_source}"; + format-bluetooth-muted = "๏šฉ {icon}๏Š” {format_source}"; + format-muted = "๏šฉ {format_source}"; + format-source = "๏„ฐ {volume}%"; + format-source-muted = "๏„ฑ"; + format-icons = { + headphone = "๏€ฅ"; + hands-free = "๏–"; + headset = "๏–"; + phone = "๏‚•"; + portable = "๏‚•"; + car = "๏†น"; + default = ["๏€ฆ" "๏€ง" "๏€จ"]; + }; + on-click = "pavucontrol"; + }; + "custom/exit" = { + tooltip = false; + format = "โป"; + on-click = "sleep 0.1 && wlogout"; + }; + "custom/startmenu" = { + tooltip = false; + format = "๏‹œ "; + # exec = "rofi -show drun"; + on-click = "rofi -show drun"; + }; + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + activated = "๏ฎ "; + deactivated = "๏ฐ "; + }; + tooltip = "true"; + }; + "custom/notification" = { + tooltip = false; + format = "{icon} {}"; + format-icons = { + notification = "๏ƒณ๏‘„"; + none = "๏ƒณ"; + dnd-notification = "๏‡ถ๏‘„"; + dnd-none = "๏‡ถ"; + inhibited-notification = "๏ƒณ๏‘„"; + inhibited-none = "๏ƒณ"; + dnd-inhibited-notification = "๏‡ถ๏‘„"; + dnd-inhibited-none = "๏‡ถ"; + }; + return-type = "json"; + exec-if = "which swaync-client"; + exec = "swaync-client -swb"; + on-click = "swaync-client -t"; + escape = true; + }; + "battery" = { + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = "๓ฐ‚„ {capacity}%"; + format-plugged = "๓ฑ˜– {capacity}%"; + format-icons = ["๓ฐบ" "๓ฐป" "๓ฐผ" "๓ฐฝ" "๓ฐพ" "๓ฐฟ" "๓ฐ‚€" "๓ฐ‚" "๓ฐ‚‚" "๓ฐน"]; + on-click = ""; + tooltip = false; + }; + } + ]; + style = concatStrings [ + '' + * { + font-size: 16px; + font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif; + font-weight: bold; + } + window#waybar { + /* + + background-color: rgba(26,27,38,0); + border-bottom: 1px solid rgba(26,27,38,0); + border-radius: 0px; + color: #${base0F}; + */ + + background-color: rgba(26,27,38,0); + border-bottom: 1px solid rgba(26,27,38,0); + border-radius: 0px; + color: #${base0F}; + } + #workspaces { + /* + Eternal + background: linear-gradient(180deg, #${base00}, #${base01}); + margin: 5px 5px 5px 0px; + padding: 0px 10px; + border-radius: 0px 15px 50px 0px; + border: 0px; + font-style: normal; + color: #${base00}; + */ + background: linear-gradient(45deg, #${base01}, #${base01}); + margin: 5px; + padding: 0px 1px; + border-radius: 15px; + border: 0px; + font-style: normal; + color: #${base00}; + } + #workspaces button { + padding: 0px 5px; + margin: 4px 3px; + border-radius: 15px; + border: 0px; + color: #${base00}; + background: linear-gradient(45deg, #${base0D}, #${base0E}); + opacity: 0.5; + transition: all 0.3s ease-in-out; + } + #workspaces button.active { + padding: 0px 5px; + margin: 4px 3px; + border-radius: 15px; + border: 0px; + color: #${base00}; + background: linear-gradient(45deg, #${base0D}, #${base0E}); + opacity: 1.0; + min-width: 40px; + transition: all 0.3s ease-in-out; + } + #workspaces button:hover { + border-radius: 15px; + color: #${base00}; + background: linear-gradient(45deg, #${base0D}, #${base0E}); + opacity: 0.8; + } + tooltip { + background: #${base00}; + border: 1px solid #${base0E}; + border-radius: 10px; + } + tooltip label { + color: #${base07}; + } + #window { + /* + Eternal + color: #${base05}; + background: #${base00}; + border-radius: 15px; + margin: 5px; + padding: 2px 20px; + */ + margin: 5px; + padding: 2px 20px; + color: #${base05}; + background: #${base01}; + border-radius: 50px 15px 50px 15px; + } + #memory { + color: #${base0F}; + /* + Eternal + background: #${base00}; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + */ + background: #${base01}; + margin: 5px; + padding: 2px 20px; + border-radius: 15px 50px 15px 50px; + } + #clock { + color: #${base0B}; + background: #${base00}; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + } + #idle_inhibitor { + color: #${base0A}; + background: #${base00}; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + } + #cpu { + color: #${base07}; + background: #${base00}; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + } + #disk { + color: #${base0F}; + background: #${base00}; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + } + #battery { + color: #${base08}; + background: #${base00}; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + } + #network { + color: #${base09}; + background: #${base00}; + border-radius: 50px 15px 50px 15px; + margin: 5px; + padding: 2px 20px; + } + #tray { + color: #${base05}; + background: #${base00}; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + } + #pulseaudio { + color: #${base0D}; + /* + Eternal + background: #${base00}; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + */ + background: #${base01}; + margin: 4px; + padding: 2px 20px; + border-radius: 50px 15px 50px 15px; + } + #custom-notification { + color: #${base0C}; + background: #${base00}; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + } + #custom-startmenu { + color: #${base0E}; + background: #${base00}; + border-radius: 0px 15px 50px 0px; + margin: 5px 5px 5px 0px; + padding: 2px 20px; + } + #idle_inhibitor { + color: #${base09}; + background: #${base00}; + border-radius: 15px 50px 15px 50px; + margin: 5px; + padding: 2px 20px; + } + #custom-exit { + color: #${base0E}; + background: #${base00}; + border-radius: 15px 0px 0px 50px; + margin: 5px 0px 5px 5px; + padding: 2px 20px; + } + '' + ]; + }; + } diff --git a/modules/home/waybar/waybar-ddubs-2.nix b/modules/home/waybar/waybar-ddubs-2.nix new file mode 100644 index 0000000..441abdd --- /dev/null +++ b/modules/home/waybar/waybar-ddubs-2.nix @@ -0,0 +1,356 @@ +{ + pkgs, + config, + lib, + ... +}: let + terminal = "kitty"; + base00 = "0F1419"; + base01 = "131721"; + base03 = "3E4B59"; + base05 = "E6E1CF"; + base06 = "E6E1CF"; + base07 = "F3F4F5"; + base08 = "F07178"; + base09 = "FF8F40"; + base0A = "FFB454"; + base0B = "B8CC52"; + base0C = "95E6CB"; + base0D = "59C2FF"; + base0E = "D2A6FF"; + base0F = "E6B673"; +in + with lib; { + # Configure & Theme Waybar + programs.waybar = { + enable = true; + package = pkgs.waybar; + settings = [ + { + layer = "top"; + position = "top"; + + modules-left = ["custom/startmenu" "tray" "hyprland/window"]; + modules-center = ["hyprland/workspaces"]; + modules-right = ["idle_inhibitor" "custom/notification" "pulseaudio" "battery" "clock" "custom/exit"]; + + "hyprland/workspaces" = { + format = "{name}"; + format-icons = { + default = " "; + active = " "; + urgent = " "; + }; + on-scroll-up = "hyprctl dispatch workspace e+1"; + on-scroll-down = "hyprctl dispatch workspace e-1"; + }; + "clock" = { + format = ''๏€— {:%H:%M}''; + /* + ''{:๏€— %I:%M %p}''; + */ + tooltip = true; + tooltip-format = "{:%A, %d.%B %Y }{calendar}"; + }; + "hyprland/window" = { + max-length = 60; + separate-outputs = false; + }; + "memory" = { + interval = 5; + format = "๏‡€ {}%"; + tooltip = true; + on-click = "${terminal} -e btop"; + }; + "cpu" = { + interval = 5; + format = "๏‹› {usage:2}%"; + tooltip = true; + on-click = "${terminal} -e btop"; + }; + "disk" = { + format = "๏€™ {free}"; + tooltip = true; + # Not working with zaneyos window open then closes + #on-click = "${terminal} -e sh -c df -h ; read"; + }; + "network" = { + format-icons = ["๓ฐคฏ" "๓ฐคŸ" "๓ฐคข" "๓ฐคฅ" "๓ฐคจ"]; + format-ethernet = "๏ฃ {bandwidthDownBits}"; + format-wifi = "๏ฃ {bandwidthDownBits}"; + format-disconnected = "๓ฐคฎ"; + tooltip = false; + on-click = "${terminal} -e btop"; + }; + "tray" = { + spacing = 12; + }; + "pulseaudio" = { + format = "{icon} {volume}% {format_source}"; + format-bluetooth = "{volume}% {icon}๏Š” {format_source}"; + format-bluetooth-muted = "๏šฉ {icon}๏Š” {format_source}"; + format-muted = "๏šฉ {format_source}"; + format-source = "๏„ฐ {volume}%"; + format-source-muted = "๏„ฑ"; + format-icons = { + headphone = "๏€ฅ"; + hands-free = "๏–"; + headset = "๏–"; + phone = "๏‚•"; + portable = "๏‚•"; + car = "๏†น"; + default = ["๏€ฆ" "๏€ง" "๏€จ"]; + }; + on-click = "pavucontrol"; + }; + "custom/exit" = { + tooltip = false; + format = "โป"; + on-click = "sleep 0.1 && wlogout"; + }; + "custom/startmenu" = { + tooltip = false; + format = "๏‹œ "; + # exec = "rofi -show drun"; + on-click = "rofi -show drun"; + }; + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + activated = "๏ฎ "; + deactivated = "๏ฐ "; + }; + tooltip = "true"; + }; + "custom/notification" = { + tooltip = false; + format = "{icon} {}"; + format-icons = { + notification = "๏ƒณ๏‘„"; + none = "๏ƒณ"; + dnd-notification = "๏‡ถ๏‘„"; + dnd-none = "๏‡ถ"; + inhibited-notification = "๏ƒณ๏‘„"; + inhibited-none = "๏ƒณ"; + dnd-inhibited-notification = "๏‡ถ๏‘„"; + dnd-inhibited-none = "๏‡ถ"; + }; + return-type = "json"; + exec-if = "which swaync-client"; + exec = "swaync-client -swb"; + on-click = "swaync-client -t"; + escape = true; + }; + "battery" = { + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = "๓ฐ‚„ {capacity}%"; + format-plugged = "๓ฑ˜– {capacity}%"; + format-icons = ["๓ฐบ" "๓ฐป" "๓ฐผ" "๓ฐฝ" "๓ฐพ" "๓ฐฟ" "๓ฐ‚€" "๓ฐ‚" "๓ฐ‚‚" "๓ฐน"]; + on-click = ""; + tooltip = false; + }; + } + ]; + style = concatStrings [ + '' + * { + font-size: 16px; + font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif; + font-weight: bold; + } + window#waybar { + /* + + background-color: rgba(26,27,38,0); + border-bottom: 1px solid rgba(26,27,38,0); + border-radius: 0px; + color: #${base0F}; + */ + + background-color: rgba(26,27,38,0); + border-bottom: 1px solid rgba(26,27,38,0); + border-radius: 0px; + color: #${base0F}; + } + #workspaces { + /* + Eternal + background: linear-gradient(180deg, #${base00}, #${base01}); + margin: 5px 5px 5px 0px; + padding: 0px 10px; + border-radius: 0px 15px 15px 0px; + border: 0px; + font-style: normal; + color: #${base00}; + */ + background: linear-gradient(45deg, #${base01}, #${base01}); + margin: 5px; + padding: 0px 1px; + border-radius: 15px; + border: 0px; + font-style: normal; + color: #${base00}; + } + #workspaces button { + padding: 0px 5px; + margin: 4px 3px; + border-radius: 15px; + border: 0px; + color: #${base00}; + background: linear-gradient(45deg, #${base0D}, #${base0E}); + opacity: 0.5; + transition: all 0.3s ease-in-out; + } + #workspaces button.active { + padding: 0px 5px; + margin: 4px 3px; + border-radius: 15px; + border: 0px; + color: #${base00}; + background: linear-gradient(45deg, #${base0D}, #${base0E}); + opacity: 1.0; + min-width: 40px; + transition: all 0.3s ease-in-out; + } + #workspaces button:hover { + border-radius: 15px; + color: #${base00}; + background: linear-gradient(45deg, #${base0D}, #${base0E}); + opacity: 0.8; + } + tooltip { + background: #${base00}; + border: 1px solid #${base0E}; + border-radius: 10px; + } + tooltip label { + color: #${base07}; + } + #window { + /* + Eternal + color: #${base05}; + background: #${base00}; + border-radius: 15px; + margin: 5px; + padding: 2px 20px; + */ + margin: 5px; + padding: 2px 20px; + color: #${base05}; + background: #${base01}; + border-radius: 15px 15px 15px 15px; + } + #memory { + color: #${base0F}; + /* + Eternal + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + */ + background: #${base01}; + margin: 5px; + padding: 2px 20px; + border-radius: 15px 15px 15px 15px; + } + #clock { + color: #${base0B}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + } + #idle_inhibitor { + color: #${base0A}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 3px; + padding: 2px 20px; + } + #cpu { + color: #${base07}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + } + #disk { + color: #${base0F}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + } + #battery { + color: #${base08}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + } + #network { + color: #${base09}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + } + #tray { + color: #${base05}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 15px; + } + #pulseaudio { + color: #${base0D}; + /* + Eternal + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + */ + background: #${base01}; + margin: 4px; + padding: 2px 20px; + border-radius: 15px 15px 15px 15px; + } + #custom-notification { + color: #${base0C}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + } + #custom-startmenu { + color: #${base0E}; + background: #${base00}; + border-radius: 0px 15px 15px 0px; + margin: 5px 5px 5px 0px; + padding: 2px 20px; + } + #idle_inhibitor { + color: #${base09}; + background: #${base00}; + border-radius: 15px 15px 15px 15px; + margin: 5px; + padding: 2px 20px; + } + #custom-exit { + color: #${base0E}; + background: #${base00}; + border-radius: 15px 0px 0px 15px; + margin: 5px 0px 5px 5px; + padding: 2px 20px; + } + '' + ]; + }; + } diff --git a/modules/home/waybar/waybar-dwm.nix b/modules/home/waybar/waybar-dwm.nix new file mode 100644 index 0000000..c914bb1 --- /dev/null +++ b/modules/home/waybar/waybar-dwm.nix @@ -0,0 +1,429 @@ +{ + config, + pkgs, + ... +}: { + home.packages = with pkgs; [waybar]; + + programs.waybar = { + enable = true; + settings = { + mainBar = { + layer = "top"; + "modules-left" = ["hyprland/workspaces" "hyprland/window"]; + "modules-center" = ["clock"]; + "modules-right" = ["tray" "cpu" "memory" "idle_inhibitor" "pulseaudio" "bluetooth"]; + "hyprland/window" = { + format = "{title}"; + "max-length" = 333; + "seperate-outputs" = true; + }; + clock = { + format = "๏€— {:%I:%M %a %d}"; + "tooltip-format" = "{calendar}"; + calendar = { + mode = "month"; + "mode-mon-col" = 3; + "on-scroll" = 1; + "on-click-right" = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "{%W}"; + weekdays = "{}"; + today = "{}"; + }; + }; + actions = { + "on-click-middle" = "mode"; + "on-click-right" = "shift_up"; + "on-click" = "shift_down"; + }; + }; + cpu = { + format = "๓ฐฏณ {usage}%"; + }; + memory = { + format = "๓ฐ› {}%"; + interval = 1; + }; + "custom/gpu-util" = { + exec = "./scripts/gpu-util"; + format = "๓ฐฏฟ {}"; + interval = 1; + }; + "custom/gpu-temp" = { + exec = "./scripts/gpu-temp"; + format = "๏‹‰ {}"; + interval = 1; + }; + temperature = { + "hwmon-path" = "/sys/class/hwmon/hwmon1/temp1_input"; + "critical-threshold" = 80; + format = "๏‹‰ {temperatureC}ยฐC"; + interval = 1; + }; + "hyprland/workspaces" = { + format = "{icon}"; + "active-only" = false; + "sort-by-number" = true; + "on-click" = "activate"; + "all-outputs" = false; + "format-icons" = { + "1" = "1"; + "2" = "2"; + "3" = "3"; + "4" = "4"; + "5" = "5"; + "6" = "6"; + "7" = "7"; + "8" = "8"; + "9" = "9"; + "10" = "10"; + }; + }; + network = { + format = "๓ฐคญ Off"; + "format-wifi" = "{essid} ({signalStrength}%)"; + "format-ethernet" = "๓ฐˆ€"; + "format-disconnected" = "๓ฐคญ Disconnected"; + "tooltip-format" = "{ifname} via {gwaddr} ๏ž–"; + "tooltip-format-wifi" = "{essid}({signalStrength}%) ๏‡ซ "; + "tooltip-format-ethernet" = "๓ฐˆ€ {ifname}"; + "tooltip-format-disconnected" = "Disconnected"; + }; + pulseaudio = { + format = "{icon} {volume}% {format_source}"; + "format-bluetooth" = "{icon} {volume}% {format_source}"; + "format-bluetooth-muted" = "๓ฐ– {format_source}"; + "format-muted" = "๓ฐ– {format_source}"; + "format-source" = "๏„ฐ {volume}%"; + "format-source-muted" = "๏„ฑ"; + "format-icons" = { + headphone = "๏€ฅ"; + phone = "๏‚•"; + portable = "๏‚•"; + default = ["๏€ฆ" "๏€ง" "๏€จ"]; + }; + "on-click-left" = "pavucontrol"; + input = true; + }; + "custom/playerctl" = { + format = "{icon} {}"; + "return-type" = "json"; + "max-length" = 333; + exec = "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F"; + "on-click-middle" = "playerctl play-pause"; + "on-click" = "playerctl previous"; + "on-click-right" = "playerctl next"; + "format-icons" = { + Playing = "๏‹"; + Paused = "๏Œ"; + }; + }; + tray = { + format = "{icon}"; + "icon-size" = 14; + spacing = 5; + }; + idle_inhibitor = { + format = "{icon}"; + "format-icons" = { + activated = "๓ฑ ›"; + deactivated = "๓ฑคฑ"; + }; + }; + "custom/subs" = { + format = "๓ฐ—ƒ {}"; + exec = "/usr/local/bin/subsfile.sh"; + "on-click" = "vivaldi-stable https://youtube.com/thelinuxcast"; + "restart-interval" = 1; + }; + "custom/spacer" = { + format = " "; + }; + "wlr/taskbar" = { + format = "{name}"; + "icon-size" = 14; + "icon-theme" = "Numix-Circle"; + "tooltip-format" = "{title}"; + "on-click" = "activate"; + "on-click-middle" = "close"; + "ignore-list" = ["Alacritty"]; + "app_ids-mapping" = { + firefoxdeveloperedition = "firefox-developer-edition"; + }; + rewrite = { + "Firefox Web Browser" = "Firefox"; + "Foot Server" = "Terminal"; + }; + }; + bluetooth = { + "on-click" = "./scripts/bluetooth-control"; + "on-click-right" = "./scripts/rofi-bluetooth"; + "on-click-middle" = "./scripts/rofi-bluetooth"; + format = "{icon}"; + interval = 15; + "format-icons" = { + on = "๏Š”"; + off = "๓ฐ‚ฒ"; + disabled = "๓ฐ‚ฒ"; + connected = "๏Š“"; + }; + "tooltip-format" = "{device_alias} {status}"; + }; + }; + }; + style = '' + @define-color bg #${config.stylix.base16Scheme.base00}; + @define-color fg #${config.stylix.base16Scheme.base05}; + @define-color lbg #${config.stylix.base16Scheme.base01}; + @define-color yellow #${config.stylix.base16Scheme.base0A}; + @define-color lavender #${config.stylix.base16Scheme.base0E}; + @define-color peach #${config.stylix.base16Scheme.base0A}; + @define-color red #${config.stylix.base16Scheme.base08}; + @define-color green #${config.stylix.base16Scheme.base0B}; + @define-color blue #${config.stylix.base16Scheme.base0D}; + @define-color border #${config.stylix.base16Scheme.base02}; + + * { + min-height: 0; + margin: 0px 0px 0px 0px; + padding: 0; + border-radius: 7px; + font-family: "JetBrains Mono Nerd Font"; + font-size: 10pt; + font-weight: 700; + padding-bottom: 0px; + } + + tooltip { + background: @bg; + border-radius: 7px; + border: 2px solid @border; + } + + #window { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 7px; + border-radius: 3px; + border-color: @lbg; + background-color: @yellow; + color: @bg; + } + + window#waybar.empty #window { + background-color: @bg; + border-bottom: none; + border-right: none; + } + + window#waybar { + background-color: @bg; + color: @lavender; + } + + /* Workspaces */ + @keyframes button_activate { + from { opacity: .3 } + to { opacity: 1.; } + } + + #workspaces { + margin: 0px 0px 0px 0px; + border-radius: 3px; + padding: 1px; + background-color: @bg; + color: @bg; + } + + #workspaces button { + margin: 0px 0px 0px 0px; + border-radius: 3px; + padding-left: 3px; + padding-right: 9px; + background-color: @bg; + color: @fg; + } + + #workspaces button.active { + background-color:@blue; + color: @bg; + } + + #workspaces button.urgent { + color: #F38BA8; + } + + #workspaces button:hover { + border: solid transparent; + } + + #custom-gpu-util { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 10px; + border-radius: 7px; + background-color: @bg; + color: @fg; + } + + #tray { + margin: 0px 0px 0px 0px; + border-radius: 3px; + padding-left: 10px; + padding-right: 10px; + background-color: @bg; + color: @fg; + } + + #idle_inhibitor { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 12px; + border-radius: 3px; + background-color: @bg; + color: @fg; + } + + #network { + margin: 5px 5px 2px 5px; + padding-left: 10px; + padding-right: 12px; + border-radius: 7px; + background-color: @bg; + color: @lavender; + } + + #network.linked { + color: @peach; + } + #network.disconnected, + #network.disabled { + color: @red; + } + + #custom-subs { + color: @fg; + margin: 5px 5px 2px 5px; + padding-left: 10px; + padding-right: 12px; + border-radius: 3px; + border-bottom: 2px solid @bg; + border-right: 2px solid @bg; + border-color: @lbg; + background-color: @red; + } + + #custom-spacer { + background-color: @yellow; + } + + #custom-cliphist { + color: @peach; + margin: 5px 5px 2px 5px; + padding-left: 10px; + padding-right: 12px; + border-radius: 3px; + background-color: @bg; + } + + #custom-gpu-temp, + #cpu, + #memory, + #custom-clipboard, + #temperature { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 10px; + border-radius: 3px; + color: @fg; + background-color: @bg; + } + + #custom-playerctl { + margin: 5px 5px 2px 5px; + padding-left: 10px; + padding-right: 10px; + border-radius: 3px; + color: @fg; + background-color: @bg; + } + + #battery, + #backlight, + #bluetooth, + #pulseaudio { + margin-top: 5px; + margin-bottom: 2px; + color: @fg; + background-color: @bg; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + } + + #battery, + #bluetooth { + margin-left: 0px; + margin-right: 5px; + padding-left: 7.5px; + padding-right: 10px; + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + } + + #backlight, + #pulseaudio { + margin-right: 0px; + margin-left: 5px; + padding-left: 10px; + padding-right: 7.5px; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + } + + #clock { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 10px; + border-radius: 3px; + color: @bg; + background-color: @green; + } + + #taskbar { + border-radius: 0px 0px 0px 0; + padding: 0 3px; + margin: 0 0px; + color: #ffffff; + background-color: rgba(120,118,117,0.3); + } + #taskbar button { + border-radius: 0px 0px 0px 0px; + padding: 0 0 0 3px; + margin: 3px 1; + color: #ffffff; + background-color: rgba(120,118,117,0.1); + } + #taskbar button.active { + background-color: rgba(120,118,117,0.8); + } + + #mode { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 10px; + border-radius: 3px; + background-color: @bg; + color: @peach; + } + ''; + }; +} diff --git a/modules/home/waybar/waybar-dwm2.nix b/modules/home/waybar/waybar-dwm2.nix new file mode 100644 index 0000000..202d152 --- /dev/null +++ b/modules/home/waybar/waybar-dwm2.nix @@ -0,0 +1,480 @@ +{ + config, + pkgs, + ... +}: { + home.packages = with pkgs; [waybar]; + + programs.waybar = { + enable = true; + settings = { + mainBar = { + layer = "top"; + "modules-left" = ["hyprland/workspaces" "temperature" "hyprland/window"]; + "modules-center" = ["custom/spacer"]; + "modules-right" = ["tray" "cpu" "memory" "idle_inhibitor" "clock" "pulseaudio" "bluetooth"]; + "hyprland/window" = { + format = "{title}"; + "max-length" = 333; + "seperate-outputs" = true; + }; + clock = { + format = "๏€— {:%I:%M %a %d}"; + "tooltip-format" = "{calendar}"; + calendar = { + mode = "month"; + "mode-mon-col" = 3; + "on-scroll" = 1; + "on-click-right" = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "{%W}"; + weekdays = "{}"; + today = "{}"; + }; + }; + actions = { + "on-click-middle" = "mode"; + "on-click-right" = "shift_up"; + "on-click" = "shift_down"; + }; + }; + cpu = { + format = "๓ฐฏณ {usage}%"; + }; + memory = { + format = "๓ฐ› {}%"; + interval = 1; + }; + "custom/gpu-util" = { + exec = "./scripts/gpu-util"; + format = "๓ฐฏฟ {}"; + interval = 1; + }; + "custom/gpu-temp" = { + exec = "./scripts/gpu-temp"; + format = "๏‹‰ {}"; + interval = 1; + }; + temperature = { + "hwmon-path" = "/sys/class/hwmon/hwmon1/temp1_input"; + "critical-threshold" = 80; + format = "๏‹‰ {temperatureC}ยฐC"; + interval = 1; + }; + "hyprland/workspaces" = { + format = "{icon}"; + "active-only" = false; + "sort-by-number" = false; + "on-click" = "activate"; + "all-outputs" = false; + "format-icons" = { + "1" = "1"; + "2" = "2"; + "3" = "3"; + "4" = "4"; + "5" = "5"; + "6" = "6"; + "7" = "7"; + "8" = "8"; + "9" = "9"; + "10" = "10"; + }; + }; + network = { + format = "๓ฐคญ Off"; + "format-wifi" = "{essid} ({signalStrength}%)"; + "format-ethernet" = "๓ฐˆ€"; + "format-disconnected" = "๓ฐคญ Disconnected"; + "tooltip-format" = "{ifname} via {gwaddr} ๏ž–"; + "tooltip-format-wifi" = "{essid}({signalStrength}%) ๏‡ซ "; + "tooltip-format-ethernet" = "๓ฐˆ€ {ifname}"; + "tooltip-format-disconnected" = "Disconnected"; + }; + pulseaudio = { + format = "{icon} {volume}% {format_source}"; + "format-bluetooth" = "{icon} {volume}% {format_source}"; + "format-bluetooth-muted" = "๓ฐ– {format_source}"; + "format-muted" = "๓ฐ– {format_source}"; + "format-source" = "๏„ฐ {volume}%"; + "format-source-muted" = "๏„ฑ"; + "format-icons" = { + headphone = "๏€ฅ"; + phone = "๏‚•"; + portable = "๏‚•"; + default = ["๏€ฆ" "๏€ง" "๏€จ"]; + }; + "on-click-left" = "pavucontrol"; + input = true; + }; + "custom/playerctl" = { + format = "{icon} {}"; + "return-type" = "json"; + "max-length" = 333; + exec = "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F"; + "on-click-middle" = "playerctl play-pause"; + "on-click" = "playerctl previous"; + "on-click-right" = "playerctl next"; + "format-icons" = { + Playing = "๏‹"; + Paused = "๏Œ"; + }; + }; + tray = { + format = "{icon}"; + "icon-size" = 14; + spacing = 5; + }; + idle_inhibitor = { + format = "{icon}"; + "format-icons" = { + activated = "๓ฑ ›"; + deactivated = "๓ฑคฑ"; + }; + }; + "custom/subs" = { + format = "๓ฐ—ƒ {}"; + exec = "/usr/local/bin/subsfile.sh"; + "on-click" = "vivaldi-stable https://youtube.com/thelinuxcast"; + "restart-interval" = 1; + }; + "custom/spacer" = { + format = " "; + }; + "wlr/taskbar" = { + format = "{name}"; + "icon-size" = 14; + "icon-theme" = "Numix-Circle"; + "tooltip-format" = "{title}"; + "on-click" = "activate"; + "on-click-middle" = "close"; + "ignore-list" = ["Alacritty"]; + "app_ids-mapping" = { + firefoxdeveloperedition = "firefox-developer-edition"; + }; + rewrite = { + "Firefox Web Browser" = "Firefox"; + "Foot Server" = "Terminal"; + }; + }; + bluetooth = { + "on-click" = "./scripts/bluetooth-control"; + "on-click-right" = "./scripts/rofi-bluetooth"; + "on-click-middle" = "./scripts/rofi-bluetooth"; + format = "{icon}"; + interval = 15; + "format-icons" = { + on = "๏Š”"; + off = "๓ฐ‚ฒ"; + disabled = "๓ฐ‚ฒ"; + connected = "๏Š“"; + }; + "tooltip-format" = "{device_alias} {status}"; + }; + }; + }; + style = '' + @define-color background #${config.stylix.base16Scheme.base00}; + @define-color foreground #${config.stylix.base16Scheme.base05}; + @define-color border #${config.stylix.base16Scheme.base02}; + @define-color color1 #${config.stylix.base16Scheme.base01}; + @define-color color2 #${config.stylix.base16Scheme.base02}; + @define-color color3 #${config.stylix.base16Scheme.base03}; + @define-color color4 #${config.stylix.base16Scheme.base04}; + @define-color color5 #${config.stylix.base16Scheme.base05}; + @define-color color6 #${config.stylix.base16Scheme.base06}; + @define-color color7 #${config.stylix.base16Scheme.base07}; + @define-color color8 #${config.stylix.base16Scheme.base08}; + @define-color color9 #${config.stylix.base16Scheme.base09}; + @define-color color10 #${config.stylix.base16Scheme.base0A}; + @define-color color11 #${config.stylix.base16Scheme.base0B}; + @define-color color12 #${config.stylix.base16Scheme.base0C}; + @define-color color13 #${config.stylix.base16Scheme.base0D}; + @define-color color14 #${config.stylix.base16Scheme.base0E}; + @define-color color15 #${config.stylix.base16Scheme.base0F}; + + * { + min-height: 0; + margin: 0; + padding: 0; + font-family: "JetBrains Mono Nerd Font"; + font-size: 10pt; + font-weight: 700; + padding-bottom: 0px; + } + + tooltip { + background: @background; + border: 2px solid @border; + } + + #window { + margin: 0px 5px 0px 5px; + padding-left: 10px; + padding-right: 7px; + background-color: @color14; + color: #282828; + } + + window#waybar.empty #window { + background-color: transparent; + border-bottom: none; + border-right: none; + } + + window#waybar { + background-color:@color14; + color: @color2; + } + + /* Workspaces */ + + #workspaces { + margin: 0px 0px 0px 0px; + padding: 0px; + background-color: @background; + color: @color7; + } + + #workspaces button { + margin: 0px 0px 0px 0px; + padding-left: 3px; + padding-right: 9px; + background-color: @background; + color: @color7; + } + + #workspaces button.active { + padding: 0 2px 0 1px; + color: @color3; + } + + #workspaces button.urgent { + color: @color9; + } + + #custom-gpu-util { + margin: 0px 5px 0px 5px; + padding-left: 10px; + padding-right: 10px; + background-color: @background; + color: @foreground; + } + + #tray { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 10px; + background-color: @background; + color: @foreground; + } + + #idle_inhibitor { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 12px; + background-color: @background; + color: @foreground; + } + + #idle_inhibitor.activated { + color: @color9; + } + + #network { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 12px; + background-color: @background; + color: @color11; + } + + #network.linked { + color: @color6; + } + #network.disconnected, + #network.disabled { + color: @color4; + } + + #custom-subs { + color: @foreground; + margin: 0px 5px 0px 5px; + padding-left: 10px; + padding-right: 12px; + border-bottom: 2px solid @background; + border-right: 2px solid @background; + border-color: @color8; + background-color: @color13; + } + + #custom-cliphist { + color: @color14; + margin: 0px 5px 0px 5px; + padding-left: 10px; + padding-right: 12px; + background-color: @background; + } + + #custom-gpu-temp, + #custom-clipboard { + margin: 0px 5px 0px 5px; + padding-left: 10px; + padding-right: 10px; + color: @foreground; + background-color: @background; + } + + #cpu { + margin: 0px 0px 0px 0px; + padding-left: 6px; + padding-right: 6px; + color: @foreground; + background-color: @background; + } + + #custom-cpuicon { + margin: 0px 0px 0px 0px; + padding: 0px 10px 0px 10px; + color: @color14; + background-color: @background; + } + + #custom-diskicon { + margin: 0px 0px 0px 0; + padding: 0 10px 0 10px; + color: @color2; + background-color: @background; + } + + #disk { + margin: 0px 0px 0px 0; + padding-left: 0px; + padding-right: 0px; + color: @foreground; + background-color: @background; + } + + #custom-notification { + background-color: @background; + color: @color15; + padding: 0 12px; + margin-right: 0px; + font-size: 14px; + font-family: "JetBrainsMono Nerd Font"; + } + + #custom-memoryicon { + margin: 0px 0px 0px 0px; + color: @color4; + padding: 0 11px 0 7px; + background-color: @background; + } + + #memory { + margin: 0px 0px 0px 0px; + padding-left: 5px; + padding-right: 10px; + color: @color4; + background-color: @background; + } + + #custom-tempicon { + margin: 0px 0px 0px 0px; + color: @color10; + padding: 0 11px 0 8px; + background-color: @background; + } + + #temperature { + margin: 0px 0px 0px 0px; + padding-left: 5px; + padding-right: 10px; + color: @color10; + background-color: @background; + } + + #custom-playerctl { + margin: 0px 5px 0px 5px; + padding-left: 10px; + padding-right: 10px; + color: @foreground; + background-color: @background; + } + + #battery, + #backlight, + #bluetooth, + #pulseaudio { + margin-top: 0px; + margin-bottom: 0px; + color: @foreground; + background-color: @background; + } + + #pulseaudio { + margin-top: 0px; + margin-bottom: 0px; + color: @color15; + background-color: @background; + } + + #battery, + #bluetooth { + margin-left: 0px; + margin-right: 0px; + padding-left: 0px; + padding-right: 2px; + } + + #backlight, + #pulseaudio { + margin-right: 0px; + margin-left: 0px; + padding-left: 10px; + padding-right: 7.5px; + } + + #clock { + margin: 0px 0px 0px 0px; + padding-left: 10px; + padding-right: 10px; + color: @color6; + background-color: @background; + } + + #custom-clockicon { + margin: 0px 0 0px 0px; + color: @color6; + padding: 0 5px 0 10px; + background-color: @background; + } + + #taskbar { + padding: 0 3px; + margin: 0 0px; + color: #ffffff; + background-color: rgba(120,118,117,0.3); + } + #taskbar button { + padding: 0 0 0 3px; + margin: 0px 0px; + color: #ffffff; + background-color: rgba(120,118,117,0.1); + } + #taskbar button.active { + background-color: rgba(120,118,117,0.8); + } + + #mode { + margin: 0px 5px 0px 5px; + padding-left: 10px; + padding-right: 10px; + background-color: @background; + color: @color9; + } + ''; + }; +} + diff --git a/modules/home/waybar/waybar-nekodyke.nix b/modules/home/waybar/waybar-nekodyke.nix new file mode 100755 index 0000000..c7a07dc --- /dev/null +++ b/modules/home/waybar/waybar-nekodyke.nix @@ -0,0 +1,306 @@ +{ + pkgs, + lib, + host, + config, + ... +}: let + betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; + inherit (import ../../../hosts/${host}/variables.nix) clock24h; +in + with lib; { + # Configure & Theme Waybar + programs.waybar = { + enable = true; + package = pkgs.waybar; + settings = [ + { + layer = "top"; + position = "top"; + margin-top = 6; + margin-left = 6; + margin-right = 6; + modules-center = ["hyprland/workspaces"]; + modules-left = [ + "custom/startmenu" + "cpu" + "memory" + "temperature" + "disk" + "hyprland/window" + "idle_inhibitor" + ]; + modules-right = [ + "pulseaudio" + "battery" + "custom/hyprbindings" + "custom/notification" + "clock" + "tray" + ]; + + "hyprland/workspaces" = { + format = "{name}"; + format-icons = { + default = " "; + active = " "; + urgent = " "; + }; + on-scroll-up = "hyprctl dispatch workspace e+1"; + on-scroll-down = "hyprctl dispatch workspace e-1"; + }; + "pulseaudio/slider" = { + min = 0; + max = 100; + orientation = "horizontal"; + }; + "temperature" = { + format = "๏‹‰ {temperatureC}ยฐC "; + }; + "clock" = { + format = + if clock24h == true + then ''๏€— {:L%H:%M}'' + else ''๏€— {:L%I:%M %p}''; + tooltip = true; + tooltip-format = "{:%A, %d.%B %Y }\n{calendar}"; + }; + "hyprland/window" = { + max-length = 22; + separate-outputs = false; + rewrite = { + "" = " ๐Ÿ™ˆ No Windows? "; + }; + }; + "memory" = { + interval = 5; + icon-size = 20; + format = "๎ฟ… {}%"; + tooltip = true; + }; + "cpu" = { + interval = 5; + format = "๏‹› {usage:2}%"; + tooltip = true; + }; + "disk" = { + format = "๓ฑ›Ÿ {free}"; + tooltip = true; + }; + "network" = { + format-icons = [ + "๓ฐคฏ" + "๓ฐคŸ" + "๓ฐคข" + "๓ฐคฅ" + "๓ฐคจ" + ]; + format-ethernet = "๏ฃ {bandwidthDownOctets}"; + format-wifi = "{icon} {signalStrength}%"; + format-disconnected = "๓ฐคฎ"; + tooltip = false; + }; + "tray" = { + spacing = 12; + }; + "pulseaudio" = { + format = "{icon} {volume}% {format_source}"; + format-bluetooth = "{volume}% {icon}๏Š” {format_source}"; + format-bluetooth-muted = "๏šฉ {icon}๏Š” {format_source}"; + format-muted = "๏šฉ {format_source}"; + format-source = "๏„ฐ {volume}%"; + format-source-muted = "๏„ฑ"; + format-icons = { + headphone = "๏€ฅ"; + hands-free = "๏–"; + headset = "๏–"; + phone = "๏‚•"; + portable = "๏‚•"; + car = "๏†น"; + default = [ + "๏€ฆ" + "๏€ง" + "๏€จ" + ]; + }; + on-click = "sleep 0.1 && pavucontrol"; + scroll-step = 2; + }; + "custom/exit" = { + tooltip = false; + format = "๏€‘"; + on-click = "sleep 0.1 && wlogout"; + }; + "custom/startmenu" = { + tooltip = false; + format = "๏Œ“"; + # exec = "rofi -show drun"; + #on-click = "sleep 0.1 && rofi-launcher"; + on-click = "sleep 0.1 && nwg-drawer -mb 200 -mt 200 -mr 200 -ml 200"; + }; + "custom/hyprbindings" = { + tooltip = false; + format = "๓ฑ•ด"; + on-click = "sleep 0.1 && list-keybinds"; + }; + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + activated = "๎ฉฐ"; + deactivated = "๎ซง"; + }; + tooltip = "true"; + }; + "custom/notification" = { + tooltip = false; + format = "{icon} {}"; + format-icons = { + notification = "๏ƒณ๏‘„"; + none = "๏ƒณ"; + dnd-notification = "๏‡ถ๏‘„"; + dnd-none = "๏‡ถ"; + inhibited-notification = "๏ƒณ๏‘„"; + inhibited-none = "๏ƒณ"; + dnd-inhibited-notification = "๏‡ถ๏‘„"; + dnd-inhibited-none = "๏‡ถ"; + }; + return-type = "json"; + exec-if = "which swaync-client"; + exec = "swaync-client -swb"; + on-click = "sleep 0.1 && task-waybar"; + escape = true; + }; + "battery" = { + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = "๓ฐ‚„ {capacity}%"; + format-plugged = "๓ฑ˜– {capacity}%"; + format-icons = [ + "๓ฐบ" + "๓ฐป" + "๓ฐผ" + "๓ฐฝ" + "๓ฐพ" + "๓ฐฟ" + "๓ฐ‚€" + "๓ฐ‚" + "๓ฐ‚‚" + "๓ฐน" + ]; + on-click = ""; + tooltip = false; + }; + } + ]; + style = concatStrings [ + '' + * { + font-family: JetBrainsMono Nerd Font Mono; + font-size: 18px; + border-radius: 0px; + border: none; + min-height: 0px; + margin: 0px; + } + window#waybar { + background: #${config.lib.stylix.colors.base00}; + padding: 2px; + border-radius: 4px; + } + #workspaces { + color: #${config.lib.stylix.colors.base00}; + background: #${config.lib.stylix.colors.base00}; + border: 2px solid #${config.lib.stylix.colors.base0B}; + margin: 2px 4px; + padding: 5px 5px; + border-radius: 4px; + } + #workspaces button { + font-weight: bold; + padding: 0px 5px; + margin: 0px 3px; + border-radius: 16px; + color: #${config.lib.stylix.colors.base0B}; + background: #${config.lib.stylix.colors.base00}; + + } + #workspaces button.active { + font-weight: bold; + padding: 0px 5px; + margin: 0px 3px; + border-radius: 4px; + color: #${config.lib.stylix.colors.base00}; + background: #${config.lib.stylix.colors.base0B}; + transition: ${betterTransition}; + opacity: 1.0; + min-width: 40px; + } + #workspaces button:hover { + font-weight: bold; + border-radius: 4px; + color: #${config.lib.stylix.colors.base00}; + background: #${config.lib.stylix.colors.base0B}; + opacity: 0.8; + } + tooltip { + background: #${config.lib.stylix.colors.base00}; + border: 1px solid #${config.lib.stylix.colors.base08}; + border-radius: 12px; + } + tooltip label { + color: #${config.lib.stylix.colors.base08}; + } + #window, #pulseaudio, #temperature, #cpu, #memory, #idle_inhibitor, #disk { + font-weight: bold; + margin: 2px 0px; + margin-right: 7px; + padding: 0px 18px; + background: #${config.lib.stylix.colors.base00}; + color: #${config.lib.stylix.colors.base0B}; + border: 2px solid #${config.lib.stylix.colors.base0B}; + border-radius: 4px; + } + #idle_inhibitor { + font-size: 28px; + } + #custom-startmenu { + color: #${config.lib.stylix.colors.base00}; + background: #${config.lib.stylix.colors.base0B}; + font-size: 22px; + padding: 0px 5px 0px 5px; + border-radius: 4px; + padding: 0px 8px; + margin: 0px; + margin-right:7px; + + } + #custom-hyprbindings, #network, #battery, + #custom-notification, #clock, #custom-exit { + /* font-weight: bold; */ + font-size: 20px; + background: #${config.lib.stylix.colors.base00}; + color: #${config.lib.stylix.colors.base0B}; + margin: 2px 0px; + margin-right: 7px; + border: 2px solid #${config.lib.stylix.colors.base0B}; + border-radius: 4px; + padding: 0px 12px; + } + #tray{ + font-weight: bold; + font-size: 16px; + margin: 0px; + background: #${config.lib.stylix.colors.base0B}; + color: #${config.lib.stylix.colors.base00}; + border: 2px solid #${config.lib.stylix.colors.base0B}; + padding: 0px 18px; + margin: 0px 0px; + border-radius: 4px; + } + '' + ]; + }; + } diff --git a/modules/home/wezterm.nix b/modules/home/wezterm.nix index ac1d207..ab274ff 100644 --- a/modules/home/wezterm.nix +++ b/modules/home/wezterm.nix @@ -1,11 +1,11 @@ {pkgs, ...}: { programs.wezterm = { - enable = false; + enable = true; package = pkgs.wezterm; }; home.file."./.config/wezterm/wezterm.lua".text = '' -- Config from Drew @justaguylinux small mods - + local wezterm = require("wezterm") local config = wezterm.config_builder() diff --git a/modules/home/yazi/default.nix b/modules/home/yazi/default.nix index fcda170..9364039 100644 --- a/modules/home/yazi/default.nix +++ b/modules/home/yazi/default.nix @@ -1,8 +1,30 @@ -_: { - home.file = { - ".config/yazi" = { - source = ../yazi; - recursive = true; +{pkgs, ...}: let + settings = import ./yazi.nix; + keymap = import ./keymap.nix; + theme = import ./theme.nix; +in { + programs.yazi = { + enable = true; + enableZshIntegration = true; + enableBashIntegration = true; + enableFishIntegration = true; + shellWrapperName = "yy"; + settings = settings; + keymap = keymap; + theme = theme; + plugins = { + lazygit = pkgs.yaziPlugins.lazygit; + full-border = pkgs.yaziPlugins.full-border; + git = pkgs.yaziPlugins.git; + smart-enter = pkgs.yaziPlugins.smart-enter; }; + + initLua = '' + require("full-border"):setup() + require("git"):setup() + require("smart-enter"):setup { + open_multi = true, + } + ''; }; } diff --git a/modules/home/yazi/init.lua b/modules/home/yazi/init.lua deleted file mode 100644 index 32f57b3..0000000 --- a/modules/home/yazi/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -require("full-border"):setup() -require("git"):setup() -require("smart-enter"):setup { - open_multi = true, -} diff --git a/modules/home/yazi/keymap.nix b/modules/home/yazi/keymap.nix new file mode 100644 index 0000000..c8e2561 --- /dev/null +++ b/modules/home/yazi/keymap.nix @@ -0,0 +1,1201 @@ +{ + mgr = { + keymap = [ + { + on = ""; + run = "escape"; + desc = "Exit visual mode, clear selected, or cancel search"; + } + { + on = ""; + run = "escape"; + desc = "Exit visual mode, clear selected, or cancel search"; + } + { + on = "q"; + run = "quit"; + desc = "Quit the process"; + } + { + on = "Q"; + run = "quit --no-cwd-file"; + desc = "Quit the process without outputting cwd-file"; + } + { + on = ""; + run = "close"; + desc = "Close the current tab, or quit if it's last"; + } + { + on = ""; + run = "suspend"; + desc = "Suspend the process"; + } + { + on = "k"; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = "j"; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -50%"; + desc = "Move cursor up half page"; + } + { + on = ""; + run = "arrow 50%"; + desc = "Move cursor down half page"; + } + { + on = ""; + run = "arrow -100%"; + desc = "Move cursor up one page"; + } + { + on = ""; + run = "arrow 100%"; + desc = "Move cursor down one page"; + } + { + on = ""; + run = "arrow -50%"; + desc = "Move cursor up half page"; + } + { + on = ""; + run = "arrow 50%"; + desc = "Move cursor down half page"; + } + { + on = ""; + run = "arrow -100%"; + desc = "Move cursor up one page"; + } + { + on = ""; + run = "arrow 100%"; + desc = "Move cursor down one page"; + } + { + on = ["g" "g"]; + run = "arrow top"; + desc = "Move cursor to the top"; + } + { + on = "G"; + run = "arrow bot"; + desc = "Move cursor to the bottom"; + } + { + on = "h"; + run = "leave"; + desc = "Go back to the parent directory"; + } + { + on = "l"; + run = "enter"; + desc = "Enter the child directory"; + } + { + on = ""; + run = "leave"; + desc = "Go back to the parent directory"; + } + { + on = ""; + run = "enter"; + desc = "Enter the child directory"; + } + { + on = "H"; + run = "back"; + desc = "Go back to the previous directory"; + } + { + on = "L"; + run = "forward"; + desc = "Go forward to the next directory"; + } + { + on = ""; + run = ["toggle" "arrow 1"]; + desc = "Toggle the current selection state"; + } + { + on = ""; + run = "toggle_all --state=on"; + desc = "Select all files"; + } + { + on = ""; + run = "toggle_all"; + desc = "Invert selection of all files"; + } + { + on = "v"; + run = "visual_mode"; + desc = "Enter visual mode (selection mode)"; + } + { + on = "V"; + run = "visual_mode --unset"; + desc = "Enter visual mode (unset mode)"; + } + { + on = "K"; + run = "seek -5"; + desc = "Seek up 5 units in the preview"; + } + { + on = "J"; + run = "seek 5"; + desc = "Seek down 5 units in the preview"; + } + { + on = ""; + run = "spot"; + desc = "Spot hovered file"; + } + { + on = "o"; + run = "open"; + desc = "Open selected files"; + } + { + on = "O"; + run = "open --interactive"; + desc = "Open selected files interactively"; + } + { + on = ""; + run = "open"; + desc = "Open selected files"; + } + { + on = ""; + run = "open --interactive"; + desc = "Open selected files interactively"; + } + { + on = "y"; + run = "yank"; + desc = "Yank selected files (copy)"; + } + { + on = "x"; + run = "yank --cut"; + desc = "Yank selected files (cut)"; + } + { + on = "p"; + run = "paste"; + desc = "Paste yanked files"; + } + { + on = "P"; + run = "paste --force"; + desc = "Paste yanked files (overwrite if the destination exists)"; + } + { + on = "-"; + run = "link"; + desc = "Symlink the absolute path of yanked files"; + } + { + on = "_"; + run = "link --relative"; + desc = "Symlink the relative path of yanked files"; + } + { + on = ""; + run = "hardlink"; + desc = "Hardlink yanked files"; + } + { + on = "Y"; + run = "unyank"; + desc = "Cancel the yank status"; + } + { + on = "X"; + run = "unyank"; + desc = "Cancel the yank status"; + } + { + on = "d"; + run = "remove"; + desc = "Trash selected files"; + } + { + on = "D"; + run = "remove --permanently"; + desc = "Permanently delete selected files"; + } + { + on = "a"; + run = "create"; + desc = "Create a file (ends with / for directories)"; + } + { + on = "r"; + run = "rename --cursor=before_ext"; + desc = "Rename selected file(s)"; + } + { + on = ";"; + run = "shell --interactive"; + desc = "Run a shell command"; + } + { + on = ":"; + run = "shell --block --interactive"; + desc = "Run a shell command (block until finishes)"; + } + { + on = "."; + run = "hidden toggle"; + desc = "Toggle the visibility of hidden files"; + } + { + on = "s"; + run = "search --via=fd"; + desc = "Search files by name via fd"; + } + { + on = "S"; + run = "search --via=rg"; + desc = "Search files by content via ripgrep"; + } + { + on = ""; + run = "escape --search"; + desc = "Cancel the ongoing search"; + } + { + on = "z"; + run = "plugin zoxide"; + desc = "Jump to a directory via zoxide"; + } + { + on = "Z"; + run = "plugin fzf"; + desc = "Jump to a file/directory via fzf"; + } + { + on = ["m" "s"]; + run = "linemode size"; + desc = "Linemode: size"; + } + { + on = ["m" "p"]; + run = "linemode permissions"; + desc = "Linemode: permissions"; + } + { + on = ["m" "b"]; + run = "linemode btime"; + desc = "Linemode: btime"; + } + { + on = ["m" "m"]; + run = "linemode mtime"; + desc = "Linemode: mtime"; + } + { + on = ["m" "o"]; + run = "linemode owner"; + desc = "Linemode: owner"; + } + { + on = ["m" "n"]; + run = "linemode none"; + desc = "Linemode: none"; + } + { + on = ["c" "c"]; + run = "copy path"; + desc = "Copy the file path"; + } + { + on = ["c" "d"]; + run = "copy dirname"; + desc = "Copy the directory path"; + } + { + on = ["c" "f"]; + run = "copy filename"; + desc = "Copy the filename"; + } + { + on = ["c" "n"]; + run = "copy name_without_ext"; + desc = "Copy the filename without extension"; + } + { + on = "f"; + run = "filter --smart"; + desc = "Filter files"; + } + { + on = "/"; + run = "find --smart"; + desc = "Find next file"; + } + { + on = "?"; + run = "find --previous --smart"; + desc = "Find previous file"; + } + { + on = "n"; + run = "find_arrow"; + desc = "Goto the next found"; + } + { + on = "N"; + run = "find_arrow --previous"; + desc = "Goto the previous found"; + } + { + on = ["," "m"]; + run = ["sort mtime --reverse=no" "linemode mtime"]; + desc = "Sort by modified time"; + } + { + on = ["," "M"]; + run = ["sort mtime --reverse" "linemode mtime"]; + desc = "Sort by modified time (reverse)"; + } + { + on = ["," "b"]; + run = ["sort btime --reverse=no" "linemode btime"]; + desc = "Sort by birth time"; + } + { + on = ["," "B"]; + run = ["sort btime --reverse" "linemode btime"]; + desc = "Sort by birth time (reverse)"; + } + { + on = ["," "e"]; + run = "sort extension --reverse=no"; + desc = "Sort by extension"; + } + { + on = ["," "E"]; + run = "sort extension --reverse"; + desc = "Sort by extension (reverse)"; + } + { + on = ["," "a"]; + run = "sort alphabetical --reverse=no"; + desc = "Sort alphabetically"; + } + { + on = ["," "A"]; + run = "sort alphabetical --reverse"; + desc = "Sort alphabetically (reverse)"; + } + { + on = ["," "n"]; + run = "sort natural --reverse=no"; + desc = "Sort naturally"; + } + { + on = ["," "N"]; + run = "sort natural --reverse"; + desc = "Sort naturally (reverse)"; + } + { + on = ["," "s"]; + run = ["sort size --reverse=no" "linemode size"]; + desc = "Sort by size"; + } + { + on = ["," "S"]; + run = ["sort size --reverse" "linemode size"]; + desc = "Sort by size (reverse)"; + } + { + on = ["," "r"]; + run = "sort random --reverse=no"; + desc = "Sort randomly"; + } + { + on = ["g" "h"]; + run = "cd ~"; + desc = "Go home"; + } + { + on = ["g" "c"]; + run = "cd ~/.config"; + desc = "Goto ~/.config"; + } + { + on = ["g" "d"]; + run = "cd ~/Downloads"; + desc = "Goto ~/Downloads"; + } + { + on = ["g" ""]; + run = "cd --interactive"; + desc = "Jump interactively"; + } + { + on = "t"; + run = "tab_create --current"; + desc = "Create a new tab with CWD"; + } + { + on = "1"; + run = "tab_switch 0"; + desc = "Switch to the first tab"; + } + { + on = "2"; + run = "tab_switch 1"; + desc = "Switch to the second tab"; + } + { + on = "3"; + run = "tab_switch 2"; + desc = "Switch to the third tab"; + } + { + on = "4"; + run = "tab_switch 3"; + desc = "Switch to the fourth tab"; + } + { + on = "5"; + run = "tab_switch 4"; + desc = "Switch to the fifth tab"; + } + { + on = "6"; + run = "tab_switch 5"; + desc = "Switch to the sixth tab"; + } + { + on = "7"; + run = "tab_switch 6"; + desc = "Switch to the seventh tab"; + } + { + on = "8"; + run = "tab_switch 7"; + desc = "Switch to the eighth tab"; + } + { + on = "9"; + run = "tab_switch 8"; + desc = "Switch to the ninth tab"; + } + { + on = "["; + run = "tab_switch -1 --relative"; + desc = "Switch to the previous tab"; + } + { + on = "]"; + run = "tab_switch 1 --relative"; + desc = "Switch to the next tab"; + } + { + on = "{"; + run = "tab_swap -1"; + desc = "Swap current tab with previous tab"; + } + { + on = "}"; + run = "tab_swap 1"; + desc = "Swap current tab with next tab"; + } + { + on = "w"; + run = "tasks_show"; + desc = "Show task manager"; + } + { + on = "~"; + run = "help"; + desc = "Open help"; + } + { + on = ""; + run = "help"; + desc = "Open help"; + } + ]; + prepend_keymap = [ + { + on = ["g" "i"]; + run = "plugin lazygit"; + desc = "run lazygit"; + } + { + on = "l"; + run = "plugin smart-enter"; + desc = "Enter the child directory, or open the file"; + } + ]; + }; + tasks = { + keymap = [ + { + on = ""; + run = "close"; + desc = "Close task manager"; + } + { + on = ""; + run = "close"; + desc = "Close task manager"; + } + { + on = ""; + run = "close"; + desc = "Close task manager"; + } + { + on = "w"; + run = "close"; + desc = "Close task manager"; + } + { + on = "k"; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = "j"; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "inspect"; + desc = "Inspect the task"; + } + { + on = "x"; + run = "cancel"; + desc = "Cancel the task"; + } + { + on = "~"; + run = "help"; + desc = "Open help"; + } + { + on = ""; + run = "help"; + desc = "Open help"; + } + ]; + }; + spot = { + keymap = [ + { + on = ""; + run = "close"; + desc = "Close the spot"; + } + { + on = ""; + run = "close"; + desc = "Close the spot"; + } + { + on = ""; + run = "close"; + desc = "Close the spot"; + } + { + on = ""; + run = "close"; + desc = "Close the spot"; + } + { + on = "k"; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = "j"; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = "h"; + run = "swipe -1"; + desc = "Swipe to the previous file"; + } + { + on = "l"; + run = "swipe 1"; + desc = "Swipe to the next file"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "swipe -1"; + desc = "Swipe to the next file"; + } + { + on = ""; + run = "swipe 1"; + desc = "Swipe to the previous file"; + } + { + on = ["c" "c"]; + run = "copy cell"; + desc = "Copy selected cell"; + } + { + on = "~"; + run = "help"; + desc = "Open help"; + } + { + on = ""; + run = "help"; + desc = "Open help"; + } + ]; + }; + pick = { + keymap = [ + { + on = ""; + run = "close"; + desc = "Cancel pick"; + } + { + on = ""; + run = "close"; + desc = "Cancel pick"; + } + { + on = ""; + run = "close"; + desc = "Cancel pick"; + } + { + on = ""; + run = "close --submit"; + desc = "Submit the pick"; + } + { + on = "k"; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = "j"; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = "~"; + run = "help"; + desc = "Open help"; + } + { + on = ""; + run = "help"; + desc = "Open help"; + } + ]; + }; + input = { + keymap = [ + { + on = ""; + run = "close"; + desc = "Cancel input"; + } + { + on = ""; + run = "close --submit"; + desc = "Submit input"; + } + { + on = ""; + run = "escape"; + desc = "Go back the normal mode, or cancel input"; + } + { + on = ""; + run = "escape"; + desc = "Go back the normal mode, or cancel input"; + } + { + on = "i"; + run = "insert"; + desc = "Enter insert mode"; + } + { + on = "I"; + run = ["move first-char" "insert"]; + desc = "Move to the BOL, and enter insert mode"; + } + { + on = "a"; + run = "insert --append"; + desc = "Enter append mode"; + } + { + on = "A"; + run = ["move eol" "insert --append"]; + desc = "Move to the EOL, and enter append mode"; + } + { + on = "v"; + run = "visual"; + desc = "Enter visual mode"; + } + { + on = "r"; + run = "replace"; + desc = "Replace a single character"; + } + { + on = "V"; + run = ["move bol" "visual" "move eol"]; + desc = "Select from BOL to EOL"; + } + { + on = ""; + run = ["move eol" "visual" "move bol"]; + desc = "Select from EOL to BOL"; + } + { + on = ""; + run = ["move bol" "visual" "move eol"]; + desc = "Select from BOL to EOL"; + } + { + on = "h"; + run = "move -1"; + desc = "Move back a character"; + } + { + on = "l"; + run = "move 1"; + desc = "Move forward a character"; + } + { + on = ""; + run = "move -1"; + desc = "Move back a character"; + } + { + on = ""; + run = "move 1"; + desc = "Move forward a character"; + } + { + on = ""; + run = "move -1"; + desc = "Move back a character"; + } + { + on = ""; + run = "move 1"; + desc = "Move forward a character"; + } + { + on = "b"; + run = "backward"; + desc = "Move back to the start of the current or previous word"; + } + { + on = "B"; + run = "backward --far"; + desc = "Move back to the start of the current or previous WORD"; + } + { + on = "w"; + run = "forward"; + desc = "Move forward to the start of the next word"; + } + { + on = "W"; + run = "forward --far"; + desc = "Move forward to the start of the next WORD"; + } + { + on = "e"; + run = "forward --end-of-word"; + desc = "Move forward to the end of the current or next word"; + } + { + on = "E"; + run = "forward --far --end-of-word"; + desc = "Move forward to the end of the current or next WORD"; + } + { + on = ""; + run = "backward"; + desc = "Move back to the start of the current or previous word"; + } + { + on = ""; + run = "forward --end-of-word"; + desc = "Move forward to the end of the current or next word"; + } + { + on = "0"; + run = "move bol"; + desc = "Move to the BOL"; + } + { + on = "$"; + run = "move eol"; + desc = "Move to the EOL"; + } + { + on = "_"; + run = "move first-char"; + desc = "Move to the first non-whitespace character"; + } + { + on = "^"; + run = "move first-char"; + desc = "Move to the first non-whitespace character"; + } + { + on = ""; + run = "move bol"; + desc = "Move to the BOL"; + } + { + on = ""; + run = "move eol"; + desc = "Move to the EOL"; + } + { + on = ""; + run = "move bol"; + desc = "Move to the BOL"; + } + { + on = ""; + run = "move eol"; + desc = "Move to the EOL"; + } + { + on = ""; + run = "backspace"; + desc = "Delete the character before the cursor"; + } + { + on = ""; + run = "backspace --under"; + desc = "Delete the character under the cursor"; + } + { + on = ""; + run = "backspace"; + desc = "Delete the character before the cursor"; + } + { + on = ""; + run = "backspace --under"; + desc = "Delete the character under the cursor"; + } + { + on = ""; + run = "kill bol"; + desc = "Kill backwards to the BOL"; + } + { + on = ""; + run = "kill eol"; + desc = "Kill forwards to the EOL"; + } + { + on = ""; + run = "kill backward"; + desc = "Kill backwards to the start of the current word"; + } + { + on = ""; + run = "kill forward"; + desc = "Kill forwards to the end of the current word"; + } + { + on = "d"; + run = "delete --cut"; + desc = "Cut the selected characters"; + } + { + on = "D"; + run = ["delete --cut" "move eol"]; + desc = "Cut until the EOL"; + } + { + on = "c"; + run = "delete --cut --insert"; + desc = "Cut the selected characters, and enter insert mode"; + } + { + on = "C"; + run = ["delete --cut --insert" "move eol"]; + desc = "Cut until the EOL, and enter insert mode"; + } + { + on = "x"; + run = ["delete --cut" "move 1 --in-operating"]; + desc = "Cut the current character"; + } + { + on = "y"; + run = "yank"; + desc = "Copy the selected characters"; + } + { + on = "p"; + run = "paste"; + desc = "Paste the copied characters after the cursor"; + } + { + on = "P"; + run = "paste --before"; + desc = "Paste the copied characters before the cursor"; + } + { + on = "u"; + run = "undo"; + desc = "Undo the last operation"; + } + { + on = ""; + run = "redo"; + desc = "Redo the last operation"; + } + { + on = "~"; + run = "help"; + desc = "Open help"; + } + { + on = ""; + run = "help"; + desc = "Open help"; + } + ]; + }; + confirm = { + keymap = [ + { + on = ""; + run = "close"; + desc = "Cancel the confirm"; + } + { + on = ""; + run = "close"; + desc = "Cancel the confirm"; + } + { + on = ""; + run = "close"; + desc = "Cancel the confirm"; + } + { + on = ""; + run = "close --submit"; + desc = "Submit the confirm"; + } + { + on = "n"; + run = "close"; + desc = "Cancel the confirm"; + } + { + on = "y"; + run = "close --submit"; + desc = "Submit the confirm"; + } + { + on = "k"; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = "j"; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = "~"; + run = "help"; + desc = "Open help"; + } + { + on = ""; + run = "help"; + desc = "Open help"; + } + ]; + }; + cmp = { + keymap = [ + { + on = ""; + run = "close"; + desc = "Cancel completion"; + } + { + on = ""; + run = "close --submit"; + desc = "Submit the completion"; + } + { + on = ""; + run = ["close --submit" "close_input --submit"]; + desc = "Submit the completion and input"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = "~"; + run = "help"; + desc = "Open help"; + } + { + on = ""; + run = "help"; + desc = "Open help"; + } + ]; + }; + help = { + keymap = [ + { + on = ""; + run = "escape"; + desc = "Clear the filter, or hide the help"; + } + { + on = ""; + run = "escape"; + desc = "Clear the filter, or hide the help"; + } + { + on = ""; + run = "close"; + desc = "Hide the help"; + } + { + on = "k"; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = "j"; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = ""; + run = "arrow -1"; + desc = "Move cursor up"; + } + { + on = ""; + run = "arrow 1"; + desc = "Move cursor down"; + } + { + on = "f"; + run = "filter"; + desc = "Apply a filter for the help items"; + } + ]; + }; +} diff --git a/modules/home/yazi/keymap.toml b/modules/home/yazi/keymap.toml deleted file mode 100644 index 5cab10d..0000000 --- a/modules/home/yazi/keymap.toml +++ /dev/null @@ -1,376 +0,0 @@ -# A TOML linter such as https://taplo.tamasfe.dev/ can use this schema to validate your config. -# If you encounter any issues, please make an issue at https://github.com/yazi-rs/schemas. -"$schema" = "https://yazi-rs.github.io/schemas/keymap.json" - -[manager] - -keymap = [ - { on = "", run = "escape", desc = "Exit visual mode, clear selected, or cancel search" }, - { on = "", run = "escape", desc = "Exit visual mode, clear selected, or cancel search" }, - { on = "q", run = "quit", desc = "Quit the process" }, - { on = "Q", run = "quit --no-cwd-file", desc = "Quit the process without outputting cwd-file" }, - { on = "", run = "close", desc = "Close the current tab, or quit if it's last" }, - { on = "", run = "suspend", desc = "Suspend the process" }, - - # Hopping - { on = "k", run = "arrow -1", desc = "Move cursor up" }, - { on = "j", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -50%", desc = "Move cursor up half page" }, - { on = "", run = "arrow 50%", desc = "Move cursor down half page" }, - { on = "", run = "arrow -100%", desc = "Move cursor up one page" }, - { on = "", run = "arrow 100%", desc = "Move cursor down one page" }, - - { on = "", run = "arrow -50%", desc = "Move cursor up half page" }, - { on = "", run = "arrow 50%", desc = "Move cursor down half page" }, - { on = "", run = "arrow -100%", desc = "Move cursor up one page" }, - { on = "", run = "arrow 100%", desc = "Move cursor down one page" }, - - { on = [ "g", "g" ], run = "arrow top", desc = "Move cursor to the top" }, - { on = "G", run = "arrow bot", desc = "Move cursor to the bottom" }, - - # Navigation - { on = "h", run = "leave", desc = "Go back to the parent directory" }, - { on = "l", run = "enter", desc = "Enter the child directory" }, - - { on = "", run = "leave", desc = "Go back to the parent directory" }, - { on = "", run = "enter", desc = "Enter the child directory" }, - - { on = "H", run = "back", desc = "Go back to the previous directory" }, - { on = "L", run = "forward", desc = "Go forward to the next directory" }, - - # Toggle - { on = "", run = [ "toggle", "arrow 1" ], desc = "Toggle the current selection state" }, - { on = "", run = "toggle_all --state=on", desc = "Select all files" }, - { on = "", run = "toggle_all", desc = "Invert selection of all files" }, - - # Visual mode - { on = "v", run = "visual_mode", desc = "Enter visual mode (selection mode)" }, - { on = "V", run = "visual_mode --unset", desc = "Enter visual mode (unset mode)" }, - - # Seeking - { on = "K", run = "seek -5", desc = "Seek up 5 units in the preview" }, - { on = "J", run = "seek 5", desc = "Seek down 5 units in the preview" }, - - # Spotting - { on = "", run = "spot", desc = "Spot hovered file" }, - - # Operation - { on = "o", run = "open", desc = "Open selected files" }, - { on = "O", run = "open --interactive", desc = "Open selected files interactively" }, - { on = "", run = "open", desc = "Open selected files" }, - { on = "", run = "open --interactive", desc = "Open selected files interactively" }, - { on = "y", run = "yank", desc = "Yank selected files (copy)" }, - { on = "x", run = "yank --cut", desc = "Yank selected files (cut)" }, - { on = "p", run = "paste", desc = "Paste yanked files" }, - { on = "P", run = "paste --force", desc = "Paste yanked files (overwrite if the destination exists)" }, - { on = "-", run = "link", desc = "Symlink the absolute path of yanked files" }, - { on = "_", run = "link --relative", desc = "Symlink the relative path of yanked files" }, - { on = "", run = "hardlink", desc = "Hardlink yanked files" }, - { on = "Y", run = "unyank", desc = "Cancel the yank status" }, - { on = "X", run = "unyank", desc = "Cancel the yank status" }, - { on = "d", run = "remove", desc = "Trash selected files" }, - { on = "D", run = "remove --permanently", desc = "Permanently delete selected files" }, - { on = "a", run = "create", desc = "Create a file (ends with / for directories)" }, - { on = "r", run = "rename --cursor=before_ext", desc = "Rename selected file(s)" }, - { on = ";", run = "shell --interactive", desc = "Run a shell command" }, - { on = ":", run = "shell --block --interactive", desc = "Run a shell command (block until finishes)" }, - { on = ".", run = "hidden toggle", desc = "Toggle the visibility of hidden files" }, - { on = "s", run = "search --via=fd", desc = "Search files by name via fd" }, - { on = "S", run = "search --via=rg", desc = "Search files by content via ripgrep" }, - { on = "", run = "escape --search", desc = "Cancel the ongoing search" }, - { on = "z", run = "plugin zoxide", desc = "Jump to a directory via zoxide" }, - { on = "Z", run = "plugin fzf", desc = "Jump to a file/directory via fzf" }, - - # Linemode - { on = [ "m", "s" ], run = "linemode size", desc = "Linemode: size" }, - { on = [ "m", "p" ], run = "linemode permissions", desc = "Linemode: permissions" }, - { on = [ "m", "b" ], run = "linemode btime", desc = "Linemode: btime" }, - { on = [ "m", "m" ], run = "linemode mtime", desc = "Linemode: mtime" }, - { on = [ "m", "o" ], run = "linemode owner", desc = "Linemode: owner" }, - { on = [ "m", "n" ], run = "linemode none", desc = "Linemode: none" }, - - # Copy - { on = [ "c", "c" ], run = "copy path", desc = "Copy the file path" }, - { on = [ "c", "d" ], run = "copy dirname", desc = "Copy the directory path" }, - { on = [ "c", "f" ], run = "copy filename", desc = "Copy the filename" }, - { on = [ "c", "n" ], run = "copy name_without_ext", desc = "Copy the filename without extension" }, - - # Filter - { on = "f", run = "filter --smart", desc = "Filter files" }, - - # Find - { on = "/", run = "find --smart", desc = "Find next file" }, - { on = "?", run = "find --previous --smart", desc = "Find previous file" }, - { on = "n", run = "find_arrow", desc = "Goto the next found" }, - { on = "N", run = "find_arrow --previous", desc = "Goto the previous found" }, - - # Sorting - { on = [ ",", "m" ], run = [ "sort mtime --reverse=no", "linemode mtime" ], desc = "Sort by modified time" }, - { on = [ ",", "M" ], run = [ "sort mtime --reverse", "linemode mtime" ], desc = "Sort by modified time (reverse)" }, - { on = [ ",", "b" ], run = [ "sort btime --reverse=no", "linemode btime" ], desc = "Sort by birth time" }, - { on = [ ",", "B" ], run = [ "sort btime --reverse", "linemode btime" ], desc = "Sort by birth time (reverse)" }, - { on = [ ",", "e" ], run = "sort extension --reverse=no", desc = "Sort by extension" }, - { on = [ ",", "E" ], run = "sort extension --reverse", desc = "Sort by extension (reverse)" }, - { on = [ ",", "a" ], run = "sort alphabetical --reverse=no", desc = "Sort alphabetically" }, - { on = [ ",", "A" ], run = "sort alphabetical --reverse", desc = "Sort alphabetically (reverse)" }, - { on = [ ",", "n" ], run = "sort natural --reverse=no", desc = "Sort naturally" }, - { on = [ ",", "N" ], run = "sort natural --reverse", desc = "Sort naturally (reverse)" }, - { on = [ ",", "s" ], run = [ "sort size --reverse=no", "linemode size" ], desc = "Sort by size" }, - { on = [ ",", "S" ], run = [ "sort size --reverse", "linemode size" ], desc = "Sort by size (reverse)" }, - { on = [ ",", "r" ], run = "sort random --reverse=no", desc = "Sort randomly" }, - - # Goto - { on = [ "g", "h" ], run = "cd ~", desc = "Go home" }, - { on = [ "g", "c" ], run = "cd ~/.config", desc = "Goto ~/.config" }, - { on = [ "g", "d" ], run = "cd ~/Downloads", desc = "Goto ~/Downloads" }, - { on = [ "g", "" ], run = "cd --interactive", desc = "Jump interactively" }, - - # Tabs - { on = "t", run = "tab_create --current", desc = "Create a new tab with CWD" }, - - { on = "1", run = "tab_switch 0", desc = "Switch to the first tab" }, - { on = "2", run = "tab_switch 1", desc = "Switch to the second tab" }, - { on = "3", run = "tab_switch 2", desc = "Switch to the third tab" }, - { on = "4", run = "tab_switch 3", desc = "Switch to the fourth tab" }, - { on = "5", run = "tab_switch 4", desc = "Switch to the fifth tab" }, - { on = "6", run = "tab_switch 5", desc = "Switch to the sixth tab" }, - { on = "7", run = "tab_switch 6", desc = "Switch to the seventh tab" }, - { on = "8", run = "tab_switch 7", desc = "Switch to the eighth tab" }, - { on = "9", run = "tab_switch 8", desc = "Switch to the ninth tab" }, - - { on = "[", run = "tab_switch -1 --relative", desc = "Switch to the previous tab" }, - { on = "]", run = "tab_switch 1 --relative", desc = "Switch to the next tab" }, - - { on = "{", run = "tab_swap -1", desc = "Swap current tab with previous tab" }, - { on = "}", run = "tab_swap 1", desc = "Swap current tab with next tab" }, - - # Tasks - { on = "w", run = "tasks_show", desc = "Show task manager" }, - - # Help - { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, -] - -[tasks] - -keymap = [ - { on = "", run = "close", desc = "Close task manager" }, - { on = "", run = "close", desc = "Close task manager" }, - { on = "", run = "close", desc = "Close task manager" }, - { on = "w", run = "close", desc = "Close task manager" }, - - { on = "k", run = "arrow -1", desc = "Move cursor up" }, - { on = "j", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "inspect", desc = "Inspect the task" }, - { on = "x", run = "cancel", desc = "Cancel the task" }, - - # Help - { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, -] - -[spot] - -keymap = [ - { on = "", run = "close", desc = "Close the spot" }, - { on = "", run = "close", desc = "Close the spot" }, - { on = "", run = "close", desc = "Close the spot" }, - { on = "", run = "close", desc = "Close the spot" }, - - { on = "k", run = "arrow -1", desc = "Move cursor up" }, - { on = "j", run = "arrow 1", desc = "Move cursor down" }, - { on = "h", run = "swipe -1", desc = "Swipe to the previous file" }, - { on = "l", run = "swipe 1", desc = "Swipe to the next file" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - { on = "", run = "swipe -1", desc = "Swipe to the next file" }, - { on = "", run = "swipe 1", desc = "Swipe to the previous file" }, - - # Copy - { on = [ "c", "c" ], run = "copy cell", desc = "Copy selected cell" }, - - # Help - { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, -] - -[pick] - -keymap = [ - { on = "", run = "close", desc = "Cancel pick" }, - { on = "", run = "close", desc = "Cancel pick" }, - { on = "", run = "close", desc = "Cancel pick" }, - { on = "", run = "close --submit", desc = "Submit the pick" }, - - { on = "k", run = "arrow -1", desc = "Move cursor up" }, - { on = "j", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - # Help - { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, -] - -[input] - -keymap = [ - { on = "", run = "close", desc = "Cancel input" }, - { on = "", run = "close --submit", desc = "Submit input" }, - { on = "", run = "escape", desc = "Go back the normal mode, or cancel input" }, - { on = "", run = "escape", desc = "Go back the normal mode, or cancel input" }, - - # Mode - { on = "i", run = "insert", desc = "Enter insert mode" }, - { on = "I", run = [ "move first-char", "insert" ], desc = "Move to the BOL, and enter insert mode" }, - { on = "a", run = "insert --append", desc = "Enter append mode" }, - { on = "A", run = [ "move eol", "insert --append" ], desc = "Move to the EOL, and enter append mode" }, - { on = "v", run = "visual", desc = "Enter visual mode" }, - { on = "r", run = "replace", desc = "Replace a single character" }, - - # Selection - { on = "V", run = [ "move bol", "visual", "move eol" ], desc = "Select from BOL to EOL" }, - { on = "", run = [ "move eol", "visual", "move bol" ], desc = "Select from EOL to BOL" }, - { on = "", run = [ "move bol", "visual", "move eol" ], desc = "Select from BOL to EOL" }, - - # Character-wise movement - { on = "h", run = "move -1", desc = "Move back a character" }, - { on = "l", run = "move 1", desc = "Move forward a character" }, - { on = "", run = "move -1", desc = "Move back a character" }, - { on = "", run = "move 1", desc = "Move forward a character" }, - { on = "", run = "move -1", desc = "Move back a character" }, - { on = "", run = "move 1", desc = "Move forward a character" }, - - # Word-wise movement - { on = "b", run = "backward", desc = "Move back to the start of the current or previous word" }, - { on = "B", run = "backward --far", desc = "Move back to the start of the current or previous WORD" }, - { on = "w", run = "forward", desc = "Move forward to the start of the next word" }, - { on = "W", run = "forward --far", desc = "Move forward to the start of the next WORD" }, - { on = "e", run = "forward --end-of-word", desc = "Move forward to the end of the current or next word" }, - { on = "E", run = "forward --far --end-of-word", desc = "Move forward to the end of the current or next WORD" }, - { on = "", run = "backward", desc = "Move back to the start of the current or previous word" }, - { on = "", run = "forward --end-of-word", desc = "Move forward to the end of the current or next word" }, - - # Line-wise movement - { on = "0", run = "move bol", desc = "Move to the BOL" }, - { on = "$", run = "move eol", desc = "Move to the EOL" }, - { on = "_", run = "move first-char", desc = "Move to the first non-whitespace character" }, - { on = "^", run = "move first-char", desc = "Move to the first non-whitespace character" }, - { on = "", run = "move bol", desc = "Move to the BOL" }, - { on = "", run = "move eol", desc = "Move to the EOL" }, - { on = "", run = "move bol", desc = "Move to the BOL" }, - { on = "", run = "move eol", desc = "Move to the EOL" }, - - # Delete - { on = "", run = "backspace", desc = "Delete the character before the cursor" }, - { on = "", run = "backspace --under", desc = "Delete the character under the cursor" }, - { on = "", run = "backspace", desc = "Delete the character before the cursor" }, - { on = "", run = "backspace --under", desc = "Delete the character under the cursor" }, - - # Kill - { on = "", run = "kill bol", desc = "Kill backwards to the BOL" }, - { on = "", run = "kill eol", desc = "Kill forwards to the EOL" }, - { on = "", run = "kill backward", desc = "Kill backwards to the start of the current word" }, - { on = "", run = "kill forward", desc = "Kill forwards to the end of the current word" }, - - # Cut/Yank/Paste - { on = "d", run = "delete --cut", desc = "Cut the selected characters" }, - { on = "D", run = [ "delete --cut", "move eol" ], desc = "Cut until the EOL" }, - { on = "c", run = "delete --cut --insert", desc = "Cut the selected characters, and enter insert mode" }, - { on = "C", run = [ "delete --cut --insert", "move eol" ], desc = "Cut until the EOL, and enter insert mode" }, - { on = "x", run = [ "delete --cut", "move 1 --in-operating" ], desc = "Cut the current character" }, - { on = "y", run = "yank", desc = "Copy the selected characters" }, - { on = "p", run = "paste", desc = "Paste the copied characters after the cursor" }, - { on = "P", run = "paste --before", desc = "Paste the copied characters before the cursor" }, - - # Undo/Redo - { on = "u", run = "undo", desc = "Undo the last operation" }, - { on = "", run = "redo", desc = "Redo the last operation" }, - - # Help - { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, -] - -[confirm] - -keymap = [ - { on = "", run = "close", desc = "Cancel the confirm" }, - { on = "", run = "close", desc = "Cancel the confirm" }, - { on = "", run = "close", desc = "Cancel the confirm" }, - { on = "", run = "close --submit", desc = "Submit the confirm" }, - - { on = "n", run = "close", desc = "Cancel the confirm" }, - { on = "y", run = "close --submit", desc = "Submit the confirm" }, - - { on = "k", run = "arrow -1", desc = "Move cursor up" }, - { on = "j", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - # Help - { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, -] - -[cmp] - -keymap = [ - { on = "", run = "close", desc = "Cancel completion" }, - { on = "", run = "close --submit", desc = "Submit the completion" }, - { on = "", run = [ "close --submit", "close_input --submit" ], desc = "Submit the completion and input" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - # Help - { on = "~", run = "help", desc = "Open help" }, - { on = "", run = "help", desc = "Open help" }, -] - -[help] - -keymap = [ - { on = "", run = "escape", desc = "Clear the filter, or hide the help" }, - { on = "", run = "escape", desc = "Clear the filter, or hide the help" }, - { on = "", run = "close", desc = "Hide the help" }, - - # Navigation - { on = "k", run = "arrow -1", desc = "Move cursor up" }, - { on = "j", run = "arrow 1", desc = "Move cursor down" }, - - { on = "", run = "arrow -1", desc = "Move cursor up" }, - { on = "", run = "arrow 1", desc = "Move cursor down" }, - - # Filtering - { on = "f", run = "filter", desc = "Apply a filter for the help items" }, -] - -[[manager.prepend_keymap]] -on = [ "g", "i" ] -run = "plugin lazygit" -desc = "run lazygit" - - -[[manager.prepend_keymap]] -on = "l" -run = "plugin smart-enter" -desc = "Enter the child directory, or open the file" diff --git a/modules/home/yazi/package.toml b/modules/home/yazi/package.toml deleted file mode 100644 index 67c8a96..0000000 --- a/modules/home/yazi/package.toml +++ /dev/null @@ -1,22 +0,0 @@ -[[plugin.deps]] -use = "yazi-rs/plugins:full-border" -rev = "a1b678d" -hash = "9dce00232a0e0e2502565c7aa2b0ed4e" - -[[plugin.deps]] -use = "Lil-Dank/lazygit" -rev = "9f924e3" -hash = "2b0c33928986f126d5c5a4cac31a6b46" - -[[plugin.deps]] -use = "yazi-rs/plugins:smart-enter" -rev = "a1b678d" -hash = "7918aab6a71caf31b58411f789195677" - -[[plugin.deps]] -use = "yazi-rs/plugins:git" -rev = "a1b678d" -hash = "bcbf72738d4b7fb9a03cac84465b9ba4" - -[flavor] -deps = [] diff --git a/modules/home/yazi/plugins/full-border.yazi/LICENSE b/modules/home/yazi/plugins/full-border.yazi/LICENSE deleted file mode 100644 index fb5b1d6..0000000 --- a/modules/home/yazi/plugins/full-border.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/yazi/plugins/full-border.yazi/README.md b/modules/home/yazi/plugins/full-border.yazi/README.md deleted file mode 100644 index 6e78bd4..0000000 --- a/modules/home/yazi/plugins/full-border.yazi/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# full-border.yazi - -Add a full border to Yazi to make it look fancier. - -![full-border](https://github.com/yazi-rs/plugins/assets/17523360/ef81b560-2465-4d36-abf2-5d21dcb7b987) - -## Installation - -```sh -ya pack -a yazi-rs/plugins:full-border -``` - -## Usage - -Add this to your `init.lua` to enable the plugin: - -```lua -require("full-border"):setup() -``` - -Or you can customize the border type: - -```lua -require("full-border"):setup { - -- Available values: ui.Border.PLAIN, ui.Border.ROUNDED - type = ui.Border.ROUNDED, -} -``` - -## License - -This plugin is MIT-licensed. For more information check the [LICENSE](LICENSE) file. diff --git a/modules/home/yazi/plugins/full-border.yazi/main.lua b/modules/home/yazi/plugins/full-border.yazi/main.lua deleted file mode 100644 index 5ed18f9..0000000 --- a/modules/home/yazi/plugins/full-border.yazi/main.lua +++ /dev/null @@ -1,43 +0,0 @@ ---- @since 25.2.26 - -local function setup(_, opts) - local type = opts and opts.type or ui.Border.ROUNDED - local old_build = Tab.build - - Tab.build = function(self, ...) - local bar = function(c, x, y) - if x <= 0 or x == self._area.w - 1 then - return ui.Bar(ui.Bar.TOP) - end - - return ui.Bar(ui.Bar.TOP) - :area( - ui.Rect { x = x, y = math.max(0, y), w = ya.clamp(0, self._area.w - x, 1), h = math.min(1, self._area.h) } - ) - :symbol(c) - end - - local c = self._chunks - self._chunks = { - c[1]:pad(ui.Pad.y(1)), - c[2]:pad(ui.Pad(1, c[3].w > 0 and 0 or 1, 1, c[1].w > 0 and 0 or 1)), - c[3]:pad(ui.Pad.y(1)), - } - - local style = th.mgr.border_style - self._base = ya.list_merge(self._base or {}, { - ui.Border(ui.Border.ALL):area(self._area):type(type):style(style), - ui.Bar(ui.Bar.RIGHT):area(self._chunks[1]):style(style), - ui.Bar(ui.Bar.LEFT):area(self._chunks[3]):style(style), - - bar("โ”ฌ", c[1].right - 1, c[1].y), - bar("โ”ด", c[1].right - 1, c[1].bottom - 1), - bar("โ”ฌ", c[2].right, c[2].y), - bar("โ”ด", c[2].right, c[2].bottom - 1), - }) - - old_build(self, ...) - end -end - -return { setup = setup } diff --git a/modules/home/yazi/plugins/git.yazi/LICENSE b/modules/home/yazi/plugins/git.yazi/LICENSE deleted file mode 100644 index fb5b1d6..0000000 --- a/modules/home/yazi/plugins/git.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/yazi/plugins/git.yazi/README.md b/modules/home/yazi/plugins/git.yazi/README.md deleted file mode 100644 index 1054230..0000000 --- a/modules/home/yazi/plugins/git.yazi/README.md +++ /dev/null @@ -1,78 +0,0 @@ -# git.yazi - -> [!NOTE] -> Yazi v25.2.7 or later is required for this plugin to work. - -Show the status of Git file changes as linemode in the file list. - -https://github.com/user-attachments/assets/34976be9-a871-4ffe-9d5a-c4cdd0bf4576 - -## Installation - -```sh -ya pack -a yazi-rs/plugins:git -``` - -## Setup - -Add the following to your `~/.config/yazi/init.lua`: - -```lua -require("git"):setup() -``` - -And register it as fetchers in your `~/.config/yazi/yazi.toml`: - -```toml -[[plugin.prepend_fetchers]] -id = "git" -name = "*" -run = "git" - -[[plugin.prepend_fetchers]] -id = "git" -name = "*/" -run = "git" -``` - -## Advanced - -You can customize the [Style](https://yazi-rs.github.io/docs/plugins/layout#style) of the status sign with: - -- `THEME.git.modified` -- `THEME.git.added` -- `THEME.git.untracked` -- `THEME.git.ignored` -- `THEME.git.deleted` -- `THEME.git.updated` - -For example: - -```lua --- ~/.config/yazi/init.lua -THEME.git = THEME.git or {} -THEME.git.modified = ui.Style():fg("blue") -THEME.git.deleted = ui.Style():fg("red"):bold() -``` - -You can also customize the text of the status sign with: - -- `THEME.git.modified_sign` -- `THEME.git.added_sign` -- `THEME.git.untracked_sign` -- `THEME.git.ignored_sign` -- `THEME.git.deleted_sign` -- `THEME.git.updated_sign` - -For example: - -```lua --- ~/.config/yazi/init.lua -THEME.git = THEME.git or {} -THEME.git.modified_sign = "M" -THEME.git.deleted_sign = "D" -``` - -## License - -This plugin is MIT-licensed. For more information check the [LICENSE](LICENSE) file. diff --git a/modules/home/yazi/plugins/git.yazi/main.lua b/modules/home/yazi/plugins/git.yazi/main.lua deleted file mode 100644 index 2010263..0000000 --- a/modules/home/yazi/plugins/git.yazi/main.lua +++ /dev/null @@ -1,219 +0,0 @@ ---- @since 25.2.7 - -local WINDOWS = ya.target_family() == "windows" -local CODES = { - modified = 6, - added = 5, - untracked = 4, - ignored = 3, -- ignored file - excluded = 30, -- ignored directory - deleted = 2, - updated = 1, - unknown = 0, -} -local PATTERNS = { - { "[MT]", CODES.modified }, - { "[AC]", CODES.added }, - { "?$", CODES.untracked }, - { "!$", CODES.ignored }, - { "D", CODES.deleted }, - { "U", CODES.updated }, - { "[AD][AD]", CODES.updated }, -} - -local function match(line) - local signs = line:sub(1, 2) - for _, p in ipairs(PATTERNS) do - local path - if signs:find(p[1]) then - path = line:sub(4, 4) == '"' and line:sub(5, -2) or line:sub(4) - path = WINDOWS and path:gsub("/", "\\") or path - end - if not path then - elseif path:find("[/\\]$") then - return p[2] == CODES.ignored and CODES.excluded or p[2], path:sub(1, -2) - else - return p[2], path - end - end -end - -local function root(cwd) - local is_worktree = function(url) - local file, head = io.open(tostring(url)), nil - if file then - head = file:read(8) - file:close() - end - return head == "gitdir: " - end - - repeat - local next = cwd:join(".git") - local cha = fs.cha(next) - if cha and (cha.is_dir or is_worktree(next)) then - return tostring(cwd) - end - cwd = cwd:parent() - until not cwd -end - -local function bubble_up(changed) - local new, empty = {}, Url("") - for k, v in pairs(changed) do - if v ~= CODES.ignored and v ~= CODES.excluded then - local url = Url(k):parent() - while url and url ~= empty do - local s = tostring(url) - new[s] = (new[s] or CODES.unknown) > v and new[s] or v - url = url:parent() - end - end - end - return new -end - -local function propagate_down(ignored, cwd, repo) - local new, rel = {}, cwd:strip_prefix(repo) - for k, v in pairs(ignored) do - if v == CODES.excluded then - if rel:starts_with(k) then - new[tostring(repo:join(rel))] = CODES.excluded - elseif cwd == repo:join(k):parent() then - new[k] = CODES.ignored - end - end - end - return new -end - -local add = ya.sync(function(st, cwd, repo, changed) - st.dirs[cwd] = repo - st.repos[repo] = st.repos[repo] or {} - for k, v in pairs(changed) do - if v == CODES.unknown then - st.repos[repo][k] = nil - elseif v == CODES.excluded then - st.dirs[k] = "" - else - st.repos[repo][k] = v - end - end - ya.render() -end) - -local remove = ya.sync(function(st, cwd) - local dir = st.dirs[cwd] - if not dir then - return - end - - ya.render() - st.dirs[cwd] = nil - if not st.repos[dir] then - return - end - - for _, r in pairs(st.dirs) do - if r == dir then - return - end - end - st.repos[dir] = nil -end) - -local function setup(st, opts) - st.dirs = {} - st.repos = {} - - opts = opts or {} - opts.order = opts.order or 1500 - - -- Chosen by ChatGPT fairly, PRs are welcome to adjust them - local t = THEME.git or {} - local styles = { - [CODES.modified] = t.modified and ui.Style(t.modified) or ui.Style():fg("#ffa500"), - [CODES.added] = t.added and ui.Style(t.added) or ui.Style():fg("#32cd32"), - [CODES.untracked] = t.untracked and ui.Style(t.untracked) or ui.Style():fg("#a9a9a9"), - [CODES.ignored] = t.ignored and ui.Style(t.ignored) or ui.Style():fg("#696969"), - [CODES.deleted] = t.deleted and ui.Style(t.deleted) or ui.Style():fg("#ff4500"), - [CODES.updated] = t.updated and ui.Style(t.updated) or ui.Style():fg("#1e90ff"), - } - local signs = { - [CODES.modified] = t.modified_sign or "๏…‹", - [CODES.added] = t.added_sign or "๏ƒพ", - [CODES.untracked] = t.untracked_sign or "๏„จ", - [CODES.ignored] = t.ignored_sign or "๎™จ", - [CODES.deleted] = t.deleted_sign or "๏…†", - [CODES.updated] = t.updated_sign or "U", - } - - Linemode:children_add(function(self) - local url = self._file.url - local dir = st.dirs[tostring(url:parent())] - local change - if dir then - change = dir == "" and CODES.ignored or st.repos[dir][tostring(url):sub(#dir + 2)] - end - - if not change or signs[change] == "" then - return "" - elseif self._file:is_hovered() then - return ui.Line { " ", signs[change] } - else - return ui.Line { " ", ui.Span(signs[change]):style(styles[change]) } - end - end, opts.order) -end - -local function fetch(_, job) - local cwd = job.files[1].url:parent() - local repo = root(cwd) - if not repo then - remove(tostring(cwd)) - return true - end - - local paths = {} - for _, f in ipairs(job.files) do - paths[#paths + 1] = tostring(f.url) - end - - -- stylua: ignore - local output, err = Command("git") - :cwd(tostring(cwd)) - :args({ "--no-optional-locks", "-c", "core.quotePath=", "status", "--porcelain", "-unormal", "--no-renames", "--ignored=matching" }) - :args(paths) - :stdout(Command.PIPED) - :output() - if not output then - return true, Err("Cannot spawn `git` command, error: %s", err) - end - - local changed, ignored = {}, {} - for line in output.stdout:gmatch("[^\r\n]+") do - local sign, path = match(line) - if sign == CODES.excluded then - ignored[path] = sign - else - changed[path] = sign - end - end - - if job.files[1].cha.is_dir then - ya.dict_merge(changed, bubble_up(changed)) - ya.dict_merge(changed, propagate_down(ignored, cwd, Url(repo))) - else - ya.dict_merge(changed, propagate_down(ignored, cwd, Url(repo))) - end - - for _, p in ipairs(paths) do - local s = p:sub(#repo + 2) - changed[s] = changed[s] or CODES.unknown - end - add(tostring(cwd), repo, changed) - - return false -end - -return { setup = setup, fetch = fetch } diff --git a/modules/home/yazi/plugins/lazygit.yazi/LICENSE b/modules/home/yazi/plugins/lazygit.yazi/LICENSE deleted file mode 100644 index ae1f60d..0000000 --- a/modules/home/yazi/plugins/lazygit.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 Darius - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/yazi/plugins/lazygit.yazi/README.md b/modules/home/yazi/plugins/lazygit.yazi/README.md deleted file mode 100644 index e96c9c6..0000000 --- a/modules/home/yazi/plugins/lazygit.yazi/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# lazygit.yazi -Plugin for [Yazi](https://github.com/sxyazi/yazi) to manage git repos with [lazygit](https://github.com/jesseduffield/lazygit) -## Dependencies -Make sure [lazygit](https://github.com/jesseduffield/lazygit) is installed and in your `PATH`. -## Installation - -### Using `ya pack` -``` -ya pack -a Lil-Dank/lazygit -``` - -### Manual -**Linux/macOS** -``` -git clone https://github.com/Lil-Dank/lazygit.yazi.git ~/.config/yazi/plugins/lazygit.yazi -``` -**Windows** -``` -git clone https://github.com/Lil-Dank/lazygit.yazi.git %AppData%\yazi\config\plugins\lazygit.yazi -``` -## Configuration -add this to your **keymap.toml** file -```toml -[[manager.prepend_keymap]] -on = [ "g", "i" ] -run = "plugin lazygit" -desc = "run lazygit" -``` -you can customize the keybinding however you like. Please refer to the [keymap.toml](https://yazi-rs.github.io/docs/configuration/keymap) documentation diff --git a/modules/home/yazi/plugins/lazygit.yazi/main.lua b/modules/home/yazi/plugins/lazygit.yazi/main.lua deleted file mode 100644 index a5925ea..0000000 --- a/modules/home/yazi/plugins/lazygit.yazi/main.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - entry = function() - local output = Command("git"):arg("status"):stderr(Command.PIPED):output() - if output.stderr ~= "" then - ya.notify({ - title = "lazygit", - content = "Not in a git directory", - level = "warn", - timeout = 5, - }) - else - permit = ya.hide() - local output, err_code = Command("lazygit"):stderr(Command.PIPED):output() - if err_code ~= nil then - ya.notify({ - title = "Failed to run lazygit command", - content = "Status: " .. err_code, - level = "error", - timeout = 5, - }) - elseif not output.status.success then - ya.notify({ - title = "lazygit in" .. cwd .. "failed, exit code " .. output.status.code, - content = output.stderr, - level = "error", - timeout = 5, - }) - end - end - end, -} \ No newline at end of file diff --git a/modules/home/yazi/plugins/smart-enter.yazi/LICENSE b/modules/home/yazi/plugins/smart-enter.yazi/LICENSE deleted file mode 100644 index ae1f60d..0000000 --- a/modules/home/yazi/plugins/smart-enter.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 Darius - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/yazi/plugins/smart-enter.yazi/README.md b/modules/home/yazi/plugins/smart-enter.yazi/README.md deleted file mode 100644 index e96c9c6..0000000 --- a/modules/home/yazi/plugins/smart-enter.yazi/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# lazygit.yazi -Plugin for [Yazi](https://github.com/sxyazi/yazi) to manage git repos with [lazygit](https://github.com/jesseduffield/lazygit) -## Dependencies -Make sure [lazygit](https://github.com/jesseduffield/lazygit) is installed and in your `PATH`. -## Installation - -### Using `ya pack` -``` -ya pack -a Lil-Dank/lazygit -``` - -### Manual -**Linux/macOS** -``` -git clone https://github.com/Lil-Dank/lazygit.yazi.git ~/.config/yazi/plugins/lazygit.yazi -``` -**Windows** -``` -git clone https://github.com/Lil-Dank/lazygit.yazi.git %AppData%\yazi\config\plugins\lazygit.yazi -``` -## Configuration -add this to your **keymap.toml** file -```toml -[[manager.prepend_keymap]] -on = [ "g", "i" ] -run = "plugin lazygit" -desc = "run lazygit" -``` -you can customize the keybinding however you like. Please refer to the [keymap.toml](https://yazi-rs.github.io/docs/configuration/keymap) documentation diff --git a/modules/home/yazi/plugins/smart-enter.yazi/main.lua b/modules/home/yazi/plugins/smart-enter.yazi/main.lua deleted file mode 100644 index 8b9ae55..0000000 --- a/modules/home/yazi/plugins/smart-enter.yazi/main.lua +++ /dev/null @@ -1,11 +0,0 @@ ---- @since 25.2.26 ---- @sync entry - -local function setup(self, opts) self.open_multi = opts.open_multi end - -local function entry(self) - local h = cx.active.current.hovered - ya.mgr_emit(h and h.cha.is_dir and "enter" or "open", { hovered = not self.open_multi }) -end - -return { entry = entry, setup = setup } diff --git a/modules/home/yazi/theme.nix b/modules/home/yazi/theme.nix new file mode 100644 index 0000000..9950ad8 --- /dev/null +++ b/modules/home/yazi/theme.nix @@ -0,0 +1,3407 @@ +{ + flavor = { + dark = ""; + light = ""; + }; + mgr = { + marker_marked = { + fg = "lightcyan"; + bg = "lightcyan"; + }; + tab_width = 1; + border_symbol = "โ”‚"; + }; + mode = {}; + status = { + overall = {bold = true;}; + sep_left = ["โ–‘โ–’โ–“" "โ–“โ–’โ–‘"]; + sep_right = ["โ–‘โ–’โ–“" "โ–“โ–’โ–‘"]; + }; + which = { + cols = 3; + separator = " ๎ชœ "; + }; + confirm = { + border = {fg = "gray";}; + title = { + fg = "blue"; + bold = true; + }; + content = { + }; + list = { + }; + btn_yes = { + bg = "green"; + fg = "black"; + bold = true; + }; + btn_no = { + bg = "red"; + fg = "black"; + bold = true; + }; + btn_labels = [" [Y]es " " (N)o "]; + }; + spot = { + border = {fg = "blue";}; + title = {fg = "blue";}; + tbl_col = {fg = "blue";}; + tbl_cell = { + fg = "yellow"; + reversed = true; + }; + }; + notify = { + title_info = {fg = "green";}; + title_warn = {fg = "yellow";}; + title_error = {fg = "red";}; + icon_info = "๏š"; + icon_warn = "๏ฑ"; + icon_error = "๏—"; + }; + pick = {}; + input = {}; + cmp = { + active = {reversed = true;}; + inactive = { + }; + icon_file = "๏…›"; + icon_folder = "๏„•"; + icon_command = "๏’‰"; + }; + tasks = {}; + help = {}; + filetype = {}; + icon = { + globs = []; + 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 = "๏‘‡"; + } + ]; + files = [ + { + name = ".babelrc"; + text = "๎˜น"; + fg = "#cbcb41"; + } + { + name = ".bash_profile"; + text = "๎˜•"; + fg = "#89e051"; + } + { + name = ".bashrc"; + text = "๎˜•"; + fg = "#89e051"; + } + { + name = ".clang-format"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = ".clang-tidy"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = ".codespellrc"; + text = "๓ฐ“†"; + fg = "#35da60"; + } + { + name = ".condarc"; + text = "๎œ•"; + fg = "#43b02a"; + } + { + name = ".dockerignore"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = ".ds_store"; + text = "๎˜•"; + fg = "#41535b"; + } + { + name = ".editorconfig"; + text = "๎™’"; + fg = "#fff2f2"; + } + { + name = ".env"; + text = "๏‘ข"; + fg = "#faf743"; + } + { + name = ".eslintignore"; + text = "๎™•"; + fg = "#4b32c3"; + } + { + name = ".eslintrc"; + text = "๎™•"; + fg = "#4b32c3"; + } + { + name = ".git-blame-ignore-revs"; + text = "๎œ‚"; + fg = "#f54d27"; + } + { + name = ".gitattributes"; + text = "๎œ‚"; + fg = "#f54d27"; + } + { + name = ".gitconfig"; + text = "๎˜•"; + fg = "#f54d27"; + } + { + name = ".gitignore"; + text = "๎œ‚"; + fg = "#f54d27"; + } + { + name = ".gitlab-ci.yml"; + text = "๏Š–"; + fg = "#e24329"; + } + { + name = ".gitmodules"; + text = "๎œ‚"; + fg = "#f54d27"; + } + { + name = ".gtkrc-2.0"; + text = "๏ข"; + fg = "#ffffff"; + } + { + name = ".gvimrc"; + text = "๎˜ซ"; + fg = "#019833"; + } + { + name = ".justfile"; + text = "๏‚ญ"; + fg = "#6d8086"; + } + { + name = ".luacheckrc"; + text = "๎˜•"; + fg = "#00a2ff"; + } + { + name = ".luaurc"; + text = "๎˜•"; + fg = "#00a2ff"; + } + { + name = ".mailmap"; + text = "๓ฐŠข"; + fg = "#f54d27"; + } + { + name = ".nanorc"; + text = "๎ ธ"; + fg = "#440077"; + } + { + name = ".npmignore"; + text = "๎œž"; + fg = "#e8274b"; + } + { + name = ".npmrc"; + text = "๎œž"; + fg = "#e8274b"; + } + { + name = ".nuxtrc"; + text = "๓ฑ„†"; + fg = "#00c58e"; + } + { + name = ".nvmrc"; + text = "๎œ˜"; + fg = "#5fa04e"; + } + { + name = ".pre-commit-config.yaml"; + text = "๓ฐ›ข"; + fg = "#f8b424"; + } + { + name = ".prettierignore"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.cjs"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.js"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.json"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.json5"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.mjs"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.toml"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.yaml"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".prettierrc.yml"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = ".pylintrc"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = ".settings.json"; + text = "๎œŒ"; + fg = "#854cc7"; + } + { + name = ".SRCINFO"; + text = "๓ฐฃ‡"; + fg = "#0f94d2"; + } + { + name = ".vimrc"; + text = "๎˜ซ"; + fg = "#019833"; + } + { + name = ".Xauthority"; + text = "๏ฉ"; + fg = "#e54d18"; + } + { + name = ".xinitrc"; + text = "๏ฉ"; + fg = "#e54d18"; + } + { + name = ".Xresources"; + text = "๏ฉ"; + fg = "#e54d18"; + } + { + name = ".xsession"; + text = "๏ฉ"; + fg = "#e54d18"; + } + { + name = ".zprofile"; + text = "๎˜•"; + fg = "#89e051"; + } + { + name = ".zshenv"; + text = "๎˜•"; + fg = "#89e051"; + } + { + name = ".zshrc"; + text = "๎˜•"; + fg = "#89e051"; + } + { + name = "_gvimrc"; + text = "๎˜ซ"; + fg = "#019833"; + } + { + name = "_vimrc"; + text = "๎˜ซ"; + fg = "#019833"; + } + { + name = "AUTHORS"; + text = "๎ทŠ"; + fg = "#a172ff"; + } + { + name = "AUTHORS.txt"; + text = "๎ทŠ"; + fg = "#a172ff"; + } + { + name = "brewfile"; + text = "๎ž‘"; + fg = "#701516"; + } + { + name = "bspwmrc"; + text = "๏•"; + fg = "#2f2f2f"; + } + { + name = "build"; + text = "๎˜บ"; + fg = "#89e051"; + } + { + name = "build.gradle"; + text = "๎™ "; + fg = "#005f87"; + } + { + name = "build.zig.zon"; + text = "๎šฉ"; + fg = "#f69a1b"; + } + { + name = "bun.lockb"; + text = "๎ฏ"; + fg = "#eadcd1"; + } + { + name = "cantorrc"; + text = "๏ณ"; + fg = "#1c99f3"; + } + { + name = "checkhealth"; + text = "๓ฐ“™"; + fg = "#75b4fb"; + } + { + name = "cmakelists.txt"; + text = "๎ž”"; + fg = "#dce3eb"; + } + { + name = "code_of_conduct"; + text = "๏’ฎ"; + fg = "#e41662"; + } + { + name = "code_of_conduct.md"; + text = "๏’ฎ"; + fg = "#e41662"; + } + { + name = "commit_editmsg"; + text = "๎œ‚"; + fg = "#f54d27"; + } + { + name = "commitlint.config.js"; + text = "๓ฐœ˜"; + fg = "#2b9689"; + } + { + name = "commitlint.config.ts"; + text = "๓ฐœ˜"; + fg = "#2b9689"; + } + { + name = "compose.yaml"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = "compose.yml"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = "config"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = "containerfile"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = "copying"; + text = "๎˜Š"; + fg = "#cbcb41"; + } + { + name = "copying.lesser"; + text = "๎˜Š"; + fg = "#cbcb41"; + } + { + name = "Directory.Build.props"; + text = "๎˜•"; + fg = "#00a2ff"; + } + { + name = "Directory.Build.targets"; + text = "๎˜•"; + fg = "#00a2ff"; + } + { + name = "Directory.Packages.props"; + text = "๎˜•"; + fg = "#00a2ff"; + } + { + name = "docker-compose.yaml"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = "docker-compose.yml"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = "dockerfile"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = "eslint.config.cjs"; + text = "๎™•"; + fg = "#4b32c3"; + } + { + name = "eslint.config.js"; + text = "๎™•"; + fg = "#4b32c3"; + } + { + name = "eslint.config.mjs"; + text = "๎™•"; + fg = "#4b32c3"; + } + { + name = "eslint.config.ts"; + text = "๎™•"; + fg = "#4b32c3"; + } + { + name = "ext_typoscript_setup.txt"; + text = "๎ฒ"; + fg = "#ff8700"; + } + { + name = "favicon.ico"; + text = "๎˜ฃ"; + fg = "#cbcb41"; + } + { + name = "fp-info-cache"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "fp-lib-table"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "FreeCAD.conf"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "Gemfile"; + text = "๎ž‘"; + fg = "#701516"; + } + { + name = "gnumakefile"; + text = "๎น"; + fg = "#6d8086"; + } + { + name = "go.mod"; + text = "๎˜ง"; + fg = "#519aba"; + } + { + name = "go.sum"; + text = "๎˜ง"; + fg = "#519aba"; + } + { + name = "go.work"; + text = "๎˜ง"; + fg = "#519aba"; + } + { + name = "gradle-wrapper.properties"; + text = "๎™ "; + fg = "#005f87"; + } + { + name = "gradle.properties"; + text = "๎™ "; + fg = "#005f87"; + } + { + name = "gradlew"; + text = "๎™ "; + fg = "#005f87"; + } + { + name = "groovy"; + text = "๎ต"; + fg = "#4a687c"; + } + { + name = "gruntfile.babel.js"; + text = "๎˜‘"; + fg = "#e37933"; + } + { + name = "gruntfile.coffee"; + text = "๎˜‘"; + fg = "#e37933"; + } + { + name = "gruntfile.js"; + text = "๎˜‘"; + fg = "#e37933"; + } + { + name = "gruntfile.ts"; + text = "๎˜‘"; + fg = "#e37933"; + } + { + name = "gtkrc"; + text = "๏ข"; + fg = "#ffffff"; + } + { + name = "gulpfile.babel.js"; + text = "๎˜"; + fg = "#cc3e44"; + } + { + name = "gulpfile.coffee"; + text = "๎˜"; + fg = "#cc3e44"; + } + { + name = "gulpfile.js"; + text = "๎˜"; + fg = "#cc3e44"; + } + { + name = "gulpfile.ts"; + text = "๎˜"; + fg = "#cc3e44"; + } + { + name = "hypridle.conf"; + text = "๏™"; + fg = "#00aaae"; + } + { + name = "hyprland.conf"; + text = "๏™"; + fg = "#00aaae"; + } + { + name = "hyprlock.conf"; + text = "๏™"; + fg = "#00aaae"; + } + { + name = "hyprpaper.conf"; + text = "๏™"; + fg = "#00aaae"; + } + { + name = "i18n.config.js"; + text = "๓ฐ—Š"; + fg = "#7986cb"; + } + { + name = "i18n.config.ts"; + text = "๓ฐ—Š"; + fg = "#7986cb"; + } + { + name = "i3blocks.conf"; + text = "๏š"; + fg = "#e8ebee"; + } + { + name = "i3status.conf"; + text = "๏š"; + fg = "#e8ebee"; + } + { + name = "index.theme"; + text = "๎นฒ"; + fg = "#2db96f"; + } + { + name = "ionic.config.json"; + text = "๎žฉ"; + fg = "#4f8ff7"; + } + { + name = "justfile"; + text = "๏‚ญ"; + fg = "#6d8086"; + } + { + name = "kalgebrarc"; + text = "๏ณ"; + fg = "#1c99f3"; + } + { + name = "kdeglobals"; + text = "๏ณ"; + fg = "#1c99f3"; + } + { + name = "kdenlive-layoutsrc"; + text = "๏Œผ"; + fg = "#83b8f2"; + } + { + name = "kdenliverc"; + text = "๏Œผ"; + fg = "#83b8f2"; + } + { + name = "kritadisplayrc"; + text = "๏Œฝ"; + fg = "#f245fb"; + } + { + name = "kritarc"; + text = "๏Œฝ"; + fg = "#f245fb"; + } + { + name = "license"; + text = "๎˜Š"; + fg = "#d0bf41"; + } + { + name = "license.md"; + text = "๎˜Š"; + fg = "#d0bf41"; + } + { + name = "lxde-rc.xml"; + text = "๏ฃ"; + fg = "#909090"; + } + { + name = "lxqt.conf"; + text = "๏ค"; + fg = "#0192d3"; + } + { + name = "makefile"; + text = "๎น"; + fg = "#6d8086"; + } + { + name = "mix.lock"; + text = "๎˜ญ"; + fg = "#a074c4"; + } + { + name = "mpv.conf"; + text = "๏ฎ"; + fg = "#3b1342"; + } + { + name = "node_modules"; + text = "๎œ˜"; + fg = "#e8274b"; + } + { + name = "nuxt.config.cjs"; + text = "๓ฑ„†"; + fg = "#00c58e"; + } + { + name = "nuxt.config.js"; + text = "๓ฑ„†"; + fg = "#00c58e"; + } + { + name = "nuxt.config.mjs"; + text = "๓ฑ„†"; + fg = "#00c58e"; + } + { + name = "nuxt.config.ts"; + text = "๓ฑ„†"; + fg = "#00c58e"; + } + { + name = "package-lock.json"; + text = "๎œž"; + fg = "#7a0d21"; + } + { + name = "package.json"; + text = "๎œž"; + fg = "#e8274b"; + } + { + name = "PKGBUILD"; + text = "๏Œƒ"; + fg = "#0f94d2"; + } + { + name = "platformio.ini"; + text = "๎š‚"; + fg = "#f6822b"; + } + { + name = "pom.xml"; + text = "๎™ด"; + fg = "#7a0d21"; + } + { + name = "prettier.config.cjs"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = "prettier.config.js"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = "prettier.config.mjs"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = "prettier.config.ts"; + text = "๎šด"; + fg = "#4285f4"; + } + { + name = "procfile"; + text = "๎˜‡"; + fg = "#a074c4"; + } + { + name = "PrusaSlicer.ini"; + text = "๏‘"; + fg = "#ec6b23"; + } + { + name = "PrusaSlicerGcodeViewer.ini"; + text = "๏‘"; + fg = "#ec6b23"; + } + { + name = "py.typed"; + text = "๎˜†"; + fg = "#ffbc03"; + } + { + name = "QtProject.conf"; + text = "๏ต"; + fg = "#40cd52"; + } + { + name = "rakefile"; + text = "๎ž‘"; + fg = "#701516"; + } + { + name = "readme"; + text = "๓ฐ‚บ"; + fg = "#ededed"; + } + { + name = "readme.md"; + text = "๓ฐ‚บ"; + fg = "#ededed"; + } + { + name = "rmd"; + text = "๎˜‰"; + fg = "#519aba"; + } + { + name = "robots.txt"; + text = "๓ฐšฉ"; + fg = "#5d7096"; + } + { + name = "security"; + text = "๓ฐ’ƒ"; + fg = "#bec4c9"; + } + { + name = "security.md"; + text = "๓ฐ’ƒ"; + fg = "#bec4c9"; + } + { + name = "settings.gradle"; + text = "๎™ "; + fg = "#005f87"; + } + { + name = "svelte.config.js"; + text = "๎š—"; + fg = "#ff3e00"; + } + { + name = "sxhkdrc"; + text = "๏•"; + fg = "#2f2f2f"; + } + { + name = "sym-lib-table"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "tailwind.config.js"; + text = "๓ฑฟ"; + fg = "#20c2e3"; + } + { + name = "tailwind.config.mjs"; + text = "๓ฑฟ"; + fg = "#20c2e3"; + } + { + name = "tailwind.config.ts"; + text = "๓ฑฟ"; + fg = "#20c2e3"; + } + { + name = "tmux.conf"; + text = "๎ฏˆ"; + fg = "#14ba19"; + } + { + name = "tmux.conf.local"; + text = "๎ฏˆ"; + fg = "#14ba19"; + } + { + name = "tsconfig.json"; + text = "๎š"; + fg = "#519aba"; + } + { + name = "unlicense"; + text = "๎˜Š"; + fg = "#d0bf41"; + } + { + name = "vagrantfile"; + text = "๏Šธ"; + fg = "#1563ff"; + } + { + name = "vercel.json"; + text = "๎ฃ“"; + fg = "#ffffff"; + } + { + name = "vlcrc"; + text = "๓ฐ•ผ"; + fg = "#ee7a00"; + } + { + name = "webpack"; + text = "๓ฐœซ"; + fg = "#519aba"; + } + { + name = "weston.ini"; + text = "๏ง"; + fg = "#ffbb01"; + } + { + name = "workspace"; + text = "๎˜บ"; + fg = "#89e051"; + } + { + name = "xmobarrc"; + text = "๏ž"; + fg = "#fd4d5d"; + } + { + name = "xmobarrc.hs"; + text = "๏ž"; + fg = "#fd4d5d"; + } + { + name = "xmonad.hs"; + text = "๏ž"; + fg = "#fd4d5d"; + } + { + name = "xorg.conf"; + text = "๏ฉ"; + fg = "#e54d18"; + } + { + name = "xsettingsd.conf"; + text = "๏ฉ"; + fg = "#e54d18"; + } + ]; + exts = [ + { + name = "3gp"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "3mf"; + text = "๓ฐ†ง"; + fg = "#888888"; + } + { + name = "7z"; + text = "๏"; + fg = "#eca517"; + } + { + name = "a"; + text = "๎ฎœ"; + fg = "#dcddd6"; + } + { + name = "aac"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "adb"; + text = "๎šต"; + fg = "#22ffff"; + } + { + name = "ads"; + text = "๎šต"; + fg = "#ffffff"; + } + { + name = "ai"; + text = "๎žด"; + fg = "#cbcb41"; + } + { + name = "aif"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "aiff"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "android"; + text = "๎œŽ"; + fg = "#34a853"; + } + { + name = "ape"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "apk"; + text = "๎œŽ"; + fg = "#34a853"; + } + { + name = "apl"; + text = "๎œฐ"; + fg = "#24a148"; + } + { + name = "app"; + text = "๎ซจ"; + fg = "#9f0500"; + } + { + name = "applescript"; + text = "๏…น"; + fg = "#6d8085"; + } + { + name = "asc"; + text = "๓ฐฆ"; + fg = "#576d7f"; + } + { + name = "asm"; + text = "๎˜ท"; + fg = "#0091bd"; + } + { + name = "ass"; + text = "๓ฐจ–"; + fg = "#ffb713"; + } + { + name = "astro"; + text = "๎šณ"; + fg = "#e23f67"; + } + { + name = "avif"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "awk"; + text = "๎ž•"; + fg = "#4d5a5e"; + } + { + name = "azcli"; + text = "๎ฏจ"; + fg = "#0078d4"; + } + { + name = "bak"; + text = "๓ฐฏ"; + fg = "#6d8086"; + } + { + name = "bash"; + text = "๎ž•"; + fg = "#89e051"; + } + { + name = "bat"; + text = "๎˜•"; + fg = "#c1f12e"; + } + { + name = "bazel"; + text = "๎˜บ"; + fg = "#89e051"; + } + { + name = "bib"; + text = "๓ฑ‰Ÿ"; + fg = "#cbcb41"; + } + { + name = "bicep"; + text = "๎˜ป"; + fg = "#519aba"; + } + { + name = "bicepparam"; + text = "๎˜ป"; + fg = "#9f74b3"; + } + { + name = "bin"; + text = "๎ซจ"; + fg = "#9f0500"; + } + { + name = "blade.php"; + text = "๏‹ท"; + fg = "#f05340"; + } + { + name = "blend"; + text = "๓ฐ‚ซ"; + fg = "#ea7600"; + } + { + name = "blp"; + text = "๓ฐบพ"; + fg = "#5796e2"; + } + { + name = "bmp"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "bqn"; + text = "๎œฐ"; + fg = "#24a148"; + } + { + name = "brep"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "bz"; + text = "๏"; + fg = "#eca517"; + } + { + name = "bz2"; + text = "๏"; + fg = "#eca517"; + } + { + name = "bz3"; + text = "๏"; + fg = "#eca517"; + } + { + name = "bzl"; + text = "๎˜บ"; + fg = "#89e051"; + } + { + name = "c"; + text = "๎˜ž"; + fg = "#599eff"; + } + { + name = "c++"; + text = "๎˜"; + fg = "#f34b7d"; + } + { + name = "cache"; + text = "๏’›"; + fg = "#ffffff"; + } + { + name = "cast"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "cbl"; + text = "๏ฃ"; + fg = "#005ca5"; + } + { + name = "cc"; + text = "๎˜"; + fg = "#f34b7d"; + } + { + name = "ccm"; + text = "๎˜"; + fg = "#f34b7d"; + } + { + name = "cfg"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = "cjs"; + text = "๎˜Œ"; + fg = "#cbcb41"; + } + { + name = "clj"; + text = "๎จ"; + fg = "#8dc149"; + } + { + name = "cljc"; + text = "๎จ"; + fg = "#8dc149"; + } + { + name = "cljd"; + text = "๎ช"; + fg = "#519aba"; + } + { + name = "cljs"; + text = "๎ช"; + fg = "#519aba"; + } + { + name = "cmake"; + text = "๎ž”"; + fg = "#dce3eb"; + } + { + name = "cob"; + text = "๏ฃ"; + fg = "#005ca5"; + } + { + name = "cobol"; + text = "๏ฃ"; + fg = "#005ca5"; + } + { + name = "coffee"; + text = "๎˜›"; + fg = "#cbcb41"; + } + { + name = "conda"; + text = "๎œ•"; + fg = "#43b02a"; + } + { + name = "conf"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = "config.ru"; + text = "๎ž‘"; + fg = "#701516"; + } + { + name = "cow"; + text = "๓ฐ†š"; + fg = "#965824"; + } + { + name = "cp"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "cpp"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "cppm"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "cpy"; + text = "๏ฃ"; + fg = "#005ca5"; + } + { + name = "cr"; + text = "๎˜ฏ"; + fg = "#c8c8c8"; + } + { + name = "crdownload"; + text = "๏€™"; + fg = "#44cda8"; + } + { + name = "cs"; + text = "๓ฐŒ›"; + fg = "#596706"; + } + { + name = "csh"; + text = "๎ž•"; + fg = "#4d5a5e"; + } + { + name = "cshtml"; + text = "๓ฑฆ—"; + fg = "#512bd4"; + } + { + name = "cson"; + text = "๎˜‹"; + fg = "#cbcb41"; + } + { + name = "csproj"; + text = "๓ฐชฎ"; + fg = "#512bd4"; + } + { + name = "css"; + text = "๎‰"; + fg = "#42a5f5"; + } + { + name = "csv"; + text = "๎™Š"; + fg = "#89e051"; + } + { + name = "cts"; + text = "๎˜จ"; + fg = "#519aba"; + } + { + name = "cu"; + text = "๎™‹"; + fg = "#89e051"; + } + { + name = "cue"; + text = "๓ฐฒน"; + fg = "#ed95ae"; + } + { + name = "cuh"; + text = "๎™‹"; + fg = "#a074c4"; + } + { + name = "cxx"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "cxxm"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "d"; + text = "๎žฏ"; + fg = "#b03931"; + } + { + name = "d.ts"; + text = "๎˜จ"; + fg = "#d59855"; + } + { + name = "dart"; + text = "๎ž˜"; + fg = "#03589c"; + } + { + name = "db"; + text = "๎œ†"; + fg = "#dad8d8"; + } + { + name = "dconf"; + text = "๏ก"; + fg = "#ffffff"; + } + { + name = "desktop"; + text = "๏„ˆ"; + fg = "#563d7c"; + } + { + name = "diff"; + text = "๎œจ"; + fg = "#41535b"; + } + { + name = "dll"; + text = "๎ฎœ"; + fg = "#4d2c0b"; + } + { + name = "doc"; + text = "๓ฐˆฌ"; + fg = "#185abd"; + } + { + name = "Dockerfile"; + text = "๓ฐกจ"; + fg = "#458ee6"; + } + { + name = "docx"; + text = "๓ฐˆฌ"; + fg = "#185abd"; + } + { + name = "dot"; + text = "๓ฑ‰"; + fg = "#30638e"; + } + { + name = "download"; + text = "๏€™"; + fg = "#44cda8"; + } + { + name = "drl"; + text = "๎ŠŒ"; + fg = "#ffafaf"; + } + { + name = "dropbox"; + text = "๎œ‡"; + fg = "#0061fe"; + } + { + name = "dump"; + text = "๎œ†"; + fg = "#dad8d8"; + } + { + name = "dwg"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "dxf"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "ebook"; + text = "๎Š‹"; + fg = "#eab16d"; + } + { + name = "ebuild"; + text = "๏Œ"; + fg = "#4c416e"; + } + { + name = "edn"; + text = "๎ช"; + fg = "#519aba"; + } + { + name = "eex"; + text = "๎˜ญ"; + fg = "#a074c4"; + } + { + name = "ejs"; + text = "๎˜Ž"; + fg = "#cbcb41"; + } + { + name = "el"; + text = "๎˜ฒ"; + fg = "#8172be"; + } + { + name = "elc"; + text = "๎˜ฒ"; + fg = "#8172be"; + } + { + name = "elf"; + text = "๎ซจ"; + fg = "#9f0500"; + } + { + name = "elm"; + text = "๎˜ฌ"; + fg = "#519aba"; + } + { + name = "eln"; + text = "๎˜ฒ"; + fg = "#8172be"; + } + { + name = "env"; + text = "๏‘ข"; + fg = "#faf743"; + } + { + name = "eot"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "epp"; + text = "๎˜ฑ"; + fg = "#ffa61a"; + } + { + name = "epub"; + text = "๎Š‹"; + fg = "#eab16d"; + } + { + name = "erb"; + text = "๎˜Ž"; + fg = "#701516"; + } + { + name = "erl"; + text = "๎žฑ"; + fg = "#b83998"; + } + { + name = "ex"; + text = "๎˜ญ"; + fg = "#a074c4"; + } + { + name = "exe"; + text = "๎ซจ"; + fg = "#9f0500"; + } + { + name = "exs"; + text = "๎˜ญ"; + fg = "#a074c4"; + } + { + name = "f#"; + text = "๎žง"; + fg = "#519aba"; + } + { + name = "f3d"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "f90"; + text = "๓ฑˆš"; + fg = "#734f96"; + } + { + name = "fbx"; + text = "๓ฐ†ง"; + fg = "#888888"; + } + { + name = "fcbak"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fcmacro"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fcmat"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fcparam"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fcscript"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fcstd"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fcstd1"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fctb"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fctl"; + text = "๏Œถ"; + fg = "#cb333b"; + } + { + name = "fdmdownload"; + text = "๏€™"; + fg = "#44cda8"; + } + { + name = "fish"; + text = "๎ž•"; + fg = "#4d5a5e"; + } + { + name = "flac"; + text = "๏€"; + fg = "#0075aa"; + } + { + name = "flc"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "flf"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "fnl"; + text = "๎šฏ"; + fg = "#fff3d7"; + } + { + name = "fodg"; + text = "๏น"; + fg = "#fffb57"; + } + { + name = "fodp"; + text = "๏บ"; + fg = "#fe9c45"; + } + { + name = "fods"; + text = "๏ธ"; + fg = "#78fc4e"; + } + { + name = "fodt"; + text = "๏ผ"; + fg = "#2dcbfd"; + } + { + name = "fs"; + text = "๎žง"; + fg = "#519aba"; + } + { + name = "fsi"; + text = "๎žง"; + fg = "#519aba"; + } + { + name = "fsscript"; + text = "๎žง"; + fg = "#519aba"; + } + { + name = "fsx"; + text = "๎žง"; + fg = "#519aba"; + } + { + name = "gcode"; + text = "๓ฐซ"; + fg = "#1471ad"; + } + { + name = "gd"; + text = "๎™Ÿ"; + fg = "#6d8086"; + } + { + name = "gemspec"; + text = "๎ž‘"; + fg = "#701516"; + } + { + name = "gif"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "git"; + text = "๎œ‚"; + fg = "#f14c28"; + } + { + name = "glb"; + text = "๏†ฒ"; + fg = "#ffb13b"; + } + { + name = "gleam"; + text = "๏€…"; + fg = "#ffaff3"; + } + { + name = "gnumakefile"; + text = "๎น"; + fg = "#6d8086"; + } + { + name = "go"; + text = "๎˜ง"; + fg = "#519aba"; + } + { + name = "godot"; + text = "๎™Ÿ"; + fg = "#6d8086"; + } + { + name = "gpr"; + text = "๎šต"; + fg = "#ff33ff"; + } + { + name = "gql"; + text = "๏ˆŽ"; + fg = "#e535ab"; + } + { + name = "gradle"; + text = "๎™ "; + fg = "#005f87"; + } + { + name = "graphql"; + text = "๏ˆŽ"; + fg = "#e535ab"; + } + { + name = "gresource"; + text = "๏ข"; + fg = "#ffffff"; + } + { + name = "gv"; + text = "๓ฑ‰"; + fg = "#30638e"; + } + { + name = "gz"; + text = "๏"; + fg = "#eca517"; + } + { + name = "h"; + text = "๏ƒฝ"; + fg = "#a074c4"; + } + { + name = "haml"; + text = "๎˜Ž"; + fg = "#eaeae1"; + } + { + name = "hbs"; + text = "๎˜"; + fg = "#f0772b"; + } + { + name = "heex"; + text = "๎˜ญ"; + fg = "#a074c4"; + } + { + name = "hex"; + text = "๎™ง"; + fg = "#2e63ff"; + } + { + name = "hh"; + text = "๏ƒฝ"; + fg = "#a074c4"; + } + { + name = "hpp"; + text = "๏ƒฝ"; + fg = "#a074c4"; + } + { + name = "hrl"; + text = "๎žฑ"; + fg = "#b83998"; + } + { + name = "hs"; + text = "๎˜Ÿ"; + fg = "#a074c4"; + } + { + name = "htm"; + text = "๎˜Ž"; + fg = "#e34c26"; + } + { + name = "html"; + text = "๎œถ"; + fg = "#e44d26"; + } + { + name = "http"; + text = "๏‡˜"; + fg = "#008ec7"; + } + { + name = "huff"; + text = "๓ฐก˜"; + fg = "#4242c7"; + } + { + name = "hurl"; + text = "๏ƒฌ"; + fg = "#ff0288"; + } + { + name = "hx"; + text = "๎™ฆ"; + fg = "#ea8220"; + } + { + name = "hxx"; + text = "๏ƒฝ"; + fg = "#a074c4"; + } + { + name = "ical"; + text = "๏ณ"; + fg = "#2b2e83"; + } + { + name = "icalendar"; + text = "๏ณ"; + fg = "#2b2e83"; + } + { + name = "ico"; + text = "๎˜"; + fg = "#cbcb41"; + } + { + name = "ics"; + text = "๏ณ"; + fg = "#2b2e83"; + } + { + name = "ifb"; + text = "๏ณ"; + fg = "#2b2e83"; + } + { + name = "ifc"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "ige"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "iges"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "igs"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "image"; + text = "๎‰ฑ"; + fg = "#d0bec8"; + } + { + name = "img"; + text = "๎‰ฑ"; + fg = "#d0bec8"; + } + { + name = "import"; + text = "๏ƒ†"; + fg = "#ececec"; + } + { + name = "info"; + text = "๏„ฉ"; + fg = "#ffffcd"; + } + { + name = "ini"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = "ino"; + text = "๏‹"; + fg = "#56b6c2"; + } + { + name = "ipynb"; + text = "๎ "; + fg = "#f57d01"; + } + { + name = "iso"; + text = "๎‰ฑ"; + fg = "#d0bec8"; + } + { + name = "ixx"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "java"; + text = "๎œธ"; + fg = "#cc3e44"; + } + { + name = "jl"; + text = "๎˜ค"; + fg = "#a270ba"; + } + { + name = "jpeg"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "jpg"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "js"; + text = "๎˜Œ"; + fg = "#cbcb41"; + } + { + name = "json"; + text = "๎˜‹"; + fg = "#cbcb41"; + } + { + name = "json5"; + text = "๎˜‹"; + fg = "#cbcb41"; + } + { + name = "jsonc"; + text = "๎˜‹"; + fg = "#cbcb41"; + } + { + name = "jsx"; + text = "๎˜ฅ"; + fg = "#20c2e3"; + } + { + name = "jwmrc"; + text = "๏›"; + fg = "#0078cd"; + } + { + name = "jxl"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "kbx"; + text = "๓ฐฏ„"; + fg = "#737672"; + } + { + name = "kdb"; + text = "๏ˆพ"; + fg = "#529b34"; + } + { + name = "kdbx"; + text = "๏ˆพ"; + fg = "#529b34"; + } + { + name = "kdenlive"; + text = "๏Œผ"; + fg = "#83b8f2"; + } + { + name = "kdenlivetitle"; + text = "๏Œผ"; + fg = "#83b8f2"; + } + { + name = "kicad_dru"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "kicad_mod"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "kicad_pcb"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "kicad_prl"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "kicad_pro"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "kicad_sch"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "kicad_sym"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "kicad_wks"; + text = "๏Œ"; + fg = "#ffffff"; + } + { + name = "ko"; + text = "๏…ผ"; + fg = "#dcddd6"; + } + { + name = "kpp"; + text = "๏Œฝ"; + fg = "#f245fb"; + } + { + name = "kra"; + text = "๏Œฝ"; + fg = "#f245fb"; + } + { + name = "krz"; + text = "๏Œฝ"; + fg = "#f245fb"; + } + { + name = "ksh"; + text = "๎ž•"; + fg = "#4d5a5e"; + } + { + name = "kt"; + text = "๎˜ด"; + fg = "#7f52ff"; + } + { + name = "kts"; + text = "๎˜ด"; + fg = "#7f52ff"; + } + { + name = "lck"; + text = "๎™ฒ"; + fg = "#bbbbbb"; + } + { + name = "leex"; + text = "๎˜ญ"; + fg = "#a074c4"; + } + { + name = "less"; + text = "๎˜”"; + fg = "#563d7c"; + } + { + name = "lff"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "lhs"; + text = "๎˜Ÿ"; + fg = "#a074c4"; + } + { + name = "lib"; + text = "๎ฎœ"; + fg = "#4d2c0b"; + } + { + name = "license"; + text = "๎˜Š"; + fg = "#cbcb41"; + } + { + name = "liquid"; + text = "๎™ฐ"; + fg = "#95bf47"; + } + { + name = "lock"; + text = "๎™ฒ"; + fg = "#bbbbbb"; + } + { + name = "log"; + text = "๓ฐŒฑ"; + fg = "#dddddd"; + } + { + name = "lrc"; + text = "๓ฐจ–"; + fg = "#ffb713"; + } + { + name = "lua"; + text = "๎˜ "; + fg = "#51a0cf"; + } + { + name = "luac"; + text = "๎˜ "; + fg = "#51a0cf"; + } + { + name = "luau"; + text = "๎˜ "; + fg = "#00a2ff"; + } + { + name = "m"; + text = "๎˜ž"; + fg = "#599eff"; + } + { + name = "m3u"; + text = "๓ฐฒน"; + fg = "#ed95ae"; + } + { + name = "m3u8"; + text = "๓ฐฒน"; + fg = "#ed95ae"; + } + { + name = "m4a"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "m4v"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "magnet"; + text = "๏ถ"; + fg = "#a51b16"; + } + { + name = "makefile"; + text = "๎น"; + fg = "#6d8086"; + } + { + name = "markdown"; + text = "๎˜‰"; + fg = "#dddddd"; + } + { + name = "material"; + text = "๎Šฆ"; + fg = "#b83998"; + } + { + name = "md"; + text = "๏’Š"; + fg = "#dddddd"; + } + { + name = "md5"; + text = "๓ฐ•ฅ"; + fg = "#8c86af"; + } + { + name = "mdx"; + text = "๏’Š"; + fg = "#519aba"; + } + { + name = "mint"; + text = "๓ฐŒช"; + fg = "#87c095"; + } + { + name = "mjs"; + text = "๎˜Œ"; + fg = "#f1e05a"; + } + { + name = "mk"; + text = "๎น"; + fg = "#6d8086"; + } + { + name = "mkv"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "ml"; + text = "๎™บ"; + fg = "#e37933"; + } + { + name = "mli"; + text = "๎™บ"; + fg = "#e37933"; + } + { + name = "mm"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "mo"; + text = "๎ทพ"; + fg = "#9772fb"; + } + { + name = "mobi"; + text = "๎Š‹"; + fg = "#eab16d"; + } + { + name = "mojo"; + text = "๏ญ"; + fg = "#ff4c1f"; + } + { + name = "mov"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "mp3"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "mp4"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "mpp"; + text = "๎˜"; + fg = "#519aba"; + } + { + name = "msf"; + text = "๏ฐ"; + fg = "#137be1"; + } + { + name = "mts"; + text = "๎˜จ"; + fg = "#519aba"; + } + { + name = "mustache"; + text = "๎˜"; + fg = "#e37933"; + } + { + name = "nfo"; + text = "๏„ฉ"; + fg = "#ffffcd"; + } + { + name = "nim"; + text = "๎™ท"; + fg = "#f3d400"; + } + { + name = "nix"; + text = "๏Œ“"; + fg = "#7ebae4"; + } + { + name = "norg"; + text = "๎ก‡"; + fg = "#4878be"; + } + { + name = "nswag"; + text = "๎˜‹"; + fg = "#85ea2d"; + } + { + name = "nu"; + text = "๏”"; + fg = "#3aa675"; + } + { + name = "o"; + text = "๎ซจ"; + fg = "#9f0500"; + } + { + name = "obj"; + text = "๓ฐ†ง"; + fg = "#888888"; + } + { + name = "odf"; + text = "๏ป"; + fg = "#ff5a96"; + } + { + name = "odg"; + text = "๏น"; + fg = "#fffb57"; + } + { + name = "odin"; + text = "๓ฐŸข"; + fg = "#3882d2"; + } + { + name = "odp"; + text = "๏บ"; + fg = "#fe9c45"; + } + { + name = "ods"; + text = "๏ธ"; + fg = "#78fc4e"; + } + { + name = "odt"; + text = "๏ผ"; + fg = "#2dcbfd"; + } + { + name = "oga"; + text = "๏€"; + fg = "#0075aa"; + } + { + name = "ogg"; + text = "๏€"; + fg = "#0075aa"; + } + { + name = "ogv"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "ogx"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "opus"; + text = "๏€"; + fg = "#0075aa"; + } + { + name = "org"; + text = "๎˜ณ"; + fg = "#77aa99"; + } + { + name = "otf"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "out"; + text = "๎ซจ"; + fg = "#9f0500"; + } + { + name = "part"; + text = "๏€™"; + fg = "#44cda8"; + } + { + name = "patch"; + text = "๎œจ"; + fg = "#41535b"; + } + { + name = "pck"; + text = "๏’‡"; + fg = "#6d8086"; + } + { + name = "pcm"; + text = "๏€"; + fg = "#0075aa"; + } + { + name = "pdf"; + text = "๎ซซ"; + fg = "#b30b00"; + } + { + name = "php"; + text = "๎˜ˆ"; + fg = "#a074c4"; + } + { + name = "pl"; + text = "๎ฉ"; + fg = "#519aba"; + } + { + name = "pls"; + text = "๓ฐฒน"; + fg = "#ed95ae"; + } + { + name = "ply"; + text = "๓ฐ†ง"; + fg = "#888888"; + } + { + name = "pm"; + text = "๎ฉ"; + fg = "#519aba"; + } + { + name = "png"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "po"; + text = "๏†ซ"; + fg = "#2596be"; + } + { + name = "pot"; + text = "๏†ซ"; + fg = "#2596be"; + } + { + name = "pp"; + text = "๎˜ฑ"; + fg = "#ffa61a"; + } + { + name = "ppt"; + text = "๓ฐˆง"; + fg = "#cb4a32"; + } + { + name = "pptx"; + text = "๓ฐˆง"; + fg = "#cb4a32"; + } + { + name = "prisma"; + text = "๎š„"; + fg = "#5a67d8"; + } + { + name = "pro"; + text = "๎žก"; + fg = "#e4b854"; + } + { + name = "ps1"; + text = "๓ฐจŠ"; + fg = "#4273ca"; + } + { + name = "psb"; + text = "๎žธ"; + fg = "#519aba"; + } + { + name = "psd"; + text = "๎žธ"; + fg = "#519aba"; + } + { + name = "psd1"; + text = "๓ฐจŠ"; + fg = "#6975c4"; + } + { + name = "psm1"; + text = "๓ฐจŠ"; + fg = "#6975c4"; + } + { + name = "pub"; + text = "๓ฐท–"; + fg = "#e3c58e"; + } + { + name = "pxd"; + text = "๎˜†"; + fg = "#5aa7e4"; + } + { + name = "pxi"; + text = "๎˜†"; + fg = "#5aa7e4"; + } + { + name = "py"; + text = "๎˜†"; + fg = "#ffbc03"; + } + { + name = "pyc"; + text = "๎˜†"; + fg = "#ffe291"; + } + { + name = "pyd"; + text = "๎˜†"; + fg = "#ffe291"; + } + { + name = "pyi"; + text = "๎˜†"; + fg = "#ffbc03"; + } + { + name = "pyo"; + text = "๎˜†"; + fg = "#ffe291"; + } + { + name = "pyw"; + text = "๎˜†"; + fg = "#5aa7e4"; + } + { + name = "pyx"; + text = "๎˜†"; + fg = "#5aa7e4"; + } + { + name = "qm"; + text = "๏†ซ"; + fg = "#2596be"; + } + { + name = "qml"; + text = "๏ต"; + fg = "#40cd52"; + } + { + name = "qrc"; + text = "๏ต"; + fg = "#40cd52"; + } + { + name = "qss"; + text = "๏ต"; + fg = "#40cd52"; + } + { + name = "query"; + text = "๎ˆœ"; + fg = "#90a850"; + } + { + name = "r"; + text = "๓ฐŸ”"; + fg = "#2266ba"; + } + { + name = "R"; + text = "๓ฐŸ”"; + fg = "#2266ba"; + } + { + name = "rake"; + text = "๎ž‘"; + fg = "#701516"; + } + { + name = "rar"; + text = "๏"; + fg = "#eca517"; + } + { + name = "razor"; + text = "๓ฑฆ˜"; + fg = "#512bd4"; + } + { + name = "rb"; + text = "๎ž‘"; + fg = "#701516"; + } + { + name = "res"; + text = "๎šˆ"; + fg = "#cc3e44"; + } + { + name = "resi"; + text = "๎šˆ"; + fg = "#f55385"; + } + { + name = "rlib"; + text = "๎žจ"; + fg = "#dea584"; + } + { + name = "rmd"; + text = "๎˜‰"; + fg = "#519aba"; + } + { + name = "rproj"; + text = "๓ฐ—†"; + fg = "#358a5b"; + } + { + name = "rs"; + text = "๎š‹"; + fg = "#dea584"; + } + { + name = "rss"; + text = "๎˜™"; + fg = "#fb9d3b"; + } + { + name = "s"; + text = "๎˜ท"; + fg = "#0071c5"; + } + { + name = "sass"; + text = "๎˜ƒ"; + fg = "#f55385"; + } + { + name = "sbt"; + text = "๎œท"; + fg = "#cc3e44"; + } + { + name = "sc"; + text = "๎œท"; + fg = "#cc3e44"; + } + { + name = "scad"; + text = "๏Ž"; + fg = "#f9d72c"; + } + { + name = "scala"; + text = "๎œท"; + fg = "#cc3e44"; + } + { + name = "scm"; + text = "๓ฐ˜ง"; + fg = "#eeeeee"; + } + { + name = "scss"; + text = "๎˜ƒ"; + fg = "#f55385"; + } + { + name = "sh"; + text = "๎ž•"; + fg = "#4d5a5e"; + } + { + name = "sha1"; + text = "๓ฐ•ฅ"; + fg = "#8c86af"; + } + { + name = "sha224"; + text = "๓ฐ•ฅ"; + fg = "#8c86af"; + } + { + name = "sha256"; + text = "๓ฐ•ฅ"; + fg = "#8c86af"; + } + { + name = "sha384"; + text = "๓ฐ•ฅ"; + fg = "#8c86af"; + } + { + name = "sha512"; + text = "๓ฐ•ฅ"; + fg = "#8c86af"; + } + { + name = "sig"; + text = "๓ฐ˜ง"; + fg = "#e37933"; + } + { + name = "signature"; + text = "๓ฐ˜ง"; + fg = "#e37933"; + } + { + name = "skp"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "sldasm"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "sldprt"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "slim"; + text = "๎˜Ž"; + fg = "#e34c26"; + } + { + name = "sln"; + text = "๎œŒ"; + fg = "#854cc7"; + } + { + name = "slnx"; + text = "๎œŒ"; + fg = "#854cc7"; + } + { + name = "slvs"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "sml"; + text = "๓ฐ˜ง"; + fg = "#e37933"; + } + { + name = "so"; + text = "๎ฎœ"; + fg = "#dcddd6"; + } + { + name = "sol"; + text = "๎™–"; + fg = "#519aba"; + } + { + name = "spec.js"; + text = "๏’™"; + fg = "#cbcb41"; + } + { + name = "spec.jsx"; + text = "๏’™"; + fg = "#20c2e3"; + } + { + name = "spec.ts"; + text = "๏’™"; + fg = "#519aba"; + } + { + name = "spec.tsx"; + text = "๏’™"; + fg = "#1354bf"; + } + { + name = "spx"; + text = "๏€"; + fg = "#0075aa"; + } + { + name = "sql"; + text = "๎œ†"; + fg = "#dad8d8"; + } + { + name = "sqlite"; + text = "๎œ†"; + fg = "#dad8d8"; + } + { + name = "sqlite3"; + text = "๎œ†"; + fg = "#dad8d8"; + } + { + name = "srt"; + text = "๓ฐจ–"; + fg = "#ffb713"; + } + { + name = "ssa"; + text = "๓ฐจ–"; + fg = "#ffb713"; + } + { + name = "ste"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "step"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "stl"; + text = "๓ฐ†ง"; + fg = "#888888"; + } + { + name = "stp"; + text = "๓ฐปซ"; + fg = "#839463"; + } + { + name = "strings"; + text = "๏†ซ"; + fg = "#2596be"; + } + { + name = "styl"; + text = "๎˜€"; + fg = "#8dc149"; + } + { + name = "sub"; + text = "๓ฐจ–"; + fg = "#ffb713"; + } + { + name = "sublime"; + text = "๎žช"; + fg = "#e37933"; + } + { + name = "suo"; + text = "๎œŒ"; + fg = "#854cc7"; + } + { + name = "sv"; + text = "๓ฐ›"; + fg = "#019833"; + } + { + name = "svelte"; + text = "๎š—"; + fg = "#ff3e00"; + } + { + name = "svg"; + text = "๓ฐœก"; + fg = "#ffb13b"; + } + { + name = "svh"; + text = "๓ฐ›"; + fg = "#019833"; + } + { + name = "swift"; + text = "๎•"; + fg = "#e37933"; + } + { + name = "t"; + text = "๎ฉ"; + fg = "#519aba"; + } + { + name = "tbc"; + text = "๓ฐ›“"; + fg = "#1e5cb3"; + } + { + name = "tcl"; + text = "๓ฐ›“"; + fg = "#1e5cb3"; + } + { + name = "templ"; + text = "๎ซ„"; + fg = "#dbbd30"; + } + { + name = "terminal"; + text = "๏’‰"; + fg = "#31b53e"; + } + { + name = "test.js"; + text = "๏’™"; + fg = "#cbcb41"; + } + { + name = "test.jsx"; + text = "๏’™"; + fg = "#20c2e3"; + } + { + name = "test.ts"; + text = "๏’™"; + fg = "#519aba"; + } + { + name = "test.tsx"; + text = "๏’™"; + fg = "#1354bf"; + } + { + name = "tex"; + text = "๎š›"; + fg = "#3d6117"; + } + { + name = "tf"; + text = "๎šš"; + fg = "#5f43e9"; + } + { + name = "tfvars"; + text = "๏…›"; + fg = "#5f43e9"; + } + { + name = "tgz"; + text = "๏"; + fg = "#eca517"; + } + { + name = "tmux"; + text = "๎ฏˆ"; + fg = "#14ba19"; + } + { + name = "toml"; + text = "๎šฒ"; + fg = "#9c4221"; + } + { + name = "torrent"; + text = "๏€™"; + fg = "#44cda8"; + } + { + name = "tres"; + text = "๎™Ÿ"; + fg = "#6d8086"; + } + { + name = "ts"; + text = "๎˜จ"; + fg = "#519aba"; + } + { + name = "tscn"; + text = "๎™Ÿ"; + fg = "#6d8086"; + } + { + name = "tsconfig"; + text = "๎ฒ"; + fg = "#ff8700"; + } + { + name = "tsx"; + text = "๎žบ"; + fg = "#1354bf"; + } + { + name = "ttf"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "twig"; + text = "๎˜œ"; + fg = "#8dc149"; + } + { + name = "txt"; + text = "๓ฐˆ™"; + fg = "#89e051"; + } + { + name = "txz"; + text = "๏"; + fg = "#eca517"; + } + { + name = "typ"; + text = "๏ฟ"; + fg = "#0dbcc0"; + } + { + name = "typoscript"; + text = "๎ฒ"; + fg = "#ff8700"; + } + { + name = "ui"; + text = "๏‹"; + fg = "#015bf0"; + } + { + name = "v"; + text = "๓ฐ›"; + fg = "#019833"; + } + { + name = "vala"; + text = "๎ฃ‘"; + fg = "#7b3db9"; + } + { + name = "vh"; + text = "๓ฐ›"; + fg = "#019833"; + } + { + name = "vhd"; + text = "๓ฐ›"; + fg = "#019833"; + } + { + name = "vhdl"; + text = "๓ฐ›"; + fg = "#019833"; + } + { + name = "vi"; + text = "๎ ž"; + fg = "#fec60a"; + } + { + name = "vim"; + text = "๎˜ซ"; + fg = "#019833"; + } + { + name = "vsh"; + text = "๎šฌ"; + fg = "#5d87bf"; + } + { + name = "vsix"; + text = "๎œŒ"; + fg = "#854cc7"; + } + { + name = "vue"; + text = "๎š "; + fg = "#8dc149"; + } + { + name = "wasm"; + text = "๎šก"; + fg = "#5c4cdb"; + } + { + name = "wav"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "webm"; + text = "๎šŸ"; + fg = "#fd971f"; + } + { + name = "webmanifest"; + text = "๎˜‹"; + fg = "#f1e05a"; + } + { + name = "webp"; + text = "๎˜"; + fg = "#a074c4"; + } + { + name = "webpack"; + text = "๓ฐœซ"; + fg = "#519aba"; + } + { + name = "wma"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "woff"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "woff2"; + text = "๏€ฑ"; + fg = "#ececec"; + } + { + name = "wrl"; + text = "๓ฐ†ง"; + fg = "#888888"; + } + { + name = "wrz"; + text = "๓ฐ†ง"; + fg = "#888888"; + } + { + name = "wv"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "wvc"; + text = "๏€"; + fg = "#00afff"; + } + { + name = "x"; + text = "๎š‘"; + fg = "#599eff"; + } + { + name = "xaml"; + text = "๓ฐ™ณ"; + fg = "#512bd4"; + } + { + name = "xcf"; + text = "๏Œธ"; + fg = "#635b46"; + } + { + name = "xcplayground"; + text = "๎•"; + fg = "#e37933"; + } + { + name = "xcstrings"; + text = "๏†ซ"; + fg = "#2596be"; + } + { + name = "xls"; + text = "๓ฐˆ›"; + fg = "#207245"; + } + { + name = "xlsx"; + text = "๓ฐˆ›"; + fg = "#207245"; + } + { + name = "xm"; + text = "๎š‘"; + fg = "#519aba"; + } + { + name = "xml"; + text = "๓ฐ—€"; + fg = "#e37933"; + } + { + name = "xpi"; + text = "๎ž†"; + fg = "#ff1b01"; + } + { + name = "xul"; + text = "๎…"; + fg = "#e37933"; + } + { + name = "xz"; + text = "๏"; + fg = "#eca517"; + } + { + name = "yaml"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = "yml"; + text = "๎˜•"; + fg = "#6d8086"; + } + { + name = "zig"; + text = "๎šฉ"; + fg = "#f69a1b"; + } + { + name = "zip"; + text = "๏"; + fg = "#eca517"; + } + { + name = "zsh"; + text = "๎ž•"; + fg = "#89e051"; + } + { + name = "zst"; + text = "๏"; + fg = "#eca517"; + } + { + name = "๐Ÿ”ฅ"; + text = "๏ญ"; + fg = "#ff4c1f"; + } + ]; + conds = [ + { + "if" = "orphan"; + text = "๏ฑ"; + } + { + "if" = "link"; + text = "๏’"; + } + { + "if" = "block"; + text = "๏ƒ‰"; + } + { + "if" = "char"; + text = "๏‡€"; + } + { + "if" = "fifo"; + text = "๏‡‘"; + } + { + "if" = "sock"; + text = "๏‡ค"; + } + { + "if" = "sticky"; + text = "๏‡ผ"; + } + { + "if" = "dummy"; + text = "๏—"; + } + { + "if" = "dir"; + text = "๎—ฟ"; + } + { + "if" = "exec"; + text = "๏’‰"; + } + { + "if" = "!dir"; + text = "๏…›"; + } + ]; + }; +} diff --git a/modules/home/yazi/theme.toml b/modules/home/yazi/theme.toml deleted file mode 100644 index 603f703..0000000 --- a/modules/home/yazi/theme.toml +++ /dev/null @@ -1,873 +0,0 @@ -# A TOML linter such as https://taplo.tamasfe.dev/ can use this schema to validate your config. -# If you encounter any issues, please make an issue at https://github.com/yazi-rs/schemas. -"$schema" = "https://yazi-rs.github.io/schemas/theme.json" - - -[flavor] -dark = "" -light = "" - - -[manager] -cwd = { fg = "green" } - -# Hovered -hovered = { reversed = true } -preview_hovered = { underline = false } - -# Find -find_keyword = { fg = "yellow", bold = true, italic = true, underline = true } -find_position = { fg = "magenta", bg = "reset", bold = true, italic = true } - -# Marker -marker_copied = { fg = "lightgreen", bg = "lightgreen" } -marker_cut = { fg = "lightred", bg = "lightred" } -marker_marked = { fg = "lightcyan", bg = "lightcyan" } -marker_selected = { fg = "lightyellow", bg = "lightyellow" } - -# Tab -tab_active = { fg = "magenta", reversed = true } -tab_inactive = {} -tab_width = 1 - -# Count -count_copied = { fg = "white", bg = "green" } -count_cut = { fg = "white", bg = "red" } -count_selected = { fg = "white", bg = "yellow" } - -# Border -border_symbol = "โ”‚" -border_style = { fg = "gray", bold = true } - -# Highlighting -syntect_theme = "" - - -[mode] -normal_main = { bg = "green", fg = "black", bold = true } -normal_alt = { bg = "darkgray", fg = "white", bold = true } - -# Select mode -select_main = { bg = "red", bold = true } -select_alt = { fg = "red", bg = "gray" } - -# Unset mode -unset_main = { bg = "red", bold = true } -unset_alt = { fg = "red", bg = "gray" } - - -[status] -overall = { bold = true } -sep_left = ["โ–‘โ–’โ–“","โ–“โ–’โ–‘"] -sep_right = ["โ–‘โ–’โ–“","โ–“โ–’โ–‘"] - -# Permissions -perm_sep = { fg = "darkgray" } -perm_type = { fg = "yellow" } -perm_read = { fg = "green" } -perm_write = { fg = "cyan" } -perm_exec = { fg = "red" } - -# Progress -progress_label = { bold = true } -progress_normal = { fg = "green", bg = "black" } -progress_error = { fg = "red", bg = "black" } - - -[which] -cols = 3 -mask = { bg = "black" } -cand = { fg = "lightcyan" } -rest = { fg = "darkgray" } -desc = { fg = "lightmagenta" } -separator = " ๎ชœ " -separator_style = { fg = "darkgray" } - - -[confirm] -border = { fg = "gray" } -title = { fg = "blue", bold = true } -content = {} -list = {} -btn_yes = { bg = "green", fg = "black", bold = true } -btn_no = { bg = "red", fg = "black", bold = true } -btn_labels = [ " [Y]es ", " (N)o " ] - - -[spot] -border = { fg = "blue" } -title = { fg = "blue" } - -# Table -tbl_col = { fg = "blue" } -tbl_cell = { fg = "yellow", reversed = true } - - -[notify] -title_info = { fg = "green" } -title_warn = { fg = "yellow" } -title_error = { fg = "red" } - -# Icons -icon_info = "๏š" -icon_warn = "๏ฑ" -icon_error = "๏—" - - -[pick] -border = { fg = "blue" } -active = { fg = "magenta", bold = true } -inactive = {} - - -[input] -border = { fg = "green" } -title = { fg = "magenta", bold = true } -value = { fg = "white", bold = true } -selected = { reversed = true } - - -[cmp] -border = { fg = "blue" } -active = { reversed = true } -inactive = {} - -# Icons -icon_file = "๏…›" -icon_folder = "๏„•" -icon_command = "๏’‰" - - -[tasks] -border = { fg = "yellow" } -title = { fg = "white", bold = true } -hovered = { fg = "magenta", underline = true } - - -[help] -on = { fg = "cyan" } -run = { fg = "magenta" } -desc = {} -hovered = { reversed = true, bold = true } -footer = { fg = "black", bg = "white" } - - -[filetype] -rules = [ - # Images - { mime = "image/*", fg = "yellow" }, - - # Media - { mime = "{audio,video}/*", fg = "magenta" }, - - # Archives - { mime = "application/{zip,rar,7z*,tar,gzip,xz,zstd,bzip*,lzma,compress,archive,cpio,arj,xar,ms-cab*}", fg = "red" }, - - # Documents - { mime = "application/{pdf,doc,rtf}", fg = "cyan" }, - - # Empty files - # { mime = "inode/x-empty", fg = "red" }, - - # Special files - { name = "*", is = "orphan", bg = "red" }, - { name = "*", is = "exec" , fg = "green" }, - - # Dummy files - { name = "*", is = "dummy", bg = "red" }, - { name = "*/", is = "dummy", bg = "red" }, - - # Fallback - # { name = "*", fg = "white" }, - { name = "*/", fg = "blue" } -] - - -[icon] -globs = [] -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 = "๏‘‡" }, -] - - -files = [ - { name = ".babelrc", text = "๎˜น", fg = "#cbcb41" }, - { name = ".bash_profile", text = "๎˜•", fg = "#89e051" }, - { name = ".bashrc", text = "๎˜•", fg = "#89e051" }, - { name = ".clang-format", text = "๎˜•", fg = "#6d8086" }, - { name = ".clang-tidy", text = "๎˜•", fg = "#6d8086" }, - { name = ".codespellrc", text = "๓ฐ“†", fg = "#35da60" }, - { name = ".condarc", text = "๎œ•", fg = "#43b02a" }, - { name = ".dockerignore", text = "๓ฐกจ", fg = "#458ee6" }, - { name = ".ds_store", text = "๎˜•", fg = "#41535b" }, - { name = ".editorconfig", text = "๎™’", fg = "#fff2f2" }, - { name = ".env", text = "๏‘ข", fg = "#faf743" }, - { name = ".eslintignore", text = "๎™•", fg = "#4b32c3" }, - { name = ".eslintrc", text = "๎™•", fg = "#4b32c3" }, - { name = ".git-blame-ignore-revs", text = "๎œ‚", fg = "#f54d27" }, - { name = ".gitattributes", text = "๎œ‚", fg = "#f54d27" }, - { name = ".gitconfig", text = "๎˜•", fg = "#f54d27" }, - { name = ".gitignore", text = "๎œ‚", fg = "#f54d27" }, - { name = ".gitlab-ci.yml", text = "๏Š–", fg = "#e24329" }, - { name = ".gitmodules", text = "๎œ‚", fg = "#f54d27" }, - { name = ".gtkrc-2.0", text = "๏ข", fg = "#ffffff" }, - { name = ".gvimrc", text = "๎˜ซ", fg = "#019833" }, - { name = ".justfile", text = "๏‚ญ", fg = "#6d8086" }, - { name = ".luacheckrc", text = "๎˜•", fg = "#00a2ff" }, - { name = ".luaurc", text = "๎˜•", fg = "#00a2ff" }, - { name = ".mailmap", text = "๓ฐŠข", fg = "#f54d27" }, - { name = ".nanorc", text = "๎ ธ", fg = "#440077" }, - { name = ".npmignore", text = "๎œž", fg = "#e8274b" }, - { name = ".npmrc", text = "๎œž", fg = "#e8274b" }, - { name = ".nuxtrc", text = "๓ฑ„†", fg = "#00c58e" }, - { name = ".nvmrc", text = "๎œ˜", fg = "#5fa04e" }, - { name = ".pre-commit-config.yaml", text = "๓ฐ›ข", fg = "#f8b424" }, - { name = ".prettierignore", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.cjs", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.js", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.json", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.json5", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.mjs", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.toml", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.yaml", text = "๎šด", fg = "#4285f4" }, - { name = ".prettierrc.yml", text = "๎šด", fg = "#4285f4" }, - { name = ".pylintrc", text = "๎˜•", fg = "#6d8086" }, - { name = ".settings.json", text = "๎œŒ", fg = "#854cc7" }, - { name = ".SRCINFO", text = "๓ฐฃ‡", fg = "#0f94d2" }, - { name = ".vimrc", text = "๎˜ซ", fg = "#019833" }, - { name = ".Xauthority", text = "๏ฉ", fg = "#e54d18" }, - { name = ".xinitrc", text = "๏ฉ", fg = "#e54d18" }, - { name = ".Xresources", text = "๏ฉ", fg = "#e54d18" }, - { name = ".xsession", text = "๏ฉ", fg = "#e54d18" }, - { name = ".zprofile", text = "๎˜•", fg = "#89e051" }, - { name = ".zshenv", text = "๎˜•", fg = "#89e051" }, - { name = ".zshrc", text = "๎˜•", fg = "#89e051" }, - { name = "_gvimrc", text = "๎˜ซ", fg = "#019833" }, - { name = "_vimrc", text = "๎˜ซ", fg = "#019833" }, - { name = "AUTHORS", text = "๎ทŠ", fg = "#a172ff" }, - { name = "AUTHORS.txt", text = "๎ทŠ", fg = "#a172ff" }, - { name = "brewfile", text = "๎ž‘", fg = "#701516" }, - { name = "bspwmrc", text = "๏•", fg = "#2f2f2f" }, - { name = "build", text = "๎˜บ", fg = "#89e051" }, - { name = "build.gradle", text = "๎™ ", fg = "#005f87" }, - { name = "build.zig.zon", text = "๎šฉ", fg = "#f69a1b" }, - { name = "bun.lockb", text = "๎ฏ", fg = "#eadcd1" }, - { name = "cantorrc", text = "๏ณ", fg = "#1c99f3" }, - { name = "checkhealth", text = "๓ฐ“™", fg = "#75b4fb" }, - { name = "cmakelists.txt", text = "๎ž”", fg = "#dce3eb" }, - { name = "code_of_conduct", text = "๏’ฎ", fg = "#e41662" }, - { name = "code_of_conduct.md", text = "๏’ฎ", fg = "#e41662" }, - { name = "commit_editmsg", text = "๎œ‚", fg = "#f54d27" }, - { name = "commitlint.config.js", text = "๓ฐœ˜", fg = "#2b9689" }, - { name = "commitlint.config.ts", text = "๓ฐœ˜", fg = "#2b9689" }, - { name = "compose.yaml", text = "๓ฐกจ", fg = "#458ee6" }, - { name = "compose.yml", text = "๓ฐกจ", fg = "#458ee6" }, - { name = "config", text = "๎˜•", fg = "#6d8086" }, - { name = "containerfile", text = "๓ฐกจ", fg = "#458ee6" }, - { name = "copying", text = "๎˜Š", fg = "#cbcb41" }, - { name = "copying.lesser", text = "๎˜Š", fg = "#cbcb41" }, - { name = "Directory.Build.props", text = "๎˜•", fg = "#00a2ff" }, - { name = "Directory.Build.targets", text = "๎˜•", fg = "#00a2ff" }, - { name = "Directory.Packages.props", text = "๎˜•", fg = "#00a2ff" }, - { name = "docker-compose.yaml", text = "๓ฐกจ", fg = "#458ee6" }, - { name = "docker-compose.yml", text = "๓ฐกจ", fg = "#458ee6" }, - { name = "dockerfile", text = "๓ฐกจ", fg = "#458ee6" }, - { name = "eslint.config.cjs", text = "๎™•", fg = "#4b32c3" }, - { name = "eslint.config.js", text = "๎™•", fg = "#4b32c3" }, - { name = "eslint.config.mjs", text = "๎™•", fg = "#4b32c3" }, - { name = "eslint.config.ts", text = "๎™•", fg = "#4b32c3" }, - { name = "ext_typoscript_setup.txt", text = "๎ฒ", fg = "#ff8700" }, - { name = "favicon.ico", text = "๎˜ฃ", fg = "#cbcb41" }, - { name = "fp-info-cache", text = "๏Œ", fg = "#ffffff" }, - { name = "fp-lib-table", text = "๏Œ", fg = "#ffffff" }, - { name = "FreeCAD.conf", text = "๏Œถ", fg = "#cb333b" }, - { name = "Gemfile", text = "๎ž‘", fg = "#701516" }, - { name = "gnumakefile", text = "๎น", fg = "#6d8086" }, - { name = "go.mod", text = "๎˜ง", fg = "#519aba" }, - { name = "go.sum", text = "๎˜ง", fg = "#519aba" }, - { name = "go.work", text = "๎˜ง", fg = "#519aba" }, - { name = "gradle-wrapper.properties", text = "๎™ ", fg = "#005f87" }, - { name = "gradle.properties", text = "๎™ ", fg = "#005f87" }, - { name = "gradlew", text = "๎™ ", fg = "#005f87" }, - { name = "groovy", text = "๎ต", fg = "#4a687c" }, - { name = "gruntfile.babel.js", text = "๎˜‘", fg = "#e37933" }, - { name = "gruntfile.coffee", text = "๎˜‘", fg = "#e37933" }, - { name = "gruntfile.js", text = "๎˜‘", fg = "#e37933" }, - { name = "gruntfile.ts", text = "๎˜‘", fg = "#e37933" }, - { name = "gtkrc", text = "๏ข", fg = "#ffffff" }, - { name = "gulpfile.babel.js", text = "๎˜", fg = "#cc3e44" }, - { name = "gulpfile.coffee", text = "๎˜", fg = "#cc3e44" }, - { name = "gulpfile.js", text = "๎˜", fg = "#cc3e44" }, - { name = "gulpfile.ts", text = "๎˜", fg = "#cc3e44" }, - { name = "hypridle.conf", text = "๏™", fg = "#00aaae" }, - { name = "hyprland.conf", text = "๏™", fg = "#00aaae" }, - { name = "hyprlock.conf", text = "๏™", fg = "#00aaae" }, - { name = "hyprpaper.conf", text = "๏™", fg = "#00aaae" }, - { name = "i18n.config.js", text = "๓ฐ—Š", fg = "#7986cb" }, - { name = "i18n.config.ts", text = "๓ฐ—Š", fg = "#7986cb" }, - { name = "i3blocks.conf", text = "๏š", fg = "#e8ebee" }, - { name = "i3status.conf", text = "๏š", fg = "#e8ebee" }, - { name = "index.theme", text = "๎นฒ", fg = "#2db96f" }, - { name = "ionic.config.json", text = "๎žฉ", fg = "#4f8ff7" }, - { name = "justfile", text = "๏‚ญ", fg = "#6d8086" }, - { name = "kalgebrarc", text = "๏ณ", fg = "#1c99f3" }, - { name = "kdeglobals", text = "๏ณ", fg = "#1c99f3" }, - { name = "kdenlive-layoutsrc", text = "๏Œผ", fg = "#83b8f2" }, - { name = "kdenliverc", text = "๏Œผ", fg = "#83b8f2" }, - { name = "kritadisplayrc", text = "๏Œฝ", fg = "#f245fb" }, - { name = "kritarc", text = "๏Œฝ", fg = "#f245fb" }, - { name = "license", text = "๎˜Š", fg = "#d0bf41" }, - { name = "license.md", text = "๎˜Š", fg = "#d0bf41" }, - { name = "lxde-rc.xml", text = "๏ฃ", fg = "#909090" }, - { name = "lxqt.conf", text = "๏ค", fg = "#0192d3" }, - { name = "makefile", text = "๎น", fg = "#6d8086" }, - { name = "mix.lock", text = "๎˜ญ", fg = "#a074c4" }, - { name = "mpv.conf", text = "๏ฎ", fg = "#3b1342" }, - { name = "node_modules", text = "๎œ˜", fg = "#e8274b" }, - { name = "nuxt.config.cjs", text = "๓ฑ„†", fg = "#00c58e" }, - { name = "nuxt.config.js", text = "๓ฑ„†", fg = "#00c58e" }, - { name = "nuxt.config.mjs", text = "๓ฑ„†", fg = "#00c58e" }, - { name = "nuxt.config.ts", text = "๓ฑ„†", fg = "#00c58e" }, - { name = "package-lock.json", text = "๎œž", fg = "#7a0d21" }, - { name = "package.json", text = "๎œž", fg = "#e8274b" }, - { name = "PKGBUILD", text = "๏Œƒ", fg = "#0f94d2" }, - { name = "platformio.ini", text = "๎š‚", fg = "#f6822b" }, - { name = "pom.xml", text = "๎™ด", fg = "#7a0d21" }, - { name = "prettier.config.cjs", text = "๎šด", fg = "#4285f4" }, - { name = "prettier.config.js", text = "๎šด", fg = "#4285f4" }, - { name = "prettier.config.mjs", text = "๎šด", fg = "#4285f4" }, - { name = "prettier.config.ts", text = "๎šด", fg = "#4285f4" }, - { name = "procfile", text = "๎˜‡", fg = "#a074c4" }, - { name = "PrusaSlicer.ini", text = "๏‘", fg = "#ec6b23" }, - { name = "PrusaSlicerGcodeViewer.ini", text = "๏‘", fg = "#ec6b23" }, - { name = "py.typed", text = "๎˜†", fg = "#ffbc03" }, - { name = "QtProject.conf", text = "๏ต", fg = "#40cd52" }, - { name = "rakefile", text = "๎ž‘", fg = "#701516" }, - { name = "readme", text = "๓ฐ‚บ", fg = "#ededed" }, - { name = "readme.md", text = "๓ฐ‚บ", fg = "#ededed" }, - { name = "rmd", text = "๎˜‰", fg = "#519aba" }, - { name = "robots.txt", text = "๓ฐšฉ", fg = "#5d7096" }, - { name = "security", text = "๓ฐ’ƒ", fg = "#bec4c9" }, - { name = "security.md", text = "๓ฐ’ƒ", fg = "#bec4c9" }, - { name = "settings.gradle", text = "๎™ ", fg = "#005f87" }, - { name = "svelte.config.js", text = "๎š—", fg = "#ff3e00" }, - { name = "sxhkdrc", text = "๏•", fg = "#2f2f2f" }, - { name = "sym-lib-table", text = "๏Œ", fg = "#ffffff" }, - { name = "tailwind.config.js", text = "๓ฑฟ", fg = "#20c2e3" }, - { name = "tailwind.config.mjs", text = "๓ฑฟ", fg = "#20c2e3" }, - { name = "tailwind.config.ts", text = "๓ฑฟ", fg = "#20c2e3" }, - { name = "tmux.conf", text = "๎ฏˆ", fg = "#14ba19" }, - { name = "tmux.conf.local", text = "๎ฏˆ", fg = "#14ba19" }, - { name = "tsconfig.json", text = "๎š", fg = "#519aba" }, - { name = "unlicense", text = "๎˜Š", fg = "#d0bf41" }, - { name = "vagrantfile", text = "๏Šธ", fg = "#1563ff" }, - { name = "vercel.json", text = "๎ฃ“", fg = "#ffffff" }, - { name = "vlcrc", text = "๓ฐ•ผ", fg = "#ee7a00" }, - { name = "webpack", text = "๓ฐœซ", fg = "#519aba" }, - { name = "weston.ini", text = "๏ง", fg = "#ffbb01" }, - { name = "workspace", text = "๎˜บ", fg = "#89e051" }, - { name = "xmobarrc", text = "๏ž", fg = "#fd4d5d" }, - { name = "xmobarrc.hs", text = "๏ž", fg = "#fd4d5d" }, - { name = "xmonad.hs", text = "๏ž", fg = "#fd4d5d" }, - { name = "xorg.conf", text = "๏ฉ", fg = "#e54d18" }, - { name = "xsettingsd.conf", text = "๏ฉ", fg = "#e54d18" }, -] - - -exts = [ - { name = "3gp", text = "๎šŸ", fg = "#fd971f" }, - { name = "3mf", text = "๓ฐ†ง", fg = "#888888" }, - { name = "7z", text = "๏", fg = "#eca517" }, - { name = "a", text = "๎ฎœ", fg = "#dcddd6" }, - { name = "aac", text = "๏€", fg = "#00afff" }, - { name = "adb", text = "๎šต", fg = "#22ffff" }, - { name = "ads", text = "๎šต", fg = "#ffffff" }, - { name = "ai", text = "๎žด", fg = "#cbcb41" }, - { name = "aif", text = "๏€", fg = "#00afff" }, - { name = "aiff", text = "๏€", fg = "#00afff" }, - { name = "android", text = "๎œŽ", fg = "#34a853" }, - { name = "ape", text = "๏€", fg = "#00afff" }, - { name = "apk", text = "๎œŽ", fg = "#34a853" }, - { name = "apl", text = "๎œฐ", fg = "#24a148" }, - { name = "app", text = "๎ซจ", fg = "#9f0500" }, - { name = "applescript", text = "๏…น", fg = "#6d8085" }, - { name = "asc", text = "๓ฐฆ", fg = "#576d7f" }, - { name = "asm", text = "๎˜ท", fg = "#0091bd" }, - { name = "ass", text = "๓ฐจ–", fg = "#ffb713" }, - { name = "astro", text = "๎šณ", fg = "#e23f67" }, - { name = "avif", text = "๎˜", fg = "#a074c4" }, - { name = "awk", text = "๎ž•", fg = "#4d5a5e" }, - { name = "azcli", text = "๎ฏจ", fg = "#0078d4" }, - { name = "bak", text = "๓ฐฏ", fg = "#6d8086" }, - { name = "bash", text = "๎ž•", fg = "#89e051" }, - { name = "bat", text = "๎˜•", fg = "#c1f12e" }, - { name = "bazel", text = "๎˜บ", fg = "#89e051" }, - { name = "bib", text = "๓ฑ‰Ÿ", fg = "#cbcb41" }, - { name = "bicep", text = "๎˜ป", fg = "#519aba" }, - { name = "bicepparam", text = "๎˜ป", fg = "#9f74b3" }, - { name = "bin", text = "๎ซจ", fg = "#9f0500" }, - { name = "blade.php", text = "๏‹ท", fg = "#f05340" }, - { name = "blend", text = "๓ฐ‚ซ", fg = "#ea7600" }, - { name = "blp", text = "๓ฐบพ", fg = "#5796e2" }, - { name = "bmp", text = "๎˜", fg = "#a074c4" }, - { name = "bqn", text = "๎œฐ", fg = "#24a148" }, - { name = "brep", text = "๓ฐปซ", fg = "#839463" }, - { name = "bz", text = "๏", fg = "#eca517" }, - { name = "bz2", text = "๏", fg = "#eca517" }, - { name = "bz3", text = "๏", fg = "#eca517" }, - { name = "bzl", text = "๎˜บ", fg = "#89e051" }, - { name = "c", text = "๎˜ž", fg = "#599eff" }, - { name = "c++", text = "๎˜", fg = "#f34b7d" }, - { name = "cache", text = "๏’›", fg = "#ffffff" }, - { name = "cast", text = "๎šŸ", fg = "#fd971f" }, - { name = "cbl", text = "๏ฃ", fg = "#005ca5" }, - { name = "cc", text = "๎˜", fg = "#f34b7d" }, - { name = "ccm", text = "๎˜", fg = "#f34b7d" }, - { name = "cfg", text = "๎˜•", fg = "#6d8086" }, - { name = "cjs", text = "๎˜Œ", fg = "#cbcb41" }, - { name = "clj", text = "๎จ", fg = "#8dc149" }, - { name = "cljc", text = "๎จ", fg = "#8dc149" }, - { name = "cljd", text = "๎ช", fg = "#519aba" }, - { name = "cljs", text = "๎ช", fg = "#519aba" }, - { name = "cmake", text = "๎ž”", fg = "#dce3eb" }, - { name = "cob", text = "๏ฃ", fg = "#005ca5" }, - { name = "cobol", text = "๏ฃ", fg = "#005ca5" }, - { name = "coffee", text = "๎˜›", fg = "#cbcb41" }, - { name = "conda", text = "๎œ•", fg = "#43b02a" }, - { name = "conf", text = "๎˜•", fg = "#6d8086" }, - { name = "config.ru", text = "๎ž‘", fg = "#701516" }, - { name = "cow", text = "๓ฐ†š", fg = "#965824" }, - { name = "cp", text = "๎˜", fg = "#519aba" }, - { name = "cpp", text = "๎˜", fg = "#519aba" }, - { name = "cppm", text = "๎˜", fg = "#519aba" }, - { name = "cpy", text = "๏ฃ", fg = "#005ca5" }, - { name = "cr", text = "๎˜ฏ", fg = "#c8c8c8" }, - { name = "crdownload", text = "๏€™", fg = "#44cda8" }, - { name = "cs", text = "๓ฐŒ›", fg = "#596706" }, - { name = "csh", text = "๎ž•", fg = "#4d5a5e" }, - { name = "cshtml", text = "๓ฑฆ—", fg = "#512bd4" }, - { name = "cson", text = "๎˜‹", fg = "#cbcb41" }, - { name = "csproj", text = "๓ฐชฎ", fg = "#512bd4" }, - { name = "css", text = "๎‰", fg = "#42a5f5" }, - { name = "csv", text = "๎™Š", fg = "#89e051" }, - { name = "cts", text = "๎˜จ", fg = "#519aba" }, - { name = "cu", text = "๎™‹", fg = "#89e051" }, - { name = "cue", text = "๓ฐฒน", fg = "#ed95ae" }, - { name = "cuh", text = "๎™‹", fg = "#a074c4" }, - { name = "cxx", text = "๎˜", fg = "#519aba" }, - { name = "cxxm", text = "๎˜", fg = "#519aba" }, - { name = "d", text = "๎žฏ", fg = "#b03931" }, - { name = "d.ts", text = "๎˜จ", fg = "#d59855" }, - { name = "dart", text = "๎ž˜", fg = "#03589c" }, - { name = "db", text = "๎œ†", fg = "#dad8d8" }, - { name = "dconf", text = "๏ก", fg = "#ffffff" }, - { name = "desktop", text = "๏„ˆ", fg = "#563d7c" }, - { name = "diff", text = "๎œจ", fg = "#41535b" }, - { name = "dll", text = "๎ฎœ", fg = "#4d2c0b" }, - { name = "doc", text = "๓ฐˆฌ", fg = "#185abd" }, - { name = "Dockerfile", text = "๓ฐกจ", fg = "#458ee6" }, - { name = "docx", text = "๓ฐˆฌ", fg = "#185abd" }, - { name = "dot", text = "๓ฑ‰", fg = "#30638e" }, - { name = "download", text = "๏€™", fg = "#44cda8" }, - { name = "drl", text = "๎ŠŒ", fg = "#ffafaf" }, - { name = "dropbox", text = "๎œ‡", fg = "#0061fe" }, - { name = "dump", text = "๎œ†", fg = "#dad8d8" }, - { name = "dwg", text = "๓ฐปซ", fg = "#839463" }, - { name = "dxf", text = "๓ฐปซ", fg = "#839463" }, - { name = "ebook", text = "๎Š‹", fg = "#eab16d" }, - { name = "ebuild", text = "๏Œ", fg = "#4c416e" }, - { name = "edn", text = "๎ช", fg = "#519aba" }, - { name = "eex", text = "๎˜ญ", fg = "#a074c4" }, - { name = "ejs", text = "๎˜Ž", fg = "#cbcb41" }, - { name = "el", text = "๎˜ฒ", fg = "#8172be" }, - { name = "elc", text = "๎˜ฒ", fg = "#8172be" }, - { name = "elf", text = "๎ซจ", fg = "#9f0500" }, - { name = "elm", text = "๎˜ฌ", fg = "#519aba" }, - { name = "eln", text = "๎˜ฒ", fg = "#8172be" }, - { name = "env", text = "๏‘ข", fg = "#faf743" }, - { name = "eot", text = "๏€ฑ", fg = "#ececec" }, - { name = "epp", text = "๎˜ฑ", fg = "#ffa61a" }, - { name = "epub", text = "๎Š‹", fg = "#eab16d" }, - { name = "erb", text = "๎˜Ž", fg = "#701516" }, - { name = "erl", text = "๎žฑ", fg = "#b83998" }, - { name = "ex", text = "๎˜ญ", fg = "#a074c4" }, - { name = "exe", text = "๎ซจ", fg = "#9f0500" }, - { name = "exs", text = "๎˜ญ", fg = "#a074c4" }, - { name = "f#", text = "๎žง", fg = "#519aba" }, - { name = "f3d", text = "๓ฐปซ", fg = "#839463" }, - { name = "f90", text = "๓ฑˆš", fg = "#734f96" }, - { name = "fbx", text = "๓ฐ†ง", fg = "#888888" }, - { name = "fcbak", text = "๏Œถ", fg = "#cb333b" }, - { name = "fcmacro", text = "๏Œถ", fg = "#cb333b" }, - { name = "fcmat", text = "๏Œถ", fg = "#cb333b" }, - { name = "fcparam", text = "๏Œถ", fg = "#cb333b" }, - { name = "fcscript", text = "๏Œถ", fg = "#cb333b" }, - { name = "fcstd", text = "๏Œถ", fg = "#cb333b" }, - { name = "fcstd1", text = "๏Œถ", fg = "#cb333b" }, - { name = "fctb", text = "๏Œถ", fg = "#cb333b" }, - { name = "fctl", text = "๏Œถ", fg = "#cb333b" }, - { name = "fdmdownload", text = "๏€™", fg = "#44cda8" }, - { name = "fish", text = "๎ž•", fg = "#4d5a5e" }, - { name = "flac", text = "๏€", fg = "#0075aa" }, - { name = "flc", text = "๏€ฑ", fg = "#ececec" }, - { name = "flf", text = "๏€ฑ", fg = "#ececec" }, - { name = "fnl", text = "๎šฏ", fg = "#fff3d7" }, - { name = "fodg", text = "๏น", fg = "#fffb57" }, - { name = "fodp", text = "๏บ", fg = "#fe9c45" }, - { name = "fods", text = "๏ธ", fg = "#78fc4e" }, - { name = "fodt", text = "๏ผ", fg = "#2dcbfd" }, - { name = "fs", text = "๎žง", fg = "#519aba" }, - { name = "fsi", text = "๎žง", fg = "#519aba" }, - { name = "fsscript", text = "๎žง", fg = "#519aba" }, - { name = "fsx", text = "๎žง", fg = "#519aba" }, - { name = "gcode", text = "๓ฐซ", fg = "#1471ad" }, - { name = "gd", text = "๎™Ÿ", fg = "#6d8086" }, - { name = "gemspec", text = "๎ž‘", fg = "#701516" }, - { name = "gif", text = "๎˜", fg = "#a074c4" }, - { name = "git", text = "๎œ‚", fg = "#f14c28" }, - { name = "glb", text = "๏†ฒ", fg = "#ffb13b" }, - { name = "gleam", text = "๏€…", fg = "#ffaff3" }, - { name = "gnumakefile", text = "๎น", fg = "#6d8086" }, - { name = "go", text = "๎˜ง", fg = "#519aba" }, - { name = "godot", text = "๎™Ÿ", fg = "#6d8086" }, - { name = "gpr", text = "๎šต", fg = "#ff33ff" }, - { name = "gql", text = "๏ˆŽ", fg = "#e535ab" }, - { name = "gradle", text = "๎™ ", fg = "#005f87" }, - { name = "graphql", text = "๏ˆŽ", fg = "#e535ab" }, - { name = "gresource", text = "๏ข", fg = "#ffffff" }, - { name = "gv", text = "๓ฑ‰", fg = "#30638e" }, - { name = "gz", text = "๏", fg = "#eca517" }, - { name = "h", text = "๏ƒฝ", fg = "#a074c4" }, - { name = "haml", text = "๎˜Ž", fg = "#eaeae1" }, - { name = "hbs", text = "๎˜", fg = "#f0772b" }, - { name = "heex", text = "๎˜ญ", fg = "#a074c4" }, - { name = "hex", text = "๎™ง", fg = "#2e63ff" }, - { name = "hh", text = "๏ƒฝ", fg = "#a074c4" }, - { name = "hpp", text = "๏ƒฝ", fg = "#a074c4" }, - { name = "hrl", text = "๎žฑ", fg = "#b83998" }, - { name = "hs", text = "๎˜Ÿ", fg = "#a074c4" }, - { name = "htm", text = "๎˜Ž", fg = "#e34c26" }, - { name = "html", text = "๎œถ", fg = "#e44d26" }, - { name = "http", text = "๏‡˜", fg = "#008ec7" }, - { name = "huff", text = "๓ฐก˜", fg = "#4242c7" }, - { name = "hurl", text = "๏ƒฌ", fg = "#ff0288" }, - { name = "hx", text = "๎™ฆ", fg = "#ea8220" }, - { name = "hxx", text = "๏ƒฝ", fg = "#a074c4" }, - { name = "ical", text = "๏ณ", fg = "#2b2e83" }, - { name = "icalendar", text = "๏ณ", fg = "#2b2e83" }, - { name = "ico", text = "๎˜", fg = "#cbcb41" }, - { name = "ics", text = "๏ณ", fg = "#2b2e83" }, - { name = "ifb", text = "๏ณ", fg = "#2b2e83" }, - { name = "ifc", text = "๓ฐปซ", fg = "#839463" }, - { name = "ige", text = "๓ฐปซ", fg = "#839463" }, - { name = "iges", text = "๓ฐปซ", fg = "#839463" }, - { name = "igs", text = "๓ฐปซ", fg = "#839463" }, - { name = "image", text = "๎‰ฑ", fg = "#d0bec8" }, - { name = "img", text = "๎‰ฑ", fg = "#d0bec8" }, - { name = "import", text = "๏ƒ†", fg = "#ececec" }, - { name = "info", text = "๏„ฉ", fg = "#ffffcd" }, - { name = "ini", text = "๎˜•", fg = "#6d8086" }, - { name = "ino", text = "๏‹", fg = "#56b6c2" }, - { name = "ipynb", text = "๎ ", fg = "#f57d01" }, - { name = "iso", text = "๎‰ฑ", fg = "#d0bec8" }, - { name = "ixx", text = "๎˜", fg = "#519aba" }, - { name = "java", text = "๎œธ", fg = "#cc3e44" }, - { name = "jl", text = "๎˜ค", fg = "#a270ba" }, - { name = "jpeg", text = "๎˜", fg = "#a074c4" }, - { name = "jpg", text = "๎˜", fg = "#a074c4" }, - { name = "js", text = "๎˜Œ", fg = "#cbcb41" }, - { name = "json", text = "๎˜‹", fg = "#cbcb41" }, - { name = "json5", text = "๎˜‹", fg = "#cbcb41" }, - { name = "jsonc", text = "๎˜‹", fg = "#cbcb41" }, - { name = "jsx", text = "๎˜ฅ", fg = "#20c2e3" }, - { name = "jwmrc", text = "๏›", fg = "#0078cd" }, - { name = "jxl", text = "๎˜", fg = "#a074c4" }, - { name = "kbx", text = "๓ฐฏ„", fg = "#737672" }, - { name = "kdb", text = "๏ˆพ", fg = "#529b34" }, - { name = "kdbx", text = "๏ˆพ", fg = "#529b34" }, - { name = "kdenlive", text = "๏Œผ", fg = "#83b8f2" }, - { name = "kdenlivetitle", text = "๏Œผ", fg = "#83b8f2" }, - { name = "kicad_dru", text = "๏Œ", fg = "#ffffff" }, - { name = "kicad_mod", text = "๏Œ", fg = "#ffffff" }, - { name = "kicad_pcb", text = "๏Œ", fg = "#ffffff" }, - { name = "kicad_prl", text = "๏Œ", fg = "#ffffff" }, - { name = "kicad_pro", text = "๏Œ", fg = "#ffffff" }, - { name = "kicad_sch", text = "๏Œ", fg = "#ffffff" }, - { name = "kicad_sym", text = "๏Œ", fg = "#ffffff" }, - { name = "kicad_wks", text = "๏Œ", fg = "#ffffff" }, - { name = "ko", text = "๏…ผ", fg = "#dcddd6" }, - { name = "kpp", text = "๏Œฝ", fg = "#f245fb" }, - { name = "kra", text = "๏Œฝ", fg = "#f245fb" }, - { name = "krz", text = "๏Œฝ", fg = "#f245fb" }, - { name = "ksh", text = "๎ž•", fg = "#4d5a5e" }, - { name = "kt", text = "๎˜ด", fg = "#7f52ff" }, - { name = "kts", text = "๎˜ด", fg = "#7f52ff" }, - { name = "lck", text = "๎™ฒ", fg = "#bbbbbb" }, - { name = "leex", text = "๎˜ญ", fg = "#a074c4" }, - { name = "less", text = "๎˜”", fg = "#563d7c" }, - { name = "lff", text = "๏€ฑ", fg = "#ececec" }, - { name = "lhs", text = "๎˜Ÿ", fg = "#a074c4" }, - { name = "lib", text = "๎ฎœ", fg = "#4d2c0b" }, - { name = "license", text = "๎˜Š", fg = "#cbcb41" }, - { name = "liquid", text = "๎™ฐ", fg = "#95bf47" }, - { name = "lock", text = "๎™ฒ", fg = "#bbbbbb" }, - { name = "log", text = "๓ฐŒฑ", fg = "#dddddd" }, - { name = "lrc", text = "๓ฐจ–", fg = "#ffb713" }, - { name = "lua", text = "๎˜ ", fg = "#51a0cf" }, - { name = "luac", text = "๎˜ ", fg = "#51a0cf" }, - { name = "luau", text = "๎˜ ", fg = "#00a2ff" }, - { name = "m", text = "๎˜ž", fg = "#599eff" }, - { name = "m3u", text = "๓ฐฒน", fg = "#ed95ae" }, - { name = "m3u8", text = "๓ฐฒน", fg = "#ed95ae" }, - { name = "m4a", text = "๏€", fg = "#00afff" }, - { name = "m4v", text = "๎šŸ", fg = "#fd971f" }, - { name = "magnet", text = "๏ถ", fg = "#a51b16" }, - { name = "makefile", text = "๎น", fg = "#6d8086" }, - { name = "markdown", text = "๎˜‰", fg = "#dddddd" }, - { name = "material", text = "๎Šฆ", fg = "#b83998" }, - { name = "md", text = "๏’Š", fg = "#dddddd" }, - { name = "md5", text = "๓ฐ•ฅ", fg = "#8c86af" }, - { name = "mdx", text = "๏’Š", fg = "#519aba" }, - { name = "mint", text = "๓ฐŒช", fg = "#87c095" }, - { name = "mjs", text = "๎˜Œ", fg = "#f1e05a" }, - { name = "mk", text = "๎น", fg = "#6d8086" }, - { name = "mkv", text = "๎šŸ", fg = "#fd971f" }, - { name = "ml", text = "๎™บ", fg = "#e37933" }, - { name = "mli", text = "๎™บ", fg = "#e37933" }, - { name = "mm", text = "๎˜", fg = "#519aba" }, - { name = "mo", text = "๎ทพ", fg = "#9772fb" }, - { name = "mobi", text = "๎Š‹", fg = "#eab16d" }, - { name = "mojo", text = "๏ญ", fg = "#ff4c1f" }, - { name = "mov", text = "๎šŸ", fg = "#fd971f" }, - { name = "mp3", text = "๏€", fg = "#00afff" }, - { name = "mp4", text = "๎šŸ", fg = "#fd971f" }, - { name = "mpp", text = "๎˜", fg = "#519aba" }, - { name = "msf", text = "๏ฐ", fg = "#137be1" }, - { name = "mts", text = "๎˜จ", fg = "#519aba" }, - { name = "mustache", text = "๎˜", fg = "#e37933" }, - { name = "nfo", text = "๏„ฉ", fg = "#ffffcd" }, - { name = "nim", text = "๎™ท", fg = "#f3d400" }, - { name = "nix", text = "๏Œ“", fg = "#7ebae4" }, - { name = "norg", text = "๎ก‡", fg = "#4878be" }, - { name = "nswag", text = "๎˜‹", fg = "#85ea2d" }, - { name = "nu", text = "๏”", fg = "#3aa675" }, - { name = "o", text = "๎ซจ", fg = "#9f0500" }, - { name = "obj", text = "๓ฐ†ง", fg = "#888888" }, - { name = "odf", text = "๏ป", fg = "#ff5a96" }, - { name = "odg", text = "๏น", fg = "#fffb57" }, - { name = "odin", text = "๓ฐŸข", fg = "#3882d2" }, - { name = "odp", text = "๏บ", fg = "#fe9c45" }, - { name = "ods", text = "๏ธ", fg = "#78fc4e" }, - { name = "odt", text = "๏ผ", fg = "#2dcbfd" }, - { name = "oga", text = "๏€", fg = "#0075aa" }, - { name = "ogg", text = "๏€", fg = "#0075aa" }, - { name = "ogv", text = "๎šŸ", fg = "#fd971f" }, - { name = "ogx", text = "๎šŸ", fg = "#fd971f" }, - { name = "opus", text = "๏€", fg = "#0075aa" }, - { name = "org", text = "๎˜ณ", fg = "#77aa99" }, - { name = "otf", text = "๏€ฑ", fg = "#ececec" }, - { name = "out", text = "๎ซจ", fg = "#9f0500" }, - { name = "part", text = "๏€™", fg = "#44cda8" }, - { name = "patch", text = "๎œจ", fg = "#41535b" }, - { name = "pck", text = "๏’‡", fg = "#6d8086" }, - { name = "pcm", text = "๏€", fg = "#0075aa" }, - { name = "pdf", text = "๎ซซ", fg = "#b30b00" }, - { name = "php", text = "๎˜ˆ", fg = "#a074c4" }, - { name = "pl", text = "๎ฉ", fg = "#519aba" }, - { name = "pls", text = "๓ฐฒน", fg = "#ed95ae" }, - { name = "ply", text = "๓ฐ†ง", fg = "#888888" }, - { name = "pm", text = "๎ฉ", fg = "#519aba" }, - { name = "png", text = "๎˜", fg = "#a074c4" }, - { name = "po", text = "๏†ซ", fg = "#2596be" }, - { name = "pot", text = "๏†ซ", fg = "#2596be" }, - { name = "pp", text = "๎˜ฑ", fg = "#ffa61a" }, - { name = "ppt", text = "๓ฐˆง", fg = "#cb4a32" }, - { name = "pptx", text = "๓ฐˆง", fg = "#cb4a32" }, - { name = "prisma", text = "๎š„", fg = "#5a67d8" }, - { name = "pro", text = "๎žก", fg = "#e4b854" }, - { name = "ps1", text = "๓ฐจŠ", fg = "#4273ca" }, - { name = "psb", text = "๎žธ", fg = "#519aba" }, - { name = "psd", text = "๎žธ", fg = "#519aba" }, - { name = "psd1", text = "๓ฐจŠ", fg = "#6975c4" }, - { name = "psm1", text = "๓ฐจŠ", fg = "#6975c4" }, - { name = "pub", text = "๓ฐท–", fg = "#e3c58e" }, - { name = "pxd", text = "๎˜†", fg = "#5aa7e4" }, - { name = "pxi", text = "๎˜†", fg = "#5aa7e4" }, - { name = "py", text = "๎˜†", fg = "#ffbc03" }, - { name = "pyc", text = "๎˜†", fg = "#ffe291" }, - { name = "pyd", text = "๎˜†", fg = "#ffe291" }, - { name = "pyi", text = "๎˜†", fg = "#ffbc03" }, - { name = "pyo", text = "๎˜†", fg = "#ffe291" }, - { name = "pyw", text = "๎˜†", fg = "#5aa7e4" }, - { name = "pyx", text = "๎˜†", fg = "#5aa7e4" }, - { name = "qm", text = "๏†ซ", fg = "#2596be" }, - { name = "qml", text = "๏ต", fg = "#40cd52" }, - { name = "qrc", text = "๏ต", fg = "#40cd52" }, - { name = "qss", text = "๏ต", fg = "#40cd52" }, - { name = "query", text = "๎ˆœ", fg = "#90a850" }, - { name = "r", text = "๓ฐŸ”", fg = "#2266ba" }, - { name = "R", text = "๓ฐŸ”", fg = "#2266ba" }, - { name = "rake", text = "๎ž‘", fg = "#701516" }, - { name = "rar", text = "๏", fg = "#eca517" }, - { name = "razor", text = "๓ฑฆ˜", fg = "#512bd4" }, - { name = "rb", text = "๎ž‘", fg = "#701516" }, - { name = "res", text = "๎šˆ", fg = "#cc3e44" }, - { name = "resi", text = "๎šˆ", fg = "#f55385" }, - { name = "rlib", text = "๎žจ", fg = "#dea584" }, - { name = "rmd", text = "๎˜‰", fg = "#519aba" }, - { name = "rproj", text = "๓ฐ—†", fg = "#358a5b" }, - { name = "rs", text = "๎š‹", fg = "#dea584" }, - { name = "rss", text = "๎˜™", fg = "#fb9d3b" }, - { name = "s", text = "๎˜ท", fg = "#0071c5" }, - { name = "sass", text = "๎˜ƒ", fg = "#f55385" }, - { name = "sbt", text = "๎œท", fg = "#cc3e44" }, - { name = "sc", text = "๎œท", fg = "#cc3e44" }, - { name = "scad", text = "๏Ž", fg = "#f9d72c" }, - { name = "scala", text = "๎œท", fg = "#cc3e44" }, - { name = "scm", text = "๓ฐ˜ง", fg = "#eeeeee" }, - { name = "scss", text = "๎˜ƒ", fg = "#f55385" }, - { name = "sh", text = "๎ž•", fg = "#4d5a5e" }, - { name = "sha1", text = "๓ฐ•ฅ", fg = "#8c86af" }, - { name = "sha224", text = "๓ฐ•ฅ", fg = "#8c86af" }, - { name = "sha256", text = "๓ฐ•ฅ", fg = "#8c86af" }, - { name = "sha384", text = "๓ฐ•ฅ", fg = "#8c86af" }, - { name = "sha512", text = "๓ฐ•ฅ", fg = "#8c86af" }, - { name = "sig", text = "๓ฐ˜ง", fg = "#e37933" }, - { name = "signature", text = "๓ฐ˜ง", fg = "#e37933" }, - { name = "skp", text = "๓ฐปซ", fg = "#839463" }, - { name = "sldasm", text = "๓ฐปซ", fg = "#839463" }, - { name = "sldprt", text = "๓ฐปซ", fg = "#839463" }, - { name = "slim", text = "๎˜Ž", fg = "#e34c26" }, - { name = "sln", text = "๎œŒ", fg = "#854cc7" }, - { name = "slnx", text = "๎œŒ", fg = "#854cc7" }, - { name = "slvs", text = "๓ฐปซ", fg = "#839463" }, - { name = "sml", text = "๓ฐ˜ง", fg = "#e37933" }, - { name = "so", text = "๎ฎœ", fg = "#dcddd6" }, - { name = "sol", text = "๎™–", fg = "#519aba" }, - { name = "spec.js", text = "๏’™", fg = "#cbcb41" }, - { name = "spec.jsx", text = "๏’™", fg = "#20c2e3" }, - { name = "spec.ts", text = "๏’™", fg = "#519aba" }, - { name = "spec.tsx", text = "๏’™", fg = "#1354bf" }, - { name = "spx", text = "๏€", fg = "#0075aa" }, - { name = "sql", text = "๎œ†", fg = "#dad8d8" }, - { name = "sqlite", text = "๎œ†", fg = "#dad8d8" }, - { name = "sqlite3", text = "๎œ†", fg = "#dad8d8" }, - { name = "srt", text = "๓ฐจ–", fg = "#ffb713" }, - { name = "ssa", text = "๓ฐจ–", fg = "#ffb713" }, - { name = "ste", text = "๓ฐปซ", fg = "#839463" }, - { name = "step", text = "๓ฐปซ", fg = "#839463" }, - { name = "stl", text = "๓ฐ†ง", fg = "#888888" }, - { name = "stp", text = "๓ฐปซ", fg = "#839463" }, - { name = "strings", text = "๏†ซ", fg = "#2596be" }, - { name = "styl", text = "๎˜€", fg = "#8dc149" }, - { name = "sub", text = "๓ฐจ–", fg = "#ffb713" }, - { name = "sublime", text = "๎žช", fg = "#e37933" }, - { name = "suo", text = "๎œŒ", fg = "#854cc7" }, - { name = "sv", text = "๓ฐ›", fg = "#019833" }, - { name = "svelte", text = "๎š—", fg = "#ff3e00" }, - { name = "svg", text = "๓ฐœก", fg = "#ffb13b" }, - { name = "svh", text = "๓ฐ›", fg = "#019833" }, - { name = "swift", text = "๎•", fg = "#e37933" }, - { name = "t", text = "๎ฉ", fg = "#519aba" }, - { name = "tbc", text = "๓ฐ›“", fg = "#1e5cb3" }, - { name = "tcl", text = "๓ฐ›“", fg = "#1e5cb3" }, - { name = "templ", text = "๎ซ„", fg = "#dbbd30" }, - { name = "terminal", text = "๏’‰", fg = "#31b53e" }, - { name = "test.js", text = "๏’™", fg = "#cbcb41" }, - { name = "test.jsx", text = "๏’™", fg = "#20c2e3" }, - { name = "test.ts", text = "๏’™", fg = "#519aba" }, - { name = "test.tsx", text = "๏’™", fg = "#1354bf" }, - { name = "tex", text = "๎š›", fg = "#3d6117" }, - { name = "tf", text = "๎šš", fg = "#5f43e9" }, - { name = "tfvars", text = "๏…›", fg = "#5f43e9" }, - { name = "tgz", text = "๏", fg = "#eca517" }, - { name = "tmux", text = "๎ฏˆ", fg = "#14ba19" }, - { name = "toml", text = "๎šฒ", fg = "#9c4221" }, - { name = "torrent", text = "๏€™", fg = "#44cda8" }, - { name = "tres", text = "๎™Ÿ", fg = "#6d8086" }, - { name = "ts", text = "๎˜จ", fg = "#519aba" }, - { name = "tscn", text = "๎™Ÿ", fg = "#6d8086" }, - { name = "tsconfig", text = "๎ฒ", fg = "#ff8700" }, - { name = "tsx", text = "๎žบ", fg = "#1354bf" }, - { name = "ttf", text = "๏€ฑ", fg = "#ececec" }, - { name = "twig", text = "๎˜œ", fg = "#8dc149" }, - { name = "txt", text = "๓ฐˆ™", fg = "#89e051" }, - { name = "txz", text = "๏", fg = "#eca517" }, - { name = "typ", text = "๏ฟ", fg = "#0dbcc0" }, - { name = "typoscript", text = "๎ฒ", fg = "#ff8700" }, - { name = "ui", text = "๏‹", fg = "#015bf0" }, - { name = "v", text = "๓ฐ›", fg = "#019833" }, - { name = "vala", text = "๎ฃ‘", fg = "#7b3db9" }, - { name = "vh", text = "๓ฐ›", fg = "#019833" }, - { name = "vhd", text = "๓ฐ›", fg = "#019833" }, - { name = "vhdl", text = "๓ฐ›", fg = "#019833" }, - { name = "vi", text = "๎ ž", fg = "#fec60a" }, - { name = "vim", text = "๎˜ซ", fg = "#019833" }, - { name = "vsh", text = "๎šฌ", fg = "#5d87bf" }, - { name = "vsix", text = "๎œŒ", fg = "#854cc7" }, - { name = "vue", text = "๎š ", fg = "#8dc149" }, - { name = "wasm", text = "๎šก", fg = "#5c4cdb" }, - { name = "wav", text = "๏€", fg = "#00afff" }, - { name = "webm", text = "๎šŸ", fg = "#fd971f" }, - { name = "webmanifest", text = "๎˜‹", fg = "#f1e05a" }, - { name = "webp", text = "๎˜", fg = "#a074c4" }, - { name = "webpack", text = "๓ฐœซ", fg = "#519aba" }, - { name = "wma", text = "๏€", fg = "#00afff" }, - { name = "woff", text = "๏€ฑ", fg = "#ececec" }, - { name = "woff2", text = "๏€ฑ", fg = "#ececec" }, - { name = "wrl", text = "๓ฐ†ง", fg = "#888888" }, - { name = "wrz", text = "๓ฐ†ง", fg = "#888888" }, - { name = "wv", text = "๏€", fg = "#00afff" }, - { name = "wvc", text = "๏€", fg = "#00afff" }, - { name = "x", text = "๎š‘", fg = "#599eff" }, - { name = "xaml", text = "๓ฐ™ณ", fg = "#512bd4" }, - { name = "xcf", text = "๏Œธ", fg = "#635b46" }, - { name = "xcplayground", text = "๎•", fg = "#e37933" }, - { name = "xcstrings", text = "๏†ซ", fg = "#2596be" }, - { name = "xls", text = "๓ฐˆ›", fg = "#207245" }, - { name = "xlsx", text = "๓ฐˆ›", fg = "#207245" }, - { name = "xm", text = "๎š‘", fg = "#519aba" }, - { name = "xml", text = "๓ฐ—€", fg = "#e37933" }, - { name = "xpi", text = "๎ž†", fg = "#ff1b01" }, - { name = "xul", text = "๎…", fg = "#e37933" }, - { name = "xz", text = "๏", fg = "#eca517" }, - { name = "yaml", text = "๎˜•", fg = "#6d8086" }, - { name = "yml", text = "๎˜•", fg = "#6d8086" }, - { name = "zig", text = "๎šฉ", fg = "#f69a1b" }, - { name = "zip", text = "๏", fg = "#eca517" }, - { name = "zsh", text = "๎ž•", fg = "#89e051" }, - { name = "zst", text = "๏", fg = "#eca517" }, - { name = "๐Ÿ”ฅ", text = "๏ญ", fg = "#ff4c1f" }, -] - - -conds = [ - # Special files - { if = "orphan", text = "๏ฑ" }, - { if = "link", text = "๏’" }, - { if = "block", text = "๏ƒ‰" }, - { if = "char", text = "๏‡€" }, - { if = "fifo", text = "๏‡‘" }, - { if = "sock", text = "๏‡ค" }, - { if = "sticky", text = "๏‡ผ" }, - { if = "dummy", text = "๏—" }, - - # Fallback - { if = "dir", text = "๎—ฟ" }, - { if = "exec", text = "๏’‰" }, - { if = "!dir", text = "๏…›" }, -] diff --git a/modules/home/yazi/yazi.nix b/modules/home/yazi/yazi.nix new file mode 100644 index 0000000..1fe053b --- /dev/null +++ b/modules/home/yazi/yazi.nix @@ -0,0 +1,389 @@ +{ + settings = { + manager = { + ratio = [ 1 4 3 ]; + sort_by = "alphabetical"; + sort_sensitive = false; + sort_reverse = false; + sort_dir_first = true; + sort_translit = false; + linemode = "none"; + show_hidden = false; + show_symlink = true; + scrolloff = 5; + mouse_events = [ "click" "scroll" ]; + title_format = "Yazi: {cwd}"; + }; + preview = { + wrap = "no"; + tab_size = 2; + max_width = 600; + max_height = 900; + cache_dir = ""; + image_delay = 30; + image_filter = "triangle"; + image_quality = 75; + sixel_fraction = 15; + ueberzug_scale = 1; + ueberzug_offset = [ 0 0 0 0 ]; + }; + opener = { + edit = [ + { + run = ''${"EDITOR:-vi"} "$@"''; + desc = "$EDITOR"; + block = true; + for = "unix"; + } + { + run = "code %*"; + orphan = true; + desc = "code"; + for = "windows"; + } + { + run = "code -w %*"; + block = true; + desc = "code (block)"; + for = "windows"; + } + ]; + open = [ + { + run = ''xdg-open "$1"''; + desc = "Open"; + for = "linux"; + } + { + run = ''open "$@"''; + desc = "Open"; + for = "macos"; + } + { + run = ''start "" "%1"''; + orphan = true; + desc = "Open"; + for = "windows"; + } + { + run = ''termux-open "$1"''; + desc = "Open"; + for = "android"; + } + ]; + reveal = [ + { + run = ''xdg-open "$(dirname "$1")"''; + desc = "Reveal"; + for = "linux"; + } + { + run = ''open -R "$1"''; + desc = "Reveal"; + for = "macos"; + } + { + run = ''explorer /select,"%1"''; + orphan = true; + desc = "Reveal"; + for = "windows"; + } + { + run = ''termux-open "$(dirname "$1")"''; + desc = "Reveal"; + for = "android"; + } + { + run = ''exiftool "$1"; echo "Press enter to exit"; read _''; + block = true; + desc = "Show EXIF"; + for = "unix"; + } + ]; + extract = [ + { + run = ''ya pub extract --list "$@"''; + desc = "Extract here"; + for = "unix"; + } + { + run = "ya pub extract --list %*"; + desc = "Extract here"; + for = "windows"; + } + ]; + play = [ + { + run = ''mpv --force-window "$@"''; + orphan = true; + for = "unix"; + } + { + run = "mpv --force-window %*"; + orphan = true; + for = "windows"; + } + { + run = ''mediainfo "$1"; echo "Press enter to exit"; read _''; + block = true; + desc = "Show media info"; + for = "unix"; + } + ]; + }; + open = { + rules = [ + { + name = "*/"; + use = [ "edit" "open" "reveal" ]; + } + { + mime = "text/*"; + use = [ "edit" "reveal" ]; + } + { + mime = "image/*"; + use = [ "open" "reveal" ]; + } + { + mime = "{audio,video}/*"; + use = [ "play" "reveal" ]; + } + { + mime = + "application/{zip,rar,7z*,tar,gzip,xz,zstd,bzip*,lzma,compress,archive,cpio,arj,xar,ms-cab*}"; + use = [ "extract" "reveal" ]; + } + { + mime = "application/{json,ndjson}"; + use = [ "edit" "reveal" ]; + } + { + mime = "*/javascript"; + use = [ "edit" "reveal" ]; + } + { + mime = "inode/empty"; + use = [ "edit" "reveal" ]; + } + { + name = "*"; + use = [ "open" "reveal" ]; + } + ]; + }; + tasks = { + micro_workers = 10; + macro_workers = 10; + bizarre_retry = 3; + image_alloc = 536870912; + image_bound = [ 0 0 ]; + suppress_preload = false; + }; + plugin = { + fetchers = [{ + id = "mime"; + name = "*"; + run = "mime"; + prio = "high"; + }]; + spotters = [ + { + name = "*/"; + run = "folder"; + } + { + mime = "text/*"; + run = "code"; + } + { + mime = "application/{mbox,javascript,wine-extension-ini}"; + run = "code"; + } + { + mime = "image/{avif,hei?,jxl,svg+xml}"; + run = "magick"; + } + { + mime = "image/*"; + run = "image"; + } + { + mime = "video/*"; + run = "video"; + } + { + name = "*"; + run = "file"; + } + ]; + preloaders = [ + { + mime = "image/{avif,hei?,jxl,svg+xml}"; + run = "magick"; + } + { + mime = "image/*"; + run = "image"; + } + { + mime = "video/*"; + run = "video"; + } + { + mime = "application/pdf"; + run = "pdf"; + } + { + mime = "font/*"; + run = "font"; + } + { + mime = "application/ms-opentype"; + run = "font"; + } + ]; + previewers = [ + { + name = "*/"; + run = "folder"; + sync = true; + } + { + mime = "text/*"; + run = "code"; + } + { + mime = "application/{mbox,javascript,wine-extension-ini}"; + run = "code"; + } + { + mime = "application/{json,ndjson}"; + run = "json"; + } + { + mime = "image/{avif,hei?,jxl,svg+xml}"; + run = "magick"; + } + { + mime = "image/*"; + run = "image"; + } + { + mime = "video/*"; + run = "video"; + } + { + mime = "application/pdf"; + run = "pdf"; + } + { + mime = + "application/{zip,rar,7z*,tar,gzip,xz,zstd,bzip*,lzma,compress,archive,cpio,arj,xar,ms-cab*}"; + run = "archive"; + } + { + mime = + "application/{debian*-package,redhat-package-manager,rpm,android.package-archive}"; + run = "archive"; + } + { + name = "*.{AppImage,appimage}"; + run = "archive"; + } + { + mime = "application/{iso9660-image,qemu-disk,ms-wim,apple-diskimage}"; + run = "archive"; + } + { + mime = "application/virtualbox-{vhd,vhdx}"; + run = "archive"; + } + { + name = "*.{img,fat,ext,ext2,ext3,ext4,squashfs,ntfs,hfs,hfsx}"; + run = "archive"; + } + { + mime = "font/*"; + run = "font"; + } + { + mime = "application/ms-opentype"; + run = "font"; + } + { + mime = "inode/empty"; + run = "empty"; + } + { + name = "*"; + run = "file"; + } + ]; + prepend_fetchers = [ + { + id = "git"; + name = "*"; + run = "git"; + } + { + id = "git"; + name = "*/"; + run = "git"; + } + ]; + }; + input = { + cursor_blink = false; + cd_title = "Change directory:"; + cd_origin = "top-center"; + cd_offset = [ 0 2 50 3 ]; + create_title = [ "Create:" "Create (dir):" ]; + create_origin = "top-center"; + create_offset = [ 0 2 50 3 ]; + rename_title = "Rename:"; + rename_origin = "hovered"; + rename_offset = [ 0 1 50 3 ]; + filter_title = "Filter:"; + filter_origin = "top-center"; + filter_offset = [ 0 2 50 3 ]; + find_title = [ "Find next:" "Find previous:" ]; + find_origin = "top-center"; + find_offset = [ 0 2 50 3 ]; + search_title = "Search via {n}:"; + search_origin = "top-center"; + search_offset = [ 0 2 50 3 ]; + shell_title = [ "Shell:" "Shell (block):" ]; + shell_origin = "top-center"; + shell_offset = [ 0 2 50 3 ]; + }; + confirm = { + trash_title = "Trash {n} selected file{s}?"; + trash_origin = "center"; + trash_offset = [ 0 0 70 20 ]; + delete_title = "Permanently delete {n} selected file{s}?"; + delete_origin = "center"; + delete_offset = [ 0 0 70 20 ]; + overwrite_title = "Overwrite file?"; + overwrite_content = "Will overwrite the following file:"; + overwrite_origin = "center"; + overwrite_offset = [ 0 0 50 15 ]; + quit_title = "Quit?"; + quit_content = + "The following tasks are still running, are you sure you want to quit?"; + quit_origin = "center"; + quit_offset = [ 0 0 50 15 ]; + }; + pick = { + open_title = "Open with:"; + open_origin = "hovered"; + open_offset = [ 0 1 50 7 ]; + }; + which = { + sort_by = "none"; + sort_sensitive = false; + sort_reverse = false; + sort_translit = false; + }; + }; +} diff --git a/modules/home/yazi/yazi.toml b/modules/home/yazi/yazi.toml deleted file mode 100644 index 81e06b9..0000000 --- a/modules/home/yazi/yazi.toml +++ /dev/null @@ -1,230 +0,0 @@ -# A TOML linter such as https://taplo.tamasfe.dev/ can use this schema to validate your config. -# If you encounter any issues, please make an issue at https://github.com/yazi-rs/schemas. -"$schema" = "https://yazi-rs.github.io/schemas/yazi.json" - -[manager] -ratio = [ 1, 4, 3 ] -sort_by = "alphabetical" -sort_sensitive = false -sort_reverse = false -sort_dir_first = true -sort_translit = false -linemode = "none" -show_hidden = false -show_symlink = true -scrolloff = 5 -mouse_events = [ "click", "scroll" ] -title_format = "Yazi: {cwd}" - -[preview] -wrap = "no" -tab_size = 2 -max_width = 600 -max_height = 900 -cache_dir = "" -image_delay = 30 -image_filter = "triangle" -image_quality = 75 -sixel_fraction = 15 -ueberzug_scale = 1 -ueberzug_offset = [ 0, 0, 0, 0 ] - -[opener] -edit = [ - { run = '${EDITOR:-vi} "$@"', desc = "$EDITOR", block = true, for = "unix" }, - { run = 'code %*', orphan = true, desc = "code", for = "windows" }, - { run = 'code -w %*', block = true, desc = "code (block)", for = "windows" }, -] -open = [ - { run = 'xdg-open "$1"', desc = "Open", for = "linux" }, - { run = 'open "$@"', desc = "Open", for = "macos" }, - { run = 'start "" "%1"', orphan = true, desc = "Open", for = "windows" }, - { run = 'termux-open "$1"', desc = "Open", for = "android" }, -] -reveal = [ - { run = 'xdg-open "$(dirname "$1")"', desc = "Reveal", for = "linux" }, - { run = 'open -R "$1"', desc = "Reveal", for = "macos" }, - { run = 'explorer /select,"%1"', orphan = true, desc = "Reveal", for = "windows" }, - { run = 'termux-open "$(dirname "$1")"', desc = "Reveal", for = "android" }, - { run = '''exiftool "$1"; echo "Press enter to exit"; read _''', block = true, desc = "Show EXIF", for = "unix" }, -] -extract = [ - { run = 'ya pub extract --list "$@"', desc = "Extract here", for = "unix" }, - { run = 'ya pub extract --list %*', desc = "Extract here", for = "windows" }, -] -play = [ - { run = 'mpv --force-window "$@"', orphan = true, for = "unix" }, - { run = 'mpv --force-window %*', orphan = true, for = "windows" }, - { run = '''mediainfo "$1"; echo "Press enter to exit"; read _''', block = true, desc = "Show media info", for = "unix" }, -] - -[open] -rules = [ - # Folder - { name = "*/", use = [ "edit", "open", "reveal" ] }, - # Text - { mime = "text/*", use = [ "edit", "reveal" ] }, - # Image - { mime = "image/*", use = [ "open", "reveal" ] }, - # Media - { mime = "{audio,video}/*", use = [ "play", "reveal" ] }, - # Archive - { mime = "application/{zip,rar,7z*,tar,gzip,xz,zstd,bzip*,lzma,compress,archive,cpio,arj,xar,ms-cab*}", use = [ "extract", "reveal" ] }, - # JSON - { mime = "application/{json,ndjson}", use = [ "edit", "reveal" ] }, - { mime = "*/javascript", use = [ "edit", "reveal" ] }, - # Empty file - { mime = "inode/empty", use = [ "edit", "reveal" ] }, - # Fallback - { name = "*", use = [ "open", "reveal" ] }, -] - -[tasks] -micro_workers = 10 -macro_workers = 10 -bizarre_retry = 3 -image_alloc = 536870912 # 512MB -image_bound = [ 0, 0 ] -suppress_preload = false - -[plugin] -fetchers = [ - # Mimetype - { id = "mime", name = "*", run = "mime", prio = "high" }, -] -spotters = [ - { name = "*/", run = "folder" }, - # Code - { mime = "text/*", run = "code" }, - { mime = "application/{mbox,javascript,wine-extension-ini}", run = "code" }, - # Image - { mime = "image/{avif,hei?,jxl,svg+xml}", run = "magick" }, - { mime = "image/*", run = "image" }, - # Video - { mime = "video/*", run = "video" }, - # Fallback - { name = "*", run = "file" }, -] -preloaders = [ - # Image - { mime = "image/{avif,hei?,jxl,svg+xml}", run = "magick" }, - { mime = "image/*", run = "image" }, - # Video - { mime = "video/*", run = "video" }, - # PDF - { mime = "application/pdf", run = "pdf" }, - # Font - { mime = "font/*", run = "font" }, - { mime = "application/ms-opentype", run = "font" }, -] -previewers = [ - { name = "*/", run = "folder", sync = true }, - # Code - { mime = "text/*", run = "code" }, - { mime = "application/{mbox,javascript,wine-extension-ini}", run = "code" }, - # JSON - { mime = "application/{json,ndjson}", run = "json" }, - # Image - { mime = "image/{avif,hei?,jxl,svg+xml}", run = "magick" }, - { mime = "image/*", run = "image" }, - # Video - { mime = "video/*", run = "video" }, - # PDF - { mime = "application/pdf", run = "pdf" }, - # Archive - { mime = "application/{zip,rar,7z*,tar,gzip,xz,zstd,bzip*,lzma,compress,archive,cpio,arj,xar,ms-cab*}", run = "archive" }, - { mime = "application/{debian*-package,redhat-package-manager,rpm,android.package-archive}", run = "archive" }, - { name = "*.{AppImage,appimage}", run = "archive" }, - # Virtual Disk / Disk Image - { mime = "application/{iso9660-image,qemu-disk,ms-wim,apple-diskimage}", run = "archive" }, - { mime = "application/virtualbox-{vhd,vhdx}", run = "archive" }, - { name = "*.{img,fat,ext,ext2,ext3,ext4,squashfs,ntfs,hfs,hfsx}", run = "archive" }, - # Font - { mime = "font/*", run = "font" }, - { mime = "application/ms-opentype", run = "font" }, - # Empty file - { mime = "inode/empty", run = "empty" }, - # Fallback - { name = "*", run = "file" }, -] - -[input] -cursor_blink = false - -# cd -cd_title = "Change directory:" -cd_origin = "top-center" -cd_offset = [ 0, 2, 50, 3 ] - -# create -create_title = [ "Create:", "Create (dir):" ] -create_origin = "top-center" -create_offset = [ 0, 2, 50, 3 ] - -# rename -rename_title = "Rename:" -rename_origin = "hovered" -rename_offset = [ 0, 1, 50, 3 ] - -# filter -filter_title = "Filter:" -filter_origin = "top-center" -filter_offset = [ 0, 2, 50, 3 ] - -# find -find_title = [ "Find next:", "Find previous:" ] -find_origin = "top-center" -find_offset = [ 0, 2, 50, 3 ] - -# search -search_title = "Search via {n}:" -search_origin = "top-center" -search_offset = [ 0, 2, 50, 3 ] - -# shell -shell_title = [ "Shell:", "Shell (block):" ] -shell_origin = "top-center" -shell_offset = [ 0, 2, 50, 3 ] - -[confirm] -# trash -trash_title = "Trash {n} selected file{s}?" -trash_origin = "center" -trash_offset = [ 0, 0, 70, 20 ] - -# delete -delete_title = "Permanently delete {n} selected file{s}?" -delete_origin = "center" -delete_offset = [ 0, 0, 70, 20 ] - -# overwrite -overwrite_title = "Overwrite file?" -overwrite_content = "Will overwrite the following file:" -overwrite_origin = "center" -overwrite_offset = [ 0, 0, 50, 15 ] - -# quit -quit_title = "Quit?" -quit_content = "The following tasks are still running, are you sure you want to quit?" -quit_origin = "center" -quit_offset = [ 0, 0, 50, 15 ] - -[pick] -open_title = "Open with:" -open_origin = "hovered" -open_offset = [ 0, 1, 50, 7 ] - -[which] -sort_by = "none" -sort_sensitive = false -sort_reverse = false -sort_translit = false -[[plugin.prepend_fetchers]] -id = "git" -name = "*" -run = "git" - -[[plugin.prepend_fetchers]] -id = "git" -name = "*/" -run = "git" diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 10f2d9b..35e4b8f 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -11,7 +11,17 @@ programs.zsh = { enable = true; autosuggestion.enable = true; - syntaxHighlighting.enable = true; + syntaxHighlighting = { + enable = true; + highlighters = ["main" "brackets" "pattern" "regexp" "root" "line"]; + }; + historySubstringSearch.enable = true; + + history = { + ignoreDups = true; + save = 10000; + size = 10000; + }; oh-my-zsh = { enable = true; @@ -30,7 +40,7 @@ } ]; - initExtra = '' + initContent = '' bindkey "\eh" backward-word bindkey "\ej" down-line-or-history bindkey "\ek" up-line-or-history @@ -46,14 +56,10 @@ c = "clear"; fr = "nh os switch --hostname ${profile}"; fu = "nh os switch --hostname ${profile} --update"; - zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)"; + zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/releases/latest/download/install-zaneyos.sh)"; ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; cat = "bat"; man = "batman"; - ls = "eza --icons --group-directories-first -1"; - ll = "eza --icons -lh --group-directories-first -1 --no-user --long"; - la = "eza --icons -lah --group-directories-first -1"; - tree = "eza --icons --tree --group-directories-first"; }; }; } diff --git a/zcli.md b/zcli.md new file mode 100644 index 0000000..8ed3619 --- /dev/null +++ b/zcli.md @@ -0,0 +1,67 @@ +# ZaneyOS Command Line Utility (zcli) - Version 1.0.1 + +zcli is a handy tool for performing common maintenance tasks on your ZaneyOS +system with a single command. Below is a detailed guide to its usage and +commands. + +## Usage + +Run the utility with a specific command: + +`zcli` + +If no command is provided, it displays this help message. + +## Available Commands + +Hereโ€™s a quick reference table for all commands, followed by detailed +descriptions: + +| Command | Icon | Description | Example Usage | +| ----------- | ---- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------- | +| cleanup | ๐Ÿงน | Removes old system generations, either all or by specifying a number to keep, helping free up space. | `zcli cleanup` (prompted for all or #) | +| diag | ๐Ÿ› ๏ธ | Generates a system diagnostic report and saves it to `diag.txt` in your home directory. | `zcli diag` | +| list-gens | ๐Ÿ“‹ | Lists user and system generations, showing active and existing ones. | `zcli list-gens` | +| rebuild | ๐Ÿ”จ | Rebuilds the NixOS system configuration by checking for files that might prevent Home Manager from rebuilding. | `zcli rebuild` | +| trim | โœ‚๏ธ | Trims filesystems to improve SSD performance and optimize storage. | `zcli trim` | +| update | ๐Ÿ”„ | Updates the flake, checks for potential conflicts that might prevent Home Manager from rebuilding, and then rebuilds the system. | `zcli update` | +| update-host | ๐Ÿ  | Automatically sets the host and profile in your `flake.nix` file based on the current system. It detects the GPU type or prompts for input if needed. | `zcli update-host [hostname] [profile]` | + +## Detailed Command Descriptions + +- **๐Ÿงน cleanup**: This command helps manage system storage by removing old + generations. You can remove all generations or specify a number to retain + (e.g., `zcli cleanup` free's up space and removes the entries from boot menu. + +- **๐Ÿ› ๏ธ diag**: Creates a comprehensive diagnostic report by running + `inxi --full` and saving the output to `diag.txt` in your home directory. This + is ideal for troubleshooting or sharing system details when reporting issues. + +- **๐Ÿ“‹ list-gens**: Displays a clear list of your current user and system + generations, including active ones. This allows you to review what's installed + and plan cleanups. + +- **๐Ÿ”จ rebuild**: Performs a system rebuild for NixOS by first checking for any + files that could block Home Manager from completing the process. It's similar + to standard rebuild functions but with added safeguards. + +- **โœ‚๏ธ trim**: Optimizes your filesystems, particularly for SSDs, to improve + performance and reduce wear. Run this regularly as part of your maintenance + routine. + +- **๐Ÿ”„ update**: Streamlines updates by checking for potential issues with Home + Manager, then updating the flake and rebuilding the system. This combines + flake updates and rebuilds into one efficient step. + +- **๐Ÿ  update-host**: Simplifies managing multiple hosts by automatically + updating the `hostname` and `profile` in your `~/zaneyos/flake.nix` file. It + attempts to detect your GPU type; if it fails, you'll be prompted to enter the + details manually. + +## Additional Notes + +- **Why use zcli?** This utility saves time on routine tasks, reducing the need + for multiple commands or manual edits. +- **Version and Compatibility:** Ensure you're using the latest version (1.0.1 + as per the source). For any issues, generate a diagnostic report with + `zcli diag` and consult your system logs.