diff options
Diffstat (limited to '')
62 files changed, 560 insertions, 71 deletions
diff --git a/mirenn/home.scm b/mirenn/home.scm new file mode 100644 index 0000000..9cdc93e --- /dev/null +++ b/mirenn/home.scm @@ -0,0 +1,102 @@ +(define-module (mirenn home)) + +(use-modules (gnu packages) + (gnu packages window-management) + (gnu packages finance) + (gnu home) + (gnu home services) + (gnu home services shells) + (gnu home services niri) + (gnu home services ssh) + (gnu home services shepherd) + (gnu home services xdg) + (gnu home services dotfiles) + (mirenn home services brightnessctl) + (mirenn home services timer) + (guix gexp)) + +(home-environment + (packages (specifications->packages + (list + "foot" "waybar" "mako" + "rofi" "swaybg" "swaylock-effects" + "wallust" "swayidle" "libnotify" + "wl-clipboard" "wev" "fzf" + "fish" "neovim" "bat" + "btop" "fd" "ripgrep" + "zoxide" "trash-cli" "brightnessctl" + "pamixer" "pulsemixer" "sshfs" + "sshfs" "python-yubikey-manager" "libsixel" + "xdg-utils" "lazygit" "emacs" + + "font-cica" "font-nerd-symbols" "font-google-noto-emoji" + "papirus-icon-theme" + + "git" "git-lfs" "fastfetch" + "hyperfine" "rsync" "yt-dlp" + "mpv" "feh" "icecat" + "nautilus" "bzmenu" "icedove-wayland" + "trezord" "monero-gui" "steam" + "telegram-desktop" "ardour" + "zoom"))) + (services (cons* (service home-fish-service-type + (home-fish-configuration + (environment-variables + '(("EDITOR" . "nvim"))))) + (service home-xdg-mime-applications-service-type) + (service home-niri-service-type) + (service home-brightnessctl-service-type) + (service home-timer-service-type + (home-timer-configuration + (name 'random-wallpaper) + (script (local-file "home/files/dotfiles/.config/scripts/set_random")) + (arguments '("~/Pictures/Backgrounds/")) + (delay 3600))) + (service home-openssh-service-type + (home-openssh-configuration + (hosts + (list + (openssh-host + (name "github") + (user "git") + (host-name "github.com") + (extra-content " PreferredAuthentications publickey") + (identity-file "~/.ssh/zenbook")) + (openssh-host + (name "codeberg") + (user "git") + (host-name "codeberg.org") + (extra-content " PreferredAuthentications publickey") + (identity-file "~/.ssh/yubikey_sk")) + (openssh-host + (name "pve1") + (user "root") + (host-name "192.168.0.3") + (extra-content " PreferredAuthentications publickey") + (identity-file "~/.ssh/yubikey_sk") + (environment-variables + '(("TERM" . "xterm"))) + (control-master 'auto) + (control-file-name "~/.ssh/yubikey_sk-%r@%h:%p") + (control-persist "5m")) + (openssh-host + (name "cgit") + (user "git") + (host-name "192.168.0.5") + (extra-content " PreferredAuthentications publickey") + (identity-file "~/.ssh/yubikey_sk") + (environment-variables + '(("TERM" . "xterm"))) + (control-master 'auto) + (control-file-name "~/.ssh/yubikey_sk-%r@%h:%p") + (control-persist "5m")) + (openssh-host + (name "desktop") + (user "eric") + (host-name "100.64.0.7") + (extra-content " PreferredAuthentications publickey") + (identity-file "~/.ssh/zenbook")))))) + (service home-dotfiles-service-type + (home-dotfiles-configuration + (directories '("home/files/dotfiles")))) + %base-home-services))) diff --git a/mirenn/home/files/dotfiles/.config/btop/btop.conf b/mirenn/home/files/dotfiles/.config/btop/btop.conf new file mode 100644 index 0000000..d6e4c59 --- /dev/null +++ b/mirenn/home/files/dotfiles/.config/btop/btop.conf @@ -0,0 +1,286 @@ +#? Config file for btop v.1.4.7 + +#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. +#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" +color_theme = "TTY" + +#* If the theme set background should be shown, set to False if you want terminal background transparency. +theme_background = false + +#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. +truecolor = true + +#* Set to true to force tty mode regardless if a real tty has been detected or not. +#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols. +force_tty = false + +#* Option to disable presets. Either the default preset, custom presets, or all presets. +#* "Off" All presets are enabled. +#* "Default" preset is disabled.#* "Custom" presets are disabled.#* "All" presets are disabled. +disable_presets = "Off" + +#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. +#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box. +#* Use whitespace " " as separator between different presets. +#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty" +presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty" + +#* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists. +#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift. +vim_keys = false + +#* Disable all mouse events. +disable_mouse = false + +#* Rounded corners on boxes, is ignored if TTY mode is ON. +rounded_corners = false + +#* Use terminal synchronized output sequences to reduce flickering on supported terminals. +terminal_sync = true + +#* Default symbols to use for graph creation, "braille", "block" or "tty". +#* "braille" offers the highest resolution but might not be included in all fonts. +#* "block" has half the resolution of braille but uses more common characters. +#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY. +#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view. +graph_symbol = "braille" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_cpu = "default" + +# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty". +graph_symbol_gpu = "default" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_mem = "default" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_net = "default" + +# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". +graph_symbol_proc = "default" + +#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. +shown_boxes = "proc cpu mem net" + +#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. +update_ms = 1000 + +#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", +#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. +proc_sorting = "cpu lazy" + +#* Reverse sorting order, True or False. +proc_reversed = false + +#* Show processes as a tree. +proc_tree = false + +#* Use the cpu graph colors in the process list. +proc_colors = true + +#* Use a darkening gradient in the process list. +proc_gradient = true + +#* If process cpu usage should be of the core it's running on or usage of the total available cpu power. +proc_per_core = true + +#* Show process memory as bytes instead of percent. +proc_mem_bytes = true + +#* Show cpu graph for each process. +proc_cpu_graphs = true + +#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate) +proc_info_smaps = false + +#* Show proc box on left side of screen instead of right. +proc_left = false + +#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop). +proc_filter_kernel = false + +#* Should the process list follow the selected process when detailed view is open. +proc_follow_detailed = true + +#* In tree-view, always accumulate child process resources in the parent process. +proc_aggregate = false + +#* Should cpu and memory usage display be preserved for dead processes when paused. +keep_dead_proc_usage = false + +#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available. +#* Select from a list of detected attributes from the options menu. +cpu_graph_upper = "total" + +#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available. +#* Select from a list of detected attributes from the options menu. +cpu_graph_lower = "total" + +#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off". +show_gpu_info = "Auto" + +#* Toggles if the lower CPU graph should be inverted. +cpu_invert_lower = true + +#* Set to True to completely disable the lower CPU graph. +cpu_single_graph = true + +#* Show cpu box at bottom of screen instead of top. +cpu_bottom = false + +#* Shows the system uptime in the CPU box. +show_uptime = true + +#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo. +show_cpu_watts = true + +#* Show cpu temperature. +check_temp = true + +#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors. +cpu_sensor = "Auto" + +#* Show temperatures for cpu cores also if check_temp is True and sensors has been found. +show_coretemp = true + +#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core. +#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine. +#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries. +#* Example: "4:0 5:1 6:3" +cpu_core_map = "" + +#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine". +temp_scale = "celsius" + +#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024. +base_10_sizes = false + +#* Show CPU frequency. +show_cpu_freq = true + +#* How to calculate CPU frequency, available values: "first", "range", "lowest", "highest" and "average". +freq_mode = "first" + +#* Draw a clock at top of screen, formatting according to strftime, empty string to disable. +#* Special formatting: /host = hostname | /user = username | /uptime = system uptime +clock_format = "%H:%M" + +#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort. +background_update = true + +#* Custom cpu model name, empty string to disable. +custom_cpu_name = "" + +#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ". +#* Only disks matching the filter will be shown. Prepend exclude= to only show disks not matching the filter. Examples: disk_filter="/boot /home/user", disks_filter="exclude=/boot /home/user" +disks_filter = "exclude=/boot" + +#* Show graphs instead of meters for memory values. +mem_graphs = true + +#* Show mem box below net box instead of above. +mem_below_net = false + +#* Count ZFS ARC in cached and available memory. +zfs_arc_cached = true + +#* If swap memory should be shown in memory box. +show_swap = true + +#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk. +swap_disk = true + +#* If mem box should be split to also show disks info. +show_disks = true + +#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar. +only_physical = true + +#* Read disks list from /etc/fstab. This also disables only_physical. +use_fstab = false + +#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool) +zfs_hide_datasets = false + +#* Set to true to show available disk space for privileged users. +disk_free_priv = false + +#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view. +show_io_stat = true + +#* Toggles io mode for disks, showing big graphs for disk read/write speeds. +io_mode = false + +#* Set to True to show combined read/write io graphs in io mode. +io_graph_combined = false + +#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ". +#* Example: "/mnt/media:100 /:20 /boot:1". +io_graph_speeds = "" + +#* Swap the positions of the upload and download speed graphs. When true, upload will be on top. +swap_upload_download = false + +#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False. +net_download = 100 + +net_upload = 100 + +#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. +net_auto = true + +#* Sync the auto scaling for download and upload to whichever currently has the highest scale. +net_sync = true + +#* Starts with the Network Interface specified here. +net_iface = "br0" + +#* "True" shows bitrates in base 10 (Kbps, Mbps). "False" shows bitrates in binary sizes (Kibps, Mibps, etc.). "Auto" uses base_10_sizes. +base_10_bitrate = "Auto" + +#* Show battery stats in top right if battery is present. +show_battery = true + +#* Which battery to use if multiple are present. "Auto" for auto detection. +selected_battery = "Auto" + +#* Show power stats of battery next to charge indicator. +show_battery_watts = true + +#* Set loglevel for "~/.local/state/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". +#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. +log_level = "DEBUG" + +#* Automatically save current settings to config file on exit. +save_config_on_exit = true + +#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards. +nvml_measure_pcie_speeds = true + +#* Measure PCIe throughput on AMD cards, may impact performance on certain cards. +rsmi_measure_pcie_speeds = true + +#* Horizontally mirror the GPU graph. +gpu_mirror_graph = true + +#* Set which GPU vendors to show. Available values are "nvidia amd intel apple" +shown_gpus = "nvidia amd intel" + +#* Custom gpu0 model name, empty string to disable. +custom_gpu_name0 = "" + +#* Custom gpu1 model name, empty string to disable. +custom_gpu_name1 = "" + +#* Custom gpu2 model name, empty string to disable. +custom_gpu_name2 = "" + +#* Custom gpu3 model name, empty string to disable. +custom_gpu_name3 = "" + +#* Custom gpu4 model name, empty string to disable. +custom_gpu_name4 = "" + +#* Custom gpu5 model name, empty string to disable. +custom_gpu_name5 = "" diff --git a/fastfetch/config.jsonc b/mirenn/home/files/dotfiles/.config/fastfetch/config.jsonc index 472ad13..bfebe37 100644 --- a/fastfetch/config.jsonc +++ b/mirenn/home/files/dotfiles/.config/fastfetch/config.jsonc @@ -1,9 +1,9 @@ // _____ _____ _____ _____ _____ _____ _____ _____ _____ // | __| _ | __|_ _| __| __|_ _| | | | // | __| |__ | | | | __| __| | | | --| | -// |__| |__|__|_____| |_| |__| |_____| |_| |_____|__|__| ARCH +// |__| |__|__|_____| |_| |__| |_____| |_| |_____|__|__| GUIX // -// by Bina, modified by eric-marin +// by Bina, modified by mirenn // execute with: fastfetch --colors-block-range-start 9 --colors-block-width 3 @@ -11,7 +11,7 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { - "source": "arch_small", + "source": "guix_small", "padding": { "top": 1, } @@ -37,39 +37,40 @@ }, { "type": "packages", - "format": "{} (pacman)", + "format": "{guix-all} (guix)", + "combined": true, "key": " ", - "keyColor": "32", + "keyColor": "32", }, { "type": "shell", "key": " ", - "keyColor": "33", + "keyColor": "33", }, { "type": "terminal", "key": " ", - "keyColor": "34", + "keyColor": "34", }, { "type": "wm", "key": " ", - "keyColor": "35", + "keyColor": "35", }, { "type": "uptime", "key": " ", - "keyColor": "36", + "keyColor": "36", }, { "type": "media", "key": " ", - "keyColor": "37", + "keyColor": "37", }, "break", { - "type": "custom", - "format": "\u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m" - }, + "type": "colors", + "block": { "width": 3, "range": [8, 15]} + } ] } diff --git a/mirenn/home/files/dotfiles/.config/fish/conf.d/interactive.fish b/mirenn/home/files/dotfiles/.config/fish/conf.d/interactive.fish new file mode 100644 index 0000000..8f82c33 --- /dev/null +++ b/mirenn/home/files/dotfiles/.config/fish/conf.d/interactive.fish @@ -0,0 +1,5 @@ +if status is-interactive + fish_add_path -p ~/.cargo/bin ~/.ghcup/bin + set -g fish_greeting + zoxide init fish | source +end diff --git a/fish/conf.d/fish_frozen_theme.fish b/mirenn/home/files/dotfiles/.config/fish/conf.d/theme.fish index 59c07df..9b5e536 100644 --- a/fish/conf.d/fish_frozen_theme.fish +++ b/mirenn/home/files/dotfiles/.config/fish/conf.d/theme.fish @@ -1,13 +1,3 @@ -# This file was created by fish when upgrading to version 4.3, to migrate -# theme variables from universal to global scope. -# Don't edit this file, as it will be written by the web-config tool (`fish_config`). -# To customize your theme, delete this file and see -# help interactive#syntax-highlighting -# or -# man fish-interactive | less +/^SYNTAX.HIGHLIGHTING -# for appropriate commands to add to ~/.config/fish/config.fish instead. -# See also the release notes for fish 4.3.0 (run `help relnotes`). - set --global fish_color_autosuggestion brblack set --global fish_color_cancel --reverse set --global fish_color_command blue diff --git a/fish/functions/cat.fish b/mirenn/home/files/dotfiles/.config/fish/functions/cat.fish index 73b5541..73b5541 100644 --- a/fish/functions/cat.fish +++ b/mirenn/home/files/dotfiles/.config/fish/functions/cat.fish diff --git a/mirenn/home/files/dotfiles/.config/fish/functions/fish_prompt.fish b/mirenn/home/files/dotfiles/.config/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..e0df61e --- /dev/null +++ b/mirenn/home/files/dotfiles/.config/fish/functions/fish_prompt.fish @@ -0,0 +1,7 @@ +function fish_prompt + printf (if fish_is_root_user + echo '%s%s%s # ' + else + echo '%s%s%s $ ' + end) (set_color $fish_color_cwd) (prompt_pwd --full-length-dirs 5) (set_color normal) +end diff --git a/fish/functions/rm.fish b/mirenn/home/files/dotfiles/.config/fish/functions/rm.fish index 7d8fe20..7d8fe20 100644 --- a/fish/functions/rm.fish +++ b/mirenn/home/files/dotfiles/.config/fish/functions/rm.fish diff --git a/fish/functions/shrekfetch.fish b/mirenn/home/files/dotfiles/.config/fish/functions/shrekfetch.fish index 191c64f..191c64f 100644 --- a/fish/functions/shrekfetch.fish +++ b/mirenn/home/files/dotfiles/.config/fish/functions/shrekfetch.fish diff --git a/nvim/.luarc.json b/mirenn/home/files/dotfiles/.config/nvim/.luarc.json index 3f7714a..3f7714a 100644 --- a/nvim/.luarc.json +++ b/mirenn/home/files/dotfiles/.config/nvim/.luarc.json diff --git a/nvim/init.lua b/mirenn/home/files/dotfiles/.config/nvim/init.lua index dbc863e..dbc863e 100644 --- a/nvim/init.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/init.lua diff --git a/nvim/lua/config/globals.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/config/globals.lua index 6ef2cd8..6ef2cd8 100644 --- a/nvim/lua/config/globals.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/config/globals.lua diff --git a/nvim/lua/config/init.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/config/init.lua index 03722bd..03722bd 100644 --- a/nvim/lua/config/init.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/config/init.lua diff --git a/nvim/lua/config/keymaps.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/config/keymaps.lua index d81308d..d81308d 100644 --- a/nvim/lua/config/keymaps.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/config/keymaps.lua diff --git a/nvim/lua/config/lazy.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/config/lazy.lua index 7dcfac6..135704c 100644 --- a/nvim/lua/config/lazy.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/config/lazy.lua @@ -40,7 +40,8 @@ local opts = { }, checker = { enabled = true, - } + }, + lockfile = vim.fn.stdpath("state") .. "/lazy-lock.json", } require("lazy").setup("plugins", opts) diff --git a/nvim/lua/config/options.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/config/options.lua index e465418..e465418 100644 --- a/nvim/lua/config/options.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/config/options.lua diff --git a/nvim/lua/plugins/comment.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/comment.lua index 559fd3c..559fd3c 100644 --- a/nvim/lua/plugins/comment.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/comment.lua diff --git a/nvim/lua/plugins/gitsigns.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/gitsigns.lua index 2df9a2e..2df9a2e 100644 --- a/nvim/lua/plugins/gitsigns.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/gitsigns.lua diff --git a/nvim/lua/plugins/indent-blankline.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/indent-blankline.lua index af9cff8..af9cff8 100644 --- a/nvim/lua/plugins/indent-blankline.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/indent-blankline.lua diff --git a/nvim/lua/plugins/lazy.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lazy.lua index d48db7e..d48db7e 100644 --- a/nvim/lua/plugins/lazy.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lazy.lua diff --git a/nvim/lua/plugins/lazydev.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lazydev.lua index 704d963..704d963 100644 --- a/nvim/lua/plugins/lazydev.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lazydev.lua diff --git a/nvim/lua/plugins/lspsaga.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lspsaga.lua index 86e949f..86e949f 100644 --- a/nvim/lua/plugins/lspsaga.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lspsaga.lua diff --git a/nvim/lua/plugins/lualine.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lualine.lua index 495822e..495822e 100644 --- a/nvim/lua/plugins/lualine.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/lualine.lua diff --git a/nvim/lua/plugins/mini-starter.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/mini-starter.lua index 67aae04..67aae04 100644 --- a/nvim/lua/plugins/mini-starter.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/mini-starter.lua diff --git a/nvim/lua/plugins/neopywal.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/neopywal.lua index 7c37dbe..7c37dbe 100644 --- a/nvim/lua/plugins/neopywal.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/neopywal.lua diff --git a/nvim/lua/plugins/neorg.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/neorg.lua index 528fc73..b6480b8 100644 --- a/nvim/lua/plugins/neorg.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/neorg.lua @@ -117,6 +117,7 @@ end return { "nvim-neorg/neorg", + enabled = false, lazy = true, ft = "norg", cmd = "Neorg", diff --git a/nvim/lua/plugins/noice.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/noice.lua index 43a12b2..43a12b2 100644 --- a/nvim/lua/plugins/noice.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/noice.lua diff --git a/nvim/lua/plugins/nvim-autopairs.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-autopairs.lua index d92a8cc..d92a8cc 100644 --- a/nvim/lua/plugins/nvim-autopairs.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-autopairs.lua diff --git a/nvim/lua/plugins/nvim-cmp.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-cmp.lua index b7d71a3..b7d71a3 100644 --- a/nvim/lua/plugins/nvim-cmp.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-cmp.lua diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-lspconfig.lua index 4c69816..4c69816 100644 --- a/nvim/lua/plugins/nvim-lspconfig.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-lspconfig.lua diff --git a/nvim/lua/plugins/nvim-treesitter.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-treesitter.lua index c053e84..15d88b1 100644 --- a/nvim/lua/plugins/nvim-treesitter.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/nvim-treesitter.lua @@ -17,7 +17,8 @@ local config = function() enable = true, }, } - require("nvim-treesitter").install { + + local parsers = { "c", "lua", "markdown", @@ -41,12 +42,13 @@ local config = function() "fish", "kdl", } + -- require("nvim-treesitter").install(parsers) end return { "nvim-treesitter/nvim-treesitter", lazy = false, branch = "main", - build = ":TSUpdate", + -- build = ":TSUpdate", config = config } diff --git a/nvim/lua/plugins/oil.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/oil.lua index 0d90db2..0d90db2 100644 --- a/nvim/lua/plugins/oil.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/oil.lua diff --git a/nvim/lua/plugins/parinfer-rust.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/parinfer-rust.lua index 2b31d8a..2b31d8a 100644 --- a/nvim/lua/plugins/parinfer-rust.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/parinfer-rust.lua diff --git a/nvim/lua/plugins/telescope.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/telescope.lua index 0f6d853..0f6d853 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/telescope.lua diff --git a/nvim/lua/plugins/todo-comments.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/todo-comments.lua index 1ae4a83..1ae4a83 100644 --- a/nvim/lua/plugins/todo-comments.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/todo-comments.lua diff --git a/nvim/lua/plugins/toggleterm.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/toggleterm.lua index 9bd1b78..9bd1b78 100644 --- a/nvim/lua/plugins/toggleterm.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/toggleterm.lua diff --git a/nvim/lua/plugins/vim-highlightedyank.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/vim-highlightedyank.lua index 9405e9e..9405e9e 100644 --- a/nvim/lua/plugins/vim-highlightedyank.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/vim-highlightedyank.lua diff --git a/nvim/lua/plugins/vim-illuminate.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/vim-illuminate.lua index f44b6c9..f44b6c9 100644 --- a/nvim/lua/plugins/vim-illuminate.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/vim-illuminate.lua diff --git a/nvim/lua/plugins/which-key.lua b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/which-key.lua index 4e391f9..4e391f9 100644 --- a/nvim/lua/plugins/which-key.lua +++ b/mirenn/home/files/dotfiles/.config/nvim/lua/plugins/which-key.lua diff --git a/scripts/powermenu b/mirenn/home/files/dotfiles/.config/scripts/powermenu index ef68e29..d118a69 100755 --- a/scripts/powermenu +++ b/mirenn/home/files/dotfiles/.config/scripts/powermenu @@ -1,4 +1,5 @@ -#!/usr/bin/fish +#!/usr/bin/env fish + set poweroff "" set reboot "" set lock "" @@ -10,17 +11,17 @@ set chosen (echo -e "$poweroff\n$reboot\n$lock\n$exit\n$sleep\n$hibernate" | rof switch $chosen case $poweroff - shutdown now + loginctl poweroff case $reboot - reboot + loginctl reboot case $lock loginctl lock-session case $exit niri msg action quit case $sleep - systemctl suspend + loginctl suspend case $hibernate - systemctl hibernate + loginctl hibernate case '*' exit 1 end diff --git a/scripts/set_background b/mirenn/home/files/dotfiles/.config/scripts/set_background index 0dd7347..7fea3d9 100755 --- a/scripts/set_background +++ b/mirenn/home/files/dotfiles/.config/scripts/set_background @@ -1,7 +1,8 @@ -#!/usr/bin/fish +#!/usr/bin/env fish + if test (count $argv) -lt 1; or not test -f $argv[1] - echo "Usage: $(status filename) <img>" - exit 1 + echo "Usage: $(status filename) <img>" + exit 1 end wallust run $argv[1] -Ts; and begin diff --git a/scripts/set_random b/mirenn/home/files/dotfiles/.config/scripts/set_random index 6c4a76d..33cf267 100755 --- a/scripts/set_random +++ b/mirenn/home/files/dotfiles/.config/scripts/set_random @@ -1,8 +1,8 @@ -#!/usr/bin/fish +#!/usr/bin/env fish if test (count $argv) -lt 1; or not test -d $argv[1] - echo "Usage: $(status filename) <dir>" - exit 1 + echo "Usage: $(status filename) <dir>" + exit 1 end ~/.config/scripts/set_background "$(fd -a -t f -d 1 -E "$(basename "$IMG")" -e jpg -e png -e webp . "$argv[1]" | shuf -n1)" diff --git a/mirenn/home/files/dotfiles/.config/scripts/wallpapermenu b/mirenn/home/files/dotfiles/.config/scripts/wallpapermenu new file mode 100755 index 0000000..2d6e1a8 --- /dev/null +++ b/mirenn/home/files/dotfiles/.config/scripts/wallpapermenu @@ -0,0 +1,12 @@ +#!/usr/bin/env fish + +if test (count $argv) -lt 1; or not test -d $argv[1] + echo "Usage: $(status filename) <dir>" + exit 1 +end + +~/.config/scripts/set_background ( + for file in (fd -a -t f -d 1 -E "$(basename "$IMG")" -e jpg -e png -e webp . "$argv[1]") + echo -en "$file\0icon\x1fthumbnail://$file\n" + end | rofi -dmenu -p " " -show-icons -theme ~/.config/rofi/wallpapermenu.rasi +) diff --git a/swayidle/config b/mirenn/home/files/dotfiles/.config/swayidle/config index 1157d55..d6ba83a 100644 --- a/swayidle/config +++ b/mirenn/home/files/dotfiles/.config/swayidle/config @@ -2,4 +2,4 @@ lock 'physlock -l ; swaylock -fe ; physlock -L' before-sleep 'loginctl lock-session ; niri msg output eDP-1 off' after-resume 'niri msg output eDP-1 on' timeout 300 'brightnessctl -se set 10%' resume 'brightnessctl -r' -timeout 360 'systemctl suspend' +timeout 360 'loginctl suspend' diff --git a/wallust/templates/foot b/mirenn/home/files/dotfiles/.config/wallust/templates/foot index 09f97ed..6dfe5e6 100644 --- a/wallust/templates/foot +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/foot @@ -1,7 +1,6 @@ -font=Hack Nerd Font:size=10,Sazanami Gothic:size=10,Noto Color Emoji:size=10 +font=Cica:size=10 pad=10x10x10x10 center dpi-aware=yes -term=foot-extra [cursor] style=block diff --git a/wallust/templates/mako b/mirenn/home/files/dotfiles/.config/wallust/templates/mako index 0211d7c..e06ab00 100644 --- a/wallust/templates/mako +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/mako @@ -5,7 +5,7 @@ border-color={{color2}} border-radius=0 default-timeout=5000 ignore-timeout=1 -font=Noto Color Emoji 10, Sazanami Gothic 10, Hack Nerd Font 10 +font=Cica 10 text-color={{foreground}} outer-margin=0,5,15,0 anchor=bottom-right diff --git a/wallust/templates/niri b/mirenn/home/files/dotfiles/.config/wallust/templates/niri index b2e7812..95760b9 100644 --- a/wallust/templates/niri +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/niri @@ -1,6 +1,8 @@ prefer-no-csd screenshot-path "~/Pictures/Screenshots/%Y%m%d-%H%M%S.png" spawn-sh-at-startup "fish -c 'swaybg -i $IMG &'" +spawn-at-startup "waybar" +spawn-at-startup "swayidle" "-w" environment { QT_QPA_PLATFORM "wayland" @@ -120,24 +122,24 @@ animations { window-resize { spring damping-ratio=0.75 stiffness=250 epsilon=0.0001 } - window-open { - duration-ms 500 - curve "ease-out-expo" + window-open { + duration-ms 250 + curve "ease-out-quad" custom-shader r" - // Fall from Top - vec4 open_color(vec3 coords_geo, vec3 size_geo) { - float progress = niri_clamped_progress * niri_clamped_progress; - vec2 coords = (coords_geo.xy - vec2(0.5, 0.0)) * size_geo.xy; - coords.y += (1.0 - progress) * 1440.0; - float random = (niri_random_seed - 0.5) / 2.0; - random = sign(random) - random; - float max_angle = 0.5 * random; - float angle = (1.0 - progress) * max_angle; - mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle)); - coords = rotate * coords; - coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 0.0), 1.0); + vec4 zoom_in(vec3 coords_geo, vec3 size_geo) { + float progress = niri_clamped_progress; + float scale = progress; + vec2 coords = (coords_geo.xy - vec2(0.5, 0.5)) * size_geo.xy; + coords = coords / scale; + coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 0.5), 1.0); vec3 coords_tex = niri_geo_to_tex * coords_geo; - return texture2D(niri_tex, coords_tex.st); + vec4 color = texture2D(niri_tex, coords_tex.st); + color.a *= progress; + + return color; + } + vec4 open_color(vec3 coords_geo, vec3 size_geo) { + return zoom_in(coords_geo, size_geo); } " } @@ -196,13 +198,13 @@ switch-events { binds { Mod+Backslash { show-hotkey-overlay; } - Mod+Return hotkey-overlay-title="Spawn Terminal" { spawn "foot"; } - Mod+Space hotkey-overlay-title="Spawn Applauncher" { spawn "rofi" "-show" "drun" "-theme" "~/.config/rofi/applauncher.rasi"; } - Mod+Escape hotkey-overlay-title="Spawn Powermenu" { spawn "~/.config/scripts/powermenu"; } - Mod+W hotkey-overlay-title="Spawn Wallpapermenu" { spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/"; } - Mod+Shift+W hotkey-overlay-title="Random Wallpaper" { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/"; } - Mod+Alt+W { spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/Alt/"; } - Mod+Alt+Shift+W { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/Alt/"; } + Mod+Return hotkey-overlay-title="Spawn Terminal" { spawn "foot"; } + Mod+Space hotkey-overlay-title="Spawn Applauncher" { spawn "rofi" "-show" "drun" "-theme" "~/.config/rofi/applauncher.rasi"; } + Mod+Escape hotkey-overlay-title="Spawn Powermenu" { spawn "~/.config/scripts/powermenu"; } + Mod+W hotkey-overlay-title="Spawn Wallpapermenu" { spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/"; } + Mod+Shift+W hotkey-overlay-title="Random Wallpaper" { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/"; } + // Mod+Alt+W { spawn-sh "~/.config/scripts/wallpapermenu ~/Pictures/Backgrounds/Alt/"; } + // Mod+Alt+Shift+W { spawn-sh "~/.config/scripts/set_random ~/Pictures/Backgrounds/Alt/"; } XF86AudioRaiseVolume allow-when-locked=true { spawn "pamixer" "-i" "5"; } XF86AudioLowerVolume allow-when-locked=true { spawn "pamixer" "-d" "5"; } diff --git a/wallust/templates/nvim b/mirenn/home/files/dotfiles/.config/wallust/templates/nvim index c5e966d..c5e966d 100644 --- a/wallust/templates/nvim +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/nvim diff --git a/wallust/templates/rofi-applauncher b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-applauncher index 359fce6..5a07aae 100644 --- a/wallust/templates/rofi-applauncher +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-applauncher @@ -10,14 +10,14 @@ configuration { * { background-color: {{background}}; color: {{foreground}}; - font: "Hack Nerd Font 10"; + font: "Cica 10"; } window { location: north west; anchor: center; - width: 589; + width: 710; y-offset: -22; - x-offset: 260; + x-offset: 220; padding: 3 5 3 3; } mainbox { diff --git a/wallust/templates/rofi-powermenu b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-powermenu index 0ce26aa..0ce26aa 100644 --- a/wallust/templates/rofi-powermenu +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-powermenu diff --git a/wallust/templates/rofi-wallpapermenu b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-wallpapermenu index b1ea0da..70cd711 100644 --- a/wallust/templates/rofi-wallpapermenu +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/rofi-wallpapermenu @@ -3,7 +3,7 @@ * { background-color: {{background}}; color: {{foreground}}; - font: "Hack Nerd Font 10"; + font: "Cica 10"; } window { border: 1; diff --git a/wallust/templates/swaylock b/mirenn/home/files/dotfiles/.config/wallust/templates/swaylock index 2a8a860..5e4e273 100644 --- a/wallust/templates/swaylock +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/swaylock @@ -2,7 +2,7 @@ indicator-caps-lock indicator-idle-visible indicator-radius=100 -font=Hack Nerd Font +font=Cica font-size=50 clock diff --git a/wallust/templates/waybar b/mirenn/home/files/dotfiles/.config/wallust/templates/waybar index da7690b..3ff730c 100644 --- a/wallust/templates/waybar +++ b/mirenn/home/files/dotfiles/.config/wallust/templates/waybar @@ -1,5 +1,5 @@ * { - font-family: Hack Nerd Font; + font-family: Cica; } window#waybar { diff --git a/wallust/wallust.toml b/mirenn/home/files/dotfiles/.config/wallust/wallust.toml index 9a63624..9a63624 100644 --- a/wallust/wallust.toml +++ b/mirenn/home/files/dotfiles/.config/wallust/wallust.toml diff --git a/waybar/config b/mirenn/home/files/dotfiles/.config/waybar/config index 18f6c0c..ae38d5f 100644 --- a/waybar/config +++ b/mirenn/home/files/dotfiles/.config/waybar/config @@ -18,7 +18,7 @@ "format-connected": "<span font-family='Symbols Nerd Font Mono'></span>", "tooltip-format-connecte": "{device_alias}", "tooltip-format-connected-battery": "{device_alias} ({device_battery_percentage}%)", - "on-click": "foot bluetuith" + "on-click": "bzmenu -l rofi" }, "network": { "format-wifi": "<span font-family='Symbols Nerd Font Mono'></span>", diff --git a/yazi/init.lua b/mirenn/home/files/dotfiles/.config/yazi/init.lua index 6c283c4..6c283c4 100644 --- a/yazi/init.lua +++ b/mirenn/home/files/dotfiles/.config/yazi/init.lua diff --git a/yazi/keymap.toml b/mirenn/home/files/dotfiles/.config/yazi/keymap.toml index 397b2ec..397b2ec 100644 --- a/yazi/keymap.toml +++ b/mirenn/home/files/dotfiles/.config/yazi/keymap.toml diff --git a/yazi/package.toml b/mirenn/home/files/dotfiles/.config/yazi/package.toml index da4281b..da4281b 100644 --- a/yazi/package.toml +++ b/mirenn/home/files/dotfiles/.config/yazi/package.toml diff --git a/yazi/theme.toml b/mirenn/home/files/dotfiles/.config/yazi/theme.toml index 8bb3558..8bb3558 100644 --- a/yazi/theme.toml +++ b/mirenn/home/files/dotfiles/.config/yazi/theme.toml diff --git a/yazi/yazi.toml b/mirenn/home/files/dotfiles/.config/yazi/yazi.toml index e7c3619..e7c3619 100644 --- a/yazi/yazi.toml +++ b/mirenn/home/files/dotfiles/.config/yazi/yazi.toml diff --git a/mirenn/home/services/brightnessctl.scm b/mirenn/home/services/brightnessctl.scm new file mode 100644 index 0000000..b71e04a --- /dev/null +++ b/mirenn/home/services/brightnessctl.scm @@ -0,0 +1,37 @@ +(define-module (mirenn home services brightnessctl) + #:use-module (guix gexp) + #:use-module (gnu services) + #:use-module (gnu services shepherd) + #:use-module (gnu services configuration) + #:use-module (gnu home services) + #:use-module (gnu home services shepherd) + #:use-module (gnu packages linux) + + #:export (home-brightnessctl-configuration)) + +(define-configuration/no-serialization home-brightnessctl-configuration + (state-file + (string ".local/state/brightnessctl") + "The file which the brightness state is stored.")) + +(define (home-brightnessctl-shepherd-service config) + (list + (shepherd-service + (provision '(brightnessctl)) + (documentation "Save and restore brightness.") + (start #~(make-system-constructor + #$(string-append "brightnessctl set $(cat \"$HOME/" + (home-brightnessctl-configuration-state-file config) + "\")"))) + (stop #~(make-system-destructor + #$(string-append "brightnessctl get > \"$HOME/" + (home-brightnessctl-configuration-state-file config) + "\"")))))) + +(define-public home-brightnessctl-service-type + (service-type + (name 'home-brightnessctl) + (extensions + (list (service-extension home-shepherd-service-type home-brightnessctl-shepherd-service))) + (description "Save and restore brightness.") + (default-value (home-brightnessctl-configuration)))) diff --git a/mirenn/home/services/timer.scm b/mirenn/home/services/timer.scm new file mode 100644 index 0000000..59e2fc8 --- /dev/null +++ b/mirenn/home/services/timer.scm @@ -0,0 +1,42 @@ +(define-module (mirenn home services timer) + #:use-module (guix gexp) + #:use-module (gnu services) + #:use-module (gnu services shepherd) + #:use-module (gnu services configuration) + #:use-module (gnu home services) + #:use-module (gnu home services shepherd) + + #:export (home-timer-configuration)) + +(define-configuration/no-serialization home-timer-configuration + (name + symbol + "Name of the timer.") + (script + local-file + "Script to run on timeout.") + (arguments + (list string) + "Arguments passed to the script.") + (delay + number + "Timer delay in seconds.")) + +(define (home-timer-shepherd-service config) + (list + (shepherd-service + (documentation "Run a periodic task") + (provision (list (home-timer-configuration-name config))) + (respawn? #t) + (respawn-delay (home-timer-configuration-delay config)) + (start #~(make-forkexec-constructor + (cons #$(home-timer-configuration-script config) + #$(home-timer-configuration-arguments config)))) + (stop #~(make-kill-destructor))))) + +(define-public home-timer-service-type + (service-type + (name 'home-timer') + (extensions + (list (service-extension home-shepherd-service-type home-timer-shepherd-service))) + (description "Runs a script periodically based on a respawn delay"))) |