diff --git a/bash/.bashrc b/bash/.bashrc index bdf98e0..81b09aa 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -8,10 +8,8 @@ export VISUAL=nvim export EDITOR=nvim -alias xin="doas xbps-install" -alias xor="xbps-query -Rs" -alias xrm="doas xbps-remove -R" -alias xclean="doas xbps-remove -ROo" +alias gx="nvim /home/$(whoami)/.config/guix/system.scm" +alias gxsw="sudo guix system reconfigure /home/$(whoami)/.config/guix/system.scm" alias frep="grep -rnwe" @@ -19,18 +17,14 @@ alias ls='ls --color=auto' alias grep='grep --color=auto' alias ip="ip --color=auto" alias woman='man' -alias sudo='doas' -alias ":q"="echo \"You're not in neovim dummy!\"" +alias poweroff="sudo shutdown" -alias fanMax="su -c \"echo level 7 > /proc/acpi/ibm/fan\"" -alias fanMid="su -c \"echo level 4 > /proc/acpi/ibm/fan\"" -alias fanAuto="su -c \"echo level auto > /proc/acpi/ibm/fan\"" +alias :q="echo \"You're not in neovim dummy!\"" export MANPAGER='nvim +Man!' # This is just for fun -alias fih="fastfetch --logo openbsd --config /home/zink/.config/fastfetch/fih1.jsonc" eval "$(fzf --bash)" diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini index 1cdcbd2..2442c54 100644 --- a/foot/.config/foot/foot.ini +++ b/foot/.config/foot/foot.ini @@ -9,7 +9,7 @@ # title=foot # locked-title=no -font=NotoSansM Nerd Font:size=12 +font=Iosevka:size=12 # font=Iosevka:size=12 # font-bold= # font-italic= diff --git a/guix/.config/guix/channels.scm b/guix/.config/guix/channels.scm new file mode 100644 index 0000000..08b3a76 --- /dev/null +++ b/guix/.config/guix/channels.scm @@ -0,0 +1,19 @@ +(cons* + (channel + (name 'mangowm) + (url "https://github.com/mangowm/mango.git") + (branch "main")) + + (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + + (channel + (name 'guix-minecraft) + (url "https://github.com/Blixodus/guix-minecraft.git") + (branch "master")) + %default-channels) diff --git a/guix/.config/guix/system.scm b/guix/.config/guix/system.scm new file mode 100644 index 0000000..9d6279f --- /dev/null +++ b/guix/.config/guix/system.scm @@ -0,0 +1,110 @@ +(use-modules (gnu) (gnu system nss) #|(nongnu packages game-client)|# (mangowm) (minecraft minecraft)) +(use-service-modules ssh networking desktop) +(use-package-modules bootloaders rust admin wm vim + fonts terminals version-control librewolf xdisorg + image image-viewers linux glib + gnome pulseaudio cinnamon package-management + game-development emacs emacs-xyz kde-systemtools + screen gcc cmake qt + gnome-xyz kde-frameworks kde-plasma nwg-shell + java) + +(operating-system + (host-name "headlights") + (timezone "Europe/Berlin") + (locale "en_GB.utf8") + (keyboard-layout (keyboard-layout "de")) + + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (targets '("/boot/efi")))) + + (file-systems (append (list + (file-system + (device "/dev/vda2") + (mount-point "/") + (type "ext4")) + (file-system + (device "/dev/vda1") + (mount-point "/boot/efi") + (type "vfat"))) + %base-file-systems)) + +(swap-devices (list + (swap-space + (target "/swapfile") + (dependencies (filter (file-system-mount-point-predicate "/") + file-systems))))) + + (users (cons + (user-account + (name "Zoe") + (group "users") + (supplementary-groups '("wheel" "netdev" "audio" "video"))) + %base-user-accounts)) + + (packages (append (list + ;; Base + binutils + git + raylib + vim + neovim + emacs + emacs-vterm + libvterm + rust + gcc + cmake + fzf + stow + screen + btop + foot + dbus + pipewire + wireplumber + ;; "Rice" + mangowm-git + quickshell + swaybg + swayimg + rofi + pavucontrol + mako + fastfetch + hyfetch + grim + slurp + qt6ct + qt5ct + dolphin + nemo + ;; Icons / Theme + guix-icons + libadwaita + adwaita-icon-theme + breeze + breeze-gtk + breeze-icons + oxygen-icons + nwg-look + ;; Fonts + gnome-font-viewer + font-iosevka + font-google-noto + font-google-noto-sans-cjk + ;; Misc + prismlauncher + openjdk + librewolf + ) + %base-packages)) + + (services (append (list + (service openssh-service-type) + (service dhcpcd-service-type) + (service elogind-service-type) + (service upower-service-type)) + %base-services)) +) diff --git a/mango/.config/mango/config.conf b/mango/.config/mango/config.conf index fd757f1..ec4ffd0 100755 --- a/mango/.config/mango/config.conf +++ b/mango/.config/mango/config.conf @@ -10,17 +10,17 @@ env=QT_QPA_PLATFORM,wayland #exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" exec = gsettings set org.gnome.desktop.wm.preferences button-layout "" -#exec-once=swaybg -i ~/.config/walls/wallBrownTiled.jpg -exec-once=swaybg -i ~/.config/walls/unit-01-closeup-text.png -exec-once=nm-applet --indicator -exec-once=pipewire -#exec-once=pipewire-pulse -#exec-once=wireplumber -exec-once=qs -exec-once=foot -s +#exec_once=swaybg -i ~/.config/walls/wallBrownTiled.jpg +exec_once = swaybg -i ~/.config/walls/unit-01-closeup-text.png +exec_once=nm-applet --indicator +exec_once=pipewire +#exec_once=pipewire-pulse +#exec_once=wireplumber +exec_once=qs +exec_once=foot -s # Monitor Rules -monitorrule=name:eDP-1,width:1920,height:1080,refresh:60,x:0,y:0,scale:1 +monitor_rule=name:eDP-1,width:1920,height:1080,refresh:60,x:0,y:0,scale:1 #monitorrule=name:HDMI-A-1,width:1920,height:1080,refresh:60,x:0,y:0,scale:1 # Window effect @@ -41,7 +41,7 @@ shadows_size = 10 shadows_blur = 15 shadows_position_x = 0 shadows_position_y = 0 -shadowscolor= 0x000000ff +shadows_color= 0x000000ff border_radius=5 no_radius_when_single=0 @@ -59,8 +59,8 @@ animation_fade_out=1 tag_animation_direction=1 zoom_initial_ratio=0.3 zoom_end_ratio=0.8 -fadein_begin_opacity=0.5 -fadeout_begin_opacity=0.8 +fade_in_begin_opacity=0.5 +fade_out_begin_opacity=0.8 animation_duration_move=300 animation_duration_open=250 animation_duration_tag=150 @@ -71,8 +71,8 @@ animation_curve_move=0.46,1.0,0.29,1 animation_curve_tag=0.46,1.0,0.29,1 animation_curve_close=0.08,0.92,0,1 animation_curve_focus=0.46,1.0,0.29,1 -animation_curve_opafadeout=0.5,0.5,0.5,0.5 -animation_curve_opafadein=0.46,1.0,0.29,1 +animation_curve_opacity_fade_out=0.5,0.5,0.5,0.5 +animation_curve_opacity_fade_in=0.46,1.0,0.29,1 # Scroller Layout Setting scroller_structs=20 @@ -85,24 +85,24 @@ scroller_proportion_preset=0.5,0.8,1.0 # Master-Stack Layout Setting new_is_master=1 -default_mfact=0.55 -default_nmaster=1 -smartgaps=0 +default_master_factor=0.55 +default_master_count=1 +smart_gaps=0 # Dwindle Layout Setting dwindle_smart_split=0 dwindle_drop_simple_split=1 dwindle_manual_split=0 -dwindle_hsplit=1 -dwindle_vsplit=1 +dwindle_horizontal_split=1 +dwindle_vertical_split=1 dwindle_preserve_split=0 # Overview Setting hotarea_size=5 enable_hotarea=0 hotarea_disable_on_fullscreen=1 -overviewgappi=5 -overviewgappo=30 +overview_gap_inner=5 +overview_gap_outer=30 overcircle_center_ratio=0.5 jump_labels=1234567890HJKLASDFGQWERTYU @@ -110,12 +110,12 @@ jump_labels=1234567890HJKLASDFGQWERTYU no_border_when_single=0 axis_bind_apply_timeout=100 focus_on_activate=0 -idleinhibit_ignore_visible=0 -idleinhibit_when_fullscreen=0 -sloppyfocus=1 -warpcursor=1 +idle_inhibit_ignore_visible=0 +idle_inhibit_when_fullscreen=0 +sloppy_focus=1 +warp_cursor=1 focus_cross_monitor=0 -focusdir_only_zone_overlap=1 +focus_direction_only_zone_overlap=1 focus_cross_tag=0 enable_floating_snap=0 snap_distance=30 @@ -128,7 +128,7 @@ drag_tile_small=1 # keyboard repeat_rate=25 repeat_delay=400 -numlockon=0 +numlock_on=0 xkb_rules_layout=de # Trackpad @@ -150,23 +150,23 @@ mouse_natural_scrolling=0 mouse_accel_speed=0.6 # Appearance -gappih=5 -gappiv=5 -gappoh=10 -gappov=10 +gap_inner_horizontal=5 +gap_inner_vertical=5 +gap_outer_horizontal=10 +gap_outer_vertical=10 scratchpad_width_ratio=0.8 scratchpad_height_ratio=0.9 -borderpx=3 -rootcolor=0x1e0a28ff -bordercolor=0x444444ff -dropcolor=0x1e0a28ff -splitcolor=0x1e0a28ff -focuscolor=0x3c1450ff -maximizescreencolor=0x89aa61ff -urgentcolor=0xad401fff -scratchpadcolor=0x516c93ff -globalcolor=0xb153a7ff -overlaycolor=0x1e0a28ff +border_px=3 +root_color=0x1e0a28ff +border_color=0x444444ff +drop_color=0x1e0a28ff +split_color=0x1e0a28ff +focus_color=0x3c1450ff +maximized_screen_color=0x89aa61ff +urgent_color=0xad401fff +scratchpad_color=0x516c93ff +global_color=0xb153a7ff +overlay_color=0x1e0a28ff jump_label_decorate_fg_color=0xd2d2d2ff jump_label_decorate_bg_color=0x1e0a28ff @@ -174,15 +174,15 @@ jump_label_decorate_border_color=0x3c1450ff # layout support: # tile, scroller, monocle, grid, deck, center_tile, vertical_tile, right_tile, vertical_scroller, vertical_grid, vertical_deck, dwindle, fair, vertical_fair -tagrule=id:1,layout_name:dwindle -tagrule=id:2,layout_name:dwindle -tagrule=id:3,layout_name:dwindle -tagrule=id:4,layout_name:dwindle -tagrule=id:5,layout_name:dwindle -tagrule=id:6,layout_name:dwindle -tagrule=id:7,layout_name:dwindle -tagrule=id:8,layout_name:dwindle -tagrule=id:9,layout_name:dwindle +tag_rule=id:1,layout_name:dwindle +tag_rule=id:2,layout_name:dwindle +tag_rule=id:3,layout_name:dwindle +tag_rule=id:4,layout_name:dwindle +tag_rule=id:5,layout_name:dwindle +tag_rule=id:6,layout_name:dwindle +tag_rule=id:7,layout_name:dwindle +tag_rule=id:8,layout_name:dwindle +tag_rule=id:9,layout_name:dwindle # Key Bindings # key name refer to `xev` or `wev` command output, @@ -329,5 +329,5 @@ gesturebind=none,up,4,focusdir,up gesturebind=none,down,4,focusdir,down # layer rule -layerrule=animation_type_open:zoom,layer_name:rofi -layerrule=animation_type_close:zoom,layer_name:rofi +layer_rule=animation_type_open:zoom,layer_name:rofi +layer_rule=animation_type_close:zoom,layer_name:rofi diff --git a/zgit b/zgit index 6ac34e1..57d4342 100755 --- a/zgit +++ b/zgit @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This is just to update my git repo a tiny bit faster usage() { echo "Usage: $0 [-a \"\"] [-s ]" 1>&2; exit 1; } diff --git a/zstow b/zstow index 2cdfd0d..c906bde 100755 --- a/zstow +++ b/zstow @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Had to make this because i couldn't figure out how ".stow-local-igmore" works smh if [ "${1,,}" == "update" ]; then stow -v -R */