From ee81d5a4cd86a24635fedb57cd694cfabf50e38b Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Wed, 4 Sep 2024 12:05:12 -0400 Subject: [PATCH] update hyprland, ssh config, remove liks tpm, other stuff --- .config/gtk-2.0/gtkfilechooser.ini | 6 ++-- .config/gtk-3.0/bookmarks | 2 +- .config/hypr/config.d/keybinds.conf | 2 +- .config/hypr/config.d/theme.conf | 13 --------- .config/kitty/kitty.conf | 2 +- .config/nvim/lua/lsp.lua | 1 + .root/etc/initcpio/post/uki-sbsign | 2 +- .root/etc/mkinitcpio.conf | 2 +- .ssh/config | 44 ++++++++++++++++------------- aur | 11 +++++++- packages | 15 ++++++++++ 11 files changed, 58 insertions(+), 42 deletions(-) diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini index b2ce7ed..1dc5e3b 100644 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ b/.config/gtk-2.0/gtkfilechooser.ini @@ -1,9 +1,9 @@ [Filechooser Settings] LocationMode=path-bar -ShowHidden=false +ShowHidden=true ShowSizeColumn=true -GeometryX=0 -GeometryY=8 +GeometryX=806 +GeometryY=493 GeometryWidth=948 GeometryHeight=656 SortColumn=name diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks index e2576aa..0b4dbb5 100644 --- a/.config/gtk-3.0/bookmarks +++ b/.config/gtk-3.0/bookmarks @@ -1,6 +1,6 @@ file:///home/freya/.config file:///home/freya/downloads +file:///home/freya/sync/nextcloud file:///home/freya/documents file:///home/tylerm/code file:///home/tylerm/sync -file:///home/freya/sync/nextcloud diff --git a/.config/hypr/config.d/keybinds.conf b/.config/hypr/config.d/keybinds.conf index f7ecf4e..a3ce255 100644 --- a/.config/hypr/config.d/keybinds.conf +++ b/.config/hypr/config.d/keybinds.conf @@ -24,7 +24,7 @@ binde =, XF86AudioPrev, exec, playerctl previous binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%- binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+ -bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard" +bind = $mod SHIFT, s, exec, grimblast copy area && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard" bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard" bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy diff --git a/.config/hypr/config.d/theme.conf b/.config/hypr/config.d/theme.conf index cca9cbe..7fe6eae 100644 --- a/.config/hypr/config.d/theme.conf +++ b/.config/hypr/config.d/theme.conf @@ -32,18 +32,6 @@ plugin { enable = true } } - - hyprbars { - bar_height = 24 - bar_part_of_window = true - bar_color = $base_color - col.text = $text_color - bar_text_size = 9 - bar_text_font = JetBrains Mono Nerd Font Mono Bold - bar_button_padding = 12 - bar_padding = 10 - bar_precedence_over_border = true - } } decoration { @@ -86,7 +74,6 @@ gestures { misc { disable_hyprland_logo = true disable_splash_rendering = true - no_direct_scanout = false key_press_enables_dpms = true mouse_move_enables_dpms = true middle_click_paste = true diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 299d17d..90c096a 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -14,7 +14,7 @@ show_hyperlink_targets yes show_hyperlink_targets no -background_opacity 0.85 +background_opacity 0.75 window_padding_width 10 diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index a548518..47440b0 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -15,6 +15,7 @@ require('mason-lspconfig').setup({ 'jdtls', 'bashls', 'lua_ls', + 'csharp_ls', }, handlers = { lsp.default_setup, diff --git a/.root/etc/initcpio/post/uki-sbsign b/.root/etc/initcpio/post/uki-sbsign index eb34cd4..1d09310 100755 --- a/.root/etc/initcpio/post/uki-sbsign +++ b/.root/etc/initcpio/post/uki-sbsign @@ -3,7 +3,7 @@ uki="$3" [[ -n "$uki" ]] || exit 0 -keypairs=(/usr/share/secureboot/keys/db/db.key /usr/share/secureboot/keys/db/db.pem) +keypairs=(/var/lib/sbctl/keys/db/db.key /var/lib/sbctl/keys/db/db.pem) for (( i=0; i<${#keypairs[@]}; i+=2 )); do key="${keypairs[$i]}" diff --git a/.root/etc/mkinitcpio.conf b/.root/etc/mkinitcpio.conf index 69305ab..c23bca2 100644 --- a/.root/etc/mkinitcpio.conf +++ b/.root/etc/mkinitcpio.conf @@ -2,4 +2,4 @@ MODULES=(vfio_pci vfio_iommu_type1 vfio) BINARIES=() FILES=() -HOOKS=(base udev autodetect microcode modconf kms keyboard keymap block tpm2 encrypt filesystems fsck) +HOOKS=(base udev autodetect microcode modconf kms keyboard keymap block encrypt filesystems fsck) diff --git a/.ssh/config b/.ssh/config index db271fa..2908047 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,46 +1,49 @@ Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" -Host garchomp - HostName garchomp.freya.cat +Host shun* + HostName shun.freya.cat user freya -Host yveltal +Host *.in.freya.cat + User root + +Host lenga HostName 10.2.0.8 User root Port 1111 -Host yveltal.ospf - HostName 10.1.1.1 +Host ospf.lenga* + HostName ospf.lenga.in.freya.cat User root Port 22 -Host yveltal.router - HostName 10.1.3.1 +Host router.lenga* + HostName router.lenga.in.freya.cat User root Port 22 -Host yveltal.services - HostName 10.1.3.129 +Host services.lenga* + HostName services.lenga.in.freya.cat User root Port 22 -Host yveltal.plex - HostName 10.1.3.73 +Host plex.lenga* + HostName plex.lenga.in.freya.cat User root Port 22 -Host yveltal.minecraft - HostName 10.1.3.13 +Host minecraft.lenga* + HostName minecraft.lenga.in.freya.cat User root Port 22 -Host tangela - HostName 10.1.4.200 +Host tangela* + HostName tangela.in.freya.cat User root Port 22 -Host tangela.router - HostName 10.1.4.1 +Host router.tangela* + HostName router.tangela.in.freya.cat User root Port 22 @@ -52,9 +55,10 @@ Host redcom HostName fmurphy-dev.redcom.com User fmurphy -Host g.freya.cat - HostkeyAlgorithms +ssh-rsa - PubkeyAcceptedKeyTypes +ssh-rsa +Host *.cs.rit.edu + User tam2214 Host * + HostkeyAlgorithms +ssh-rsa + PubkeyAcceptedKeyTypes +ssh-rsa KexAlgorithms -sntrup761x25519-sha512@openssh.com diff --git a/aur b/aur index d3f7bf9..d7db528 100644 --- a/aur +++ b/aur @@ -2,19 +2,28 @@ amf-amdgpu-pro aylurs-gtk-shell eww flashplayer-standalone +grimblast-git +hollywood librewolf-bin +libticables-git +libticalcs-git +libticonv-git +libtifiles-git mint-themes mint-y-icons mkinitcpio-firmware -nwg-displays paru pfetch-rs phpactor prismlauncher-qt5-bin proton-ge-custom-bin +python-chex +python-diffusers qt5-styleplugins qt6gtk2-git swayfx-git +teams +tilp-git ttf-twemoji-color units unofficial-homestuck-collection-bin diff --git a/packages b/packages index 5c87cca..211a071 100644 --- a/packages +++ b/packages @@ -12,6 +12,7 @@ bluez-utils brightnessctl btrfs-progs cage +chromium chrony cmake cpupower @@ -25,6 +26,9 @@ docker docker-buildx docker-compose dosfstools +dotnet-host +dotnet-runtime +dotnet-sdk e2fsprogs easyeffects efibootmgr @@ -32,6 +36,7 @@ efitools element-desktop exfatprogs fd +freeradius gajim gamescope gdb @@ -44,6 +49,7 @@ gnome-keyring gnome-themes-extra gnu-netcat grim +grub gsound gspell gst-libav @@ -84,7 +90,10 @@ mangohud mesa-utils mesa-vdpau mlocate +mono +mono-msbuild mpv +mtools nasm nautilus neofetch @@ -98,17 +107,21 @@ noto-fonts-cjk npm ntfs-3g nvme-cli +nwg-displays nwg-look opendoas +openldap p7zip pacutils parallel pavucontrol +perf php pipewire-alsa pipewire-pulse polkit-gnome python-pynvim +python-pytorch qbittorrent qemu-full qpwgraph @@ -116,11 +129,13 @@ qt5-wayland qt6ct ranger ripgrep +rpi-imager rsync rustup sassc sbctl sbsigntools +scrcpy slurp socat sof-firmware