From 2cb639b95fc4d7834a092adf37c9ebec90fe7193 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Fri, 29 Sep 2023 10:36:21 -0400 Subject: update sway and waybar configuration, hanve around guix packages --- channels.scm | 4 +- home-config/home-configuration.scm | 19 ++++-- home-config/nix-home-manager/home.nix | 8 ++- home-config/ssh/config | 5 ++ home-config/sway/auto.sh | 19 ------ home-config/sway/config | 9 +-- home-config/sway/config.d/idle | 4 +- home-config/sway/config.d/keybinds | 2 +- home-config/sway/config.d/scratch | 4 +- home-config/sway/config.d/theme | 5 +- home-config/sway/lock.sh | 3 - home-config/sway/logout.d/power/img/lock-hover.png | Bin 0 -> 6421 bytes home-config/sway/logout.d/power/img/lock.png | Bin 0 -> 6692 bytes .../sway/logout.d/power/img/logout-hover.png | Bin 0 -> 6076 bytes home-config/sway/logout.d/power/img/logout.png | Bin 0 -> 6612 bytes .../sway/logout.d/power/img/power-hover.png | Bin 0 -> 6995 bytes home-config/sway/logout.d/power/img/power.png | Bin 0 -> 6996 bytes .../sway/logout.d/power/img/restart-hover.png | Bin 0 -> 6846 bytes home-config/sway/logout.d/power/img/restart.png | Bin 0 -> 7355 bytes .../sway/logout.d/power/img/sleep-hover.png | Bin 0 -> 6094 bytes home-config/sway/logout.d/power/img/sleep.png | Bin 0 -> 6683 bytes home-config/sway/logout.d/power/layout | 30 ++++++++ home-config/sway/logout.d/power/style.css | 76 +++++++++++++++++++++ home-config/sway/nya0.png | Bin 46891955 -> 0 bytes home-config/sway/power/img/lock-hover.png | Bin 6421 -> 0 bytes home-config/sway/power/img/lock.png | Bin 6692 -> 0 bytes home-config/sway/power/img/logout-hover.png | Bin 6076 -> 0 bytes home-config/sway/power/img/logout.png | Bin 6612 -> 0 bytes home-config/sway/power/img/power-hover.png | Bin 6995 -> 0 bytes home-config/sway/power/img/power.png | Bin 6996 -> 0 bytes home-config/sway/power/img/restart-hover.png | Bin 6846 -> 0 bytes home-config/sway/power/img/restart.png | Bin 7355 -> 0 bytes home-config/sway/power/img/sleep-hover.png | Bin 6094 -> 0 bytes home-config/sway/power/img/sleep.png | Bin 6683 -> 0 bytes home-config/sway/power/layout | 30 -------- home-config/sway/power/style.css | 76 --------------------- home-config/sway/scratchpads.sh | 4 -- home-config/sway/scripts.d/auto.sh | 19 ++++++ home-config/sway/scripts.d/scratchpads.sh | 4 ++ home-config/sway/wallpapers/blue.jpg | Bin 0 -> 1539393 bytes home-config/sway/wallpapers/nya0.png | Bin 0 -> 46891955 bytes home-config/waybar/config | 18 ++--- home-config/waybar/custom_cmus.lua | 58 ---------------- home-config/waybar/custom_newsboat.sh | 12 ---- home-config/waybar/style.css | 1 - home-config/wofi/config.bak | 6 -- home-config/wofi/style.css.bak | 54 --------------- home-config/xdg/mimeapps.list | 3 + home-config/zsh/zshrc | 5 +- modules/home-config/base-system.scm | 23 ++++--- modules/home-packages/gcc.scm | 12 ---- modules/home-packages/web.scm | 49 +++++++++++++ shinji.scm | 6 ++ 53 files changed, 251 insertions(+), 317 deletions(-) delete mode 100755 home-config/sway/auto.sh delete mode 100755 home-config/sway/lock.sh create mode 100644 home-config/sway/logout.d/power/img/lock-hover.png create mode 100644 home-config/sway/logout.d/power/img/lock.png create mode 100644 home-config/sway/logout.d/power/img/logout-hover.png create mode 100644 home-config/sway/logout.d/power/img/logout.png create mode 100644 home-config/sway/logout.d/power/img/power-hover.png create mode 100644 home-config/sway/logout.d/power/img/power.png create mode 100644 home-config/sway/logout.d/power/img/restart-hover.png create mode 100644 home-config/sway/logout.d/power/img/restart.png create mode 100644 home-config/sway/logout.d/power/img/sleep-hover.png create mode 100644 home-config/sway/logout.d/power/img/sleep.png create mode 100644 home-config/sway/logout.d/power/layout create mode 100644 home-config/sway/logout.d/power/style.css delete mode 100644 home-config/sway/nya0.png delete mode 100644 home-config/sway/power/img/lock-hover.png delete mode 100644 home-config/sway/power/img/lock.png delete mode 100644 home-config/sway/power/img/logout-hover.png delete mode 100644 home-config/sway/power/img/logout.png delete mode 100644 home-config/sway/power/img/power-hover.png delete mode 100644 home-config/sway/power/img/power.png delete mode 100644 home-config/sway/power/img/restart-hover.png delete mode 100644 home-config/sway/power/img/restart.png delete mode 100644 home-config/sway/power/img/sleep-hover.png delete mode 100644 home-config/sway/power/img/sleep.png delete mode 100644 home-config/sway/power/layout delete mode 100644 home-config/sway/power/style.css delete mode 100755 home-config/sway/scratchpads.sh create mode 100755 home-config/sway/scripts.d/auto.sh create mode 100755 home-config/sway/scripts.d/scratchpads.sh create mode 100755 home-config/sway/wallpapers/blue.jpg create mode 100644 home-config/sway/wallpapers/nya0.png delete mode 100755 home-config/waybar/custom_cmus.lua delete mode 100755 home-config/waybar/custom_newsboat.sh delete mode 100644 home-config/wofi/config.bak delete mode 100644 home-config/wofi/style.css.bak delete mode 100644 modules/home-packages/gcc.scm create mode 100644 modules/home-packages/web.scm diff --git a/channels.scm b/channels.scm index 61d82c7..0016f37 100644 --- a/channels.scm +++ b/channels.scm @@ -3,7 +3,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "e5f7c14ef6c951f02ca710fad1869db3aedff4b5") + "c4886c0cb608e1b36969f195eb2f7ea25a37ac89") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" @@ -14,7 +14,7 @@ (url "https://gitlab.com/nonguix/nonguix") (branch "master") (commit - "e951cda078529d238f1bc942db1112f76a01a5f7") + "61279f68f2b617ab868a094db856188602fc880b") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 89a2bc5..cfd6783 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -6,7 +6,6 @@ (use-modules (gnu home) (gnu packages) - (gnu packages gcc) (gnu packages gnupg) (gnu packages virtualization) (gnu services) @@ -18,8 +17,8 @@ (gnu home services) (home-services pipewire) (home-packages mozillia) + (home-packages web) (home-packages vim) - (home-packages gcc) (home-packages audio)) @@ -28,13 +27,14 @@ ;; Home profile, unser ~/.guix-home/profile. (packages (append (specifications->packages (list "xdg-utils" "mako" + "vscodium" "i3-autotiling" "wofi" "qrencode" "sassc" "binutils" - ;"gcc-toolchain" "clang-toolchain" + "racket" "libreoffice" "gnupg" "pavucontrol" @@ -68,13 +68,22 @@ "ripgrep" "fd" "nasm" + "wine-staging" + "winetricks" + "steam" "node" "ncurses" "jq" + "rust" + "gcc-toolchain" + "firefox-wayland" + "openssl" + "pkg-config" + "gnunet" "tree-sitter-cli" "python-pynvim")) - (list neovim-new easyeffects firefox-wayland-new gcc-new))) + (list neovim-new easyeffects firefox-wayland-new))) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. @@ -87,7 +96,7 @@ (service home-xdg-configuration-files-service-type `(("nvim/init.vim" ,(local-file "nvim/init.vim")) ("sway" ,(local-file "sway" #:recursive? #t)) - ("waybar" ,(local-file "waybar" #:recursive? #t)) + ;("waybar" ,(local-file "waybar" #:recursive? #t)) ("alacritty" ,(local-file "alacritty" #:recursive? #t)) ("lvim" ,(local-file "lvim" #:recursive? #t)) ("mako" ,(local-file "mako" #:recursive? #t)) diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index e1c1d17..f39d488 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -21,11 +21,15 @@ starship discord thunderbirdPackages.thunderbird-115 - + slack + cryptomator + pcem + #steam + # Rust rustup - glibc gcc-unwrapped + openssl # Java jdk diff --git a/home-config/ssh/config b/home-config/ssh/config index 7ab6f9f..65fad34 100644 --- a/home-config/ssh/config +++ b/home-config/ssh/config @@ -21,6 +21,11 @@ Host nitron Hostname nitron.cs.rit.edu User tam2214 +Host github.com + Hostname github.com + User tam2214 + IdentityFile /home/tylerm/.ssh/id_rit + Host * KexAlgorithms -sntrup761x25519-sha512@openssh.com diff --git a/home-config/sway/auto.sh b/home-config/sway/auto.sh deleted file mode 100755 index 68a28e2..0000000 --- a/home-config/sway/auto.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -/usr/lib/xdg-desktop-portal -r & -/usr/lib/xdg-desktop-portal-wlr -r & - -mako & - -nm-applet --indicator & - -GTK_THEME= waybar & - -autotiling & - -/usr/bin/gnome-keyring-daemon --foreground & - -discord --enable-features=UseOzonePlatform --ozone-platform=wayland & -element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland & -#thunderbird & - diff --git a/home-config/sway/config b/home-config/sway/config index e5613cb..497b549 100755 --- a/home-config/sway/config +++ b/home-config/sway/config @@ -14,12 +14,13 @@ set $menu wofi --allow-images --show=drun --prompt "Search Program" set $scale 1.5 # Set background -set $bg ~/.config/sway/nya0.png +set $bg ~/.config/sway/wallpapers/blue.jpg # Set Efects -set $radius 5 +set $gaps 10 +set $radius 0 set $shadows on -set $shadow_blur 50 +set $shadow_blur 15 set $blur enable set $blur_radius 4 set $blur_passes 2 @@ -28,7 +29,7 @@ set $blur_passes 2 set $browser firefox # Autostart apps -exec $HOME/.config/sway/auto.sh +exec $HOME/.config/sway/scripts.d/auto.sh # Local configs include $HOME/.config/sway/config.d/* diff --git a/home-config/sway/config.d/idle b/home-config/sway/config.d/idle index 7b94882..fb13083 100644 --- a/home-config/sway/config.d/idle +++ b/home-config/sway/config.d/idle @@ -1,5 +1,5 @@ # Turn off display after tiemout exec swayidle -w \ - timeout 300 '~/.config/sway/lock.sh' \ + timeout 300 'swaylock -f -c 14171d' \ timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ - before-sleep '~/.config/sway/lock.sh' + before-sleep 'swaylock -f -c 14171d' diff --git a/home-config/sway/config.d/keybinds b/home-config/sway/config.d/keybinds index d70cf82..7278d49 100644 --- a/home-config/sway/config.d/keybinds +++ b/home-config/sway/config.d/keybinds @@ -19,7 +19,7 @@ bindsym $mod+Shift+l exec $lock bindsym Ctrl+Alt+Delete exec killall sway # Power menu -bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/power/style.css -l ~/.config/sway/power/layout +bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/logout.d/power/style.css -l ~/.config/sway/logout.d/power/layout # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. diff --git a/home-config/sway/config.d/scratch b/home-config/sway/config.d/scratch index 4de2190..0337319 100644 --- a/home-config/sway/config.d/scratch +++ b/home-config/sway/config.d/scratch @@ -10,5 +10,5 @@ bindsym $mod+minus scratchpad show for_window [app_id="scratch_term"] move scratchpad, resize set 960 640 for_window [app_id="scratch_htop"] move scratchpad, resize set 960 640 -bindsym $mod+y exec ~/.config/sway/scratchpads.sh scratch_term zsh -bindsym $mod+h exec ~/.config/sway/scratchpads.sh scratch_htop htop +bindsym $mod+y exec ~/.config/sway/scripts.d/scratchpads.sh scratch_term zsh +bindsym $mod+h exec ~/.config/sway/scripts.d/scratchpads.sh scratch_htop htop diff --git a/home-config/sway/config.d/theme b/home-config/sway/config.d/theme index 43ebb81..e8d2822 100644 --- a/home-config/sway/config.d/theme +++ b/home-config/sway/config.d/theme @@ -1,5 +1,5 @@ ### Set borders -gaps inner 10 +gaps inner $gaps for_window [class="^.*"] border pixel 2 default_border pixel 2 default_floating_border pixel 2 @@ -21,9 +21,12 @@ smart_corner_radius $radius shadows $shadows shadows_on_csd $shadows shadow_blur_radius $shadow_blur +shadow_color #14171dff blur $blur blur_radius $blur_radius blur_passes $blur_passes +layer_effects "waybar" blur enable; shadows enable +layer_effects "wofi" blur enable; shadows enable ### Output configuration output * bg $bg fill diff --git a/home-config/sway/lock.sh b/home-config/sway/lock.sh deleted file mode 100755 index b84e3d0..0000000 --- a/home-config/sway/lock.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -swaylock --indicator --clock -i ~/.config/sway/nya0.png --effect-blur 10x5 diff --git a/home-config/sway/logout.d/power/img/lock-hover.png b/home-config/sway/logout.d/power/img/lock-hover.png new file mode 100644 index 0000000..46c51b0 Binary files /dev/null and b/home-config/sway/logout.d/power/img/lock-hover.png differ diff --git a/home-config/sway/logout.d/power/img/lock.png b/home-config/sway/logout.d/power/img/lock.png new file mode 100644 index 0000000..f1ec4a2 Binary files /dev/null and b/home-config/sway/logout.d/power/img/lock.png differ diff --git a/home-config/sway/logout.d/power/img/logout-hover.png b/home-config/sway/logout.d/power/img/logout-hover.png new file mode 100644 index 0000000..b34a150 Binary files /dev/null and b/home-config/sway/logout.d/power/img/logout-hover.png differ diff --git a/home-config/sway/logout.d/power/img/logout.png b/home-config/sway/logout.d/power/img/logout.png new file mode 100644 index 0000000..59a5aeb Binary files /dev/null and b/home-config/sway/logout.d/power/img/logout.png differ diff --git a/home-config/sway/logout.d/power/img/power-hover.png b/home-config/sway/logout.d/power/img/power-hover.png new file mode 100644 index 0000000..a65e429 Binary files /dev/null and b/home-config/sway/logout.d/power/img/power-hover.png differ diff --git a/home-config/sway/logout.d/power/img/power.png b/home-config/sway/logout.d/power/img/power.png new file mode 100644 index 0000000..6aac455 Binary files /dev/null and b/home-config/sway/logout.d/power/img/power.png differ diff --git a/home-config/sway/logout.d/power/img/restart-hover.png b/home-config/sway/logout.d/power/img/restart-hover.png new file mode 100644 index 0000000..7921398 Binary files /dev/null and b/home-config/sway/logout.d/power/img/restart-hover.png differ diff --git a/home-config/sway/logout.d/power/img/restart.png b/home-config/sway/logout.d/power/img/restart.png new file mode 100644 index 0000000..5851243 Binary files /dev/null and b/home-config/sway/logout.d/power/img/restart.png differ diff --git a/home-config/sway/logout.d/power/img/sleep-hover.png b/home-config/sway/logout.d/power/img/sleep-hover.png new file mode 100644 index 0000000..7c9b6b3 Binary files /dev/null and b/home-config/sway/logout.d/power/img/sleep-hover.png differ diff --git a/home-config/sway/logout.d/power/img/sleep.png b/home-config/sway/logout.d/power/img/sleep.png new file mode 100644 index 0000000..164f5fb Binary files /dev/null and b/home-config/sway/logout.d/power/img/sleep.png differ diff --git a/home-config/sway/logout.d/power/layout b/home-config/sway/logout.d/power/layout new file mode 100644 index 0000000..ecd4759 --- /dev/null +++ b/home-config/sway/logout.d/power/layout @@ -0,0 +1,30 @@ +{ + "label" : "lock", + "action" : "swaylock -f -c 14171d", + "text" : "Lock", + "keybind" : "l" +} +{ + "label" : "logout", + "action" : "loginctl terminate-user $USER", + "text" : "Logout", + "keybind" : "e" +} +{ + "label" : "shutdown", + "action" : "loginctl poweroff", + "text" : "Shutdown", + "keybind" : "s" +} +{ + "label" : "suspend", + "action" : "loginctl suspend", + "text" : "Suspend", + "keybind" : "u" +} +{ + "label" : "reboot", + "action" : "loginctl reboot", + "text" : "Reboot", + "keybind" : "r" +} diff --git a/home-config/sway/logout.d/power/style.css b/home-config/sway/logout.d/power/style.css new file mode 100644 index 0000000..e80dd33 --- /dev/null +++ b/home-config/sway/logout.d/power/style.css @@ -0,0 +1,76 @@ +nk* { + font-family: "Fira Mono", "Font Awesome 6 Pro", monospace; + font-size: 16px; + font-weight: bold; +} + +window { + background-color: rgba(0, 0, 0, 0); +} + +button { + background-color: #242434; + background-image: none; + color: #89ADF8; + border: 1px solid rgba(0, 0, 0, 0); + margin: 5px; + border-radius: 10px; + background-repeat: no-repeat; + background-position: center; + background-size: 35%; +} + +button:focus, button:active { + background-color: #89B4FA; + color: #242434; + font-weight: 500; + outline-style: none; +} + +#lock { + background-image: image(url("img/lock.png")); +} + +#logout { + background-image: image(url("img/logout.png")); +} + +#suspend { + background-image: image(url("img/sleep.png")); +} + +#hibernate { + background-image: image(url("img/hibernate.png")); +} + +#shutdown { + background-image: image(url("img/power.png")); +} + +#reboot { + background-image: image(url("img/restart.png")); +} + +#lock:focus { + background-image: image(url("img/lock-hover.png")); +} + +#logout:focus { + background-image: image(url("img/logout-hover.png")); +} + +#suspend:focus { + background-image: image(url("img/sleep-hover.png")); +} + +#hibernate:focus { + background-image: image(url("img/hibernate-hover.png")); +} + +#shutdown:focus { + background-image: image(url("img/power-hover.png")); +} + +#reboot:focus { + background-image: image(url("img/restart-hover.png")); +} diff --git a/home-config/sway/nya0.png b/home-config/sway/nya0.png deleted file mode 100644 index e9da5d5..0000000 Binary files a/home-config/sway/nya0.png and /dev/null differ diff --git a/home-config/sway/power/img/lock-hover.png b/home-config/sway/power/img/lock-hover.png deleted file mode 100644 index 46c51b0..0000000 Binary files a/home-config/sway/power/img/lock-hover.png and /dev/null differ diff --git a/home-config/sway/power/img/lock.png b/home-config/sway/power/img/lock.png deleted file mode 100644 index f1ec4a2..0000000 Binary files a/home-config/sway/power/img/lock.png and /dev/null differ diff --git a/home-config/sway/power/img/logout-hover.png b/home-config/sway/power/img/logout-hover.png deleted file mode 100644 index b34a150..0000000 Binary files a/home-config/sway/power/img/logout-hover.png and /dev/null differ diff --git a/home-config/sway/power/img/logout.png b/home-config/sway/power/img/logout.png deleted file mode 100644 index 59a5aeb..0000000 Binary files a/home-config/sway/power/img/logout.png and /dev/null differ diff --git a/home-config/sway/power/img/power-hover.png b/home-config/sway/power/img/power-hover.png deleted file mode 100644 index a65e429..0000000 Binary files a/home-config/sway/power/img/power-hover.png and /dev/null differ diff --git a/home-config/sway/power/img/power.png b/home-config/sway/power/img/power.png deleted file mode 100644 index 6aac455..0000000 Binary files a/home-config/sway/power/img/power.png and /dev/null differ diff --git a/home-config/sway/power/img/restart-hover.png b/home-config/sway/power/img/restart-hover.png deleted file mode 100644 index 7921398..0000000 Binary files a/home-config/sway/power/img/restart-hover.png and /dev/null differ diff --git a/home-config/sway/power/img/restart.png b/home-config/sway/power/img/restart.png deleted file mode 100644 index 5851243..0000000 Binary files a/home-config/sway/power/img/restart.png and /dev/null differ diff --git a/home-config/sway/power/img/sleep-hover.png b/home-config/sway/power/img/sleep-hover.png deleted file mode 100644 index 7c9b6b3..0000000 Binary files a/home-config/sway/power/img/sleep-hover.png and /dev/null differ diff --git a/home-config/sway/power/img/sleep.png b/home-config/sway/power/img/sleep.png deleted file mode 100644 index 164f5fb..0000000 Binary files a/home-config/sway/power/img/sleep.png and /dev/null differ diff --git a/home-config/sway/power/layout b/home-config/sway/power/layout deleted file mode 100644 index 89af53b..0000000 --- a/home-config/sway/power/layout +++ /dev/null @@ -1,30 +0,0 @@ -{ - "label" : "lock", - "action" : "~/.config/sway/lock.sh", - "text" : "Lock", - "keybind" : "l" -} -{ - "label" : "logout", - "action" : "loginctl terminate-user $USER", - "text" : "Logout", - "keybind" : "e" -} -{ - "label" : "shutdown", - "action" : "loginctl poweroff", - "text" : "Shutdown", - "keybind" : "s" -} -{ - "label" : "suspend", - "action" : "loginctl suspend", - "text" : "Suspend", - "keybind" : "u" -} -{ - "label" : "reboot", - "action" : "loginctl reboot", - "text" : "Reboot", - "keybind" : "r" -} diff --git a/home-config/sway/power/style.css b/home-config/sway/power/style.css deleted file mode 100644 index e80dd33..0000000 --- a/home-config/sway/power/style.css +++ /dev/null @@ -1,76 +0,0 @@ -nk* { - font-family: "Fira Mono", "Font Awesome 6 Pro", monospace; - font-size: 16px; - font-weight: bold; -} - -window { - background-color: rgba(0, 0, 0, 0); -} - -button { - background-color: #242434; - background-image: none; - color: #89ADF8; - border: 1px solid rgba(0, 0, 0, 0); - margin: 5px; - border-radius: 10px; - background-repeat: no-repeat; - background-position: center; - background-size: 35%; -} - -button:focus, button:active { - background-color: #89B4FA; - color: #242434; - font-weight: 500; - outline-style: none; -} - -#lock { - background-image: image(url("img/lock.png")); -} - -#logout { - background-image: image(url("img/logout.png")); -} - -#suspend { - background-image: image(url("img/sleep.png")); -} - -#hibernate { - background-image: image(url("img/hibernate.png")); -} - -#shutdown { - background-image: image(url("img/power.png")); -} - -#reboot { - background-image: image(url("img/restart.png")); -} - -#lock:focus { - background-image: image(url("img/lock-hover.png")); -} - -#logout:focus { - background-image: image(url("img/logout-hover.png")); -} - -#suspend:focus { - background-image: image(url("img/sleep-hover.png")); -} - -#hibernate:focus { - background-image: image(url("img/hibernate-hover.png")); -} - -#shutdown:focus { - background-image: image(url("img/power-hover.png")); -} - -#reboot:focus { - background-image: image(url("img/restart-hover.png")); -} diff --git a/home-config/sway/scratchpads.sh b/home-config/sway/scratchpads.sh deleted file mode 100755 index bb8e361..0000000 --- a/home-config/sway/scratchpads.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -( swaymsg -t get_tree | /bin/grep '"app_id": "'$1'"' ) || ( ( $TERMINAL --class=$1 -e $2 & ) && sleep 0.2 ) -swaymsg "[app_id=\"$1\"]" scratchpad show diff --git a/home-config/sway/scripts.d/auto.sh b/home-config/sway/scripts.d/auto.sh new file mode 100755 index 0000000..68a28e2 --- /dev/null +++ b/home-config/sway/scripts.d/auto.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +/usr/lib/xdg-desktop-portal -r & +/usr/lib/xdg-desktop-portal-wlr -r & + +mako & + +nm-applet --indicator & + +GTK_THEME= waybar & + +autotiling & + +/usr/bin/gnome-keyring-daemon --foreground & + +discord --enable-features=UseOzonePlatform --ozone-platform=wayland & +element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland & +#thunderbird & + diff --git a/home-config/sway/scripts.d/scratchpads.sh b/home-config/sway/scripts.d/scratchpads.sh new file mode 100755 index 0000000..bb8e361 --- /dev/null +++ b/home-config/sway/scripts.d/scratchpads.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +( swaymsg -t get_tree | /bin/grep '"app_id": "'$1'"' ) || ( ( $TERMINAL --class=$1 -e $2 & ) && sleep 0.2 ) +swaymsg "[app_id=\"$1\"]" scratchpad show diff --git a/home-config/sway/wallpapers/blue.jpg b/home-config/sway/wallpapers/blue.jpg new file mode 100755 index 0000000..acd376b Binary files /dev/null and b/home-config/sway/wallpapers/blue.jpg differ diff --git a/home-config/sway/wallpapers/nya0.png b/home-config/sway/wallpapers/nya0.png new file mode 100644 index 0000000..e9da5d5 Binary files /dev/null and b/home-config/sway/wallpapers/nya0.png differ diff --git a/home-config/waybar/config b/home-config/waybar/config index d4b2c7a..a11ec45 100644 --- a/home-config/waybar/config +++ b/home-config/waybar/config @@ -7,8 +7,6 @@ ], "modules-center": [], "modules-right": [ - "custom/cmus", - "custom/newsboat", "cpu", "memory", "temperature", @@ -28,22 +26,27 @@ "spacing": 10 }, "clock": { - "format": "{:%Y-%m-%d %a %H:%M}" + "interval": 1, + "format": "{:%Y-%m-%d %a %H:%M:%S}" }, "cpu": { + "interval": 1, "format": " {usage}%", "tooltip": false }, "memory": { + "interval": 1, "format": " {}%", "tooltip": false }, "temperature": { + "interval": 1, "thermal-zone": 1, "critical-threshold": 80, "format": " {temperatureC}°" }, "battery": { + "interval": 1, "states": { "warning": 30, "critical": 15 @@ -73,14 +76,5 @@ "format-disconnected": " disconnected", "max-length": 50, "on-click": "nm-connection-editor", - }, - "custom/cmus": { - "return-type": "json", - "exec": "$HOME/.config/waybar/custom_cmus.lua 2> /dev/null" - }, - "custom/newsboat": { - "format": " {}", - "exec": "$HOME/.config/waybar/custom_newsboat.sh 2> /dev/null", - "on-click": "alacritty -e newsboat -r" } } diff --git a/home-config/waybar/custom_cmus.lua b/home-config/waybar/custom_cmus.lua deleted file mode 100755 index e7ee033..0000000 --- a/home-config/waybar/custom_cmus.lua +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env lua - -json = require("dkjson") -posix = require("posix") - -function htmlescape(s) - s = string.gsub(s, "&", "&") - s = string.gsub(s, "<", "<") - s = string.gsub(s, ">", ">") - return s -end - -function timefmt(n) - local s = n % 60 - local m = math.floor(n / 60) - return string.format("%d:%02d", m, s) -end - -function output(text, tooltip) - text = htmlescape(text) - tooltip = htmlescape(tooltip) - print(json.encode{text=text, tooltip=tooltip, class="custom-cmus"}) -end - -function getstat(status, name) - for _, line in ipairs(status) do - if string.match(line, "^" .. name) then - return string.sub(line, string.len(name)+2) - end - end -end - -while true do - local pipe = io.popen("cmus-remote -Q") - local status = {} - for line in pipe:lines() do - table.insert(status, line) - end - local success = pipe:close() - if not success then - output(" Not running", "Not running") - elseif getstat(status, "status") == "stopped" then - output(" Not running", "Not running") - else - local playing = getstat(status, "status") - local symbol = ({playing="", paused=""})[playing] - local title = getstat(status, "tag title") - local artist = getstat(status, "tag artist") - local duration = getstat(status, "duration") - local position = getstat(status, "position") - local text = string.format("%s %s (%s)", symbol, title, timefmt(position)) - local tooltip = string.format("%s - %s (%s / %s)", - artist, title, timefmt(position), timefmt(duration) - ) - output(text, tooltip) - end - posix.sleep(1) -end diff --git a/home-config/waybar/custom_newsboat.sh b/home-config/waybar/custom_newsboat.sh deleted file mode 100755 index 1ac8428..0000000 --- a/home-config/waybar/custom_newsboat.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -while :; do - until newsboat -x reload >/dev/null; do - sleep 1; - done - until unread="$(newsboat -x print-unread)"; do - sleep 1; - done - echo "$unread" | awk '{ print $1 }' - sleep 300 -done diff --git a/home-config/waybar/style.css b/home-config/waybar/style.css index 2c716a4..9e23184 100644 --- a/home-config/waybar/style.css +++ b/home-config/waybar/style.css @@ -30,7 +30,6 @@ button { } #workspaces button { - padding: 0 5px; color: #c7c6c3; background-color: rgba(0, 0, 0, 0); } diff --git a/home-config/wofi/config.bak b/home-config/wofi/config.bak deleted file mode 100644 index 6b28876..0000000 --- a/home-config/wofi/config.bak +++ /dev/null @@ -1,6 +0,0 @@ -key_expand=Tab -term=alacritty -matching=multi-contains -insensitive=true -gtk_dark=true -hide_scroll=true diff --git a/home-config/wofi/style.css.bak b/home-config/wofi/style.css.bak deleted file mode 100644 index 7d9f449..0000000 --- a/home-config/wofi/style.css.bak +++ /dev/null @@ -1,54 +0,0 @@ -window { - margin: 0px; - /*border: 1px solid #79b5b3;*/ - background-color: #1d1b2b; - border-radius: 5px; -} - -#input { - margin: 5px; - border: none; - color: #d5d8ed; - border-radius: 5px; - background-color: #44475a; -} - -#input:selected { - border: inherit; -} - -#inner-box { - margin: 5px; - border: none; - background-color: inherit; -} - -#outer-box { - margin: 5px; - border: none; - background-color: inherit; -} - -#scroll { - margin: 0px; - border: none; -} - -#text { - margin: 5px; - border: none; - color: #d5d8ed; -} - -#img { - background-color: transparent; -} - -#entry { - border: none; -} - -#entry:selected { - background-color: #44475a; - border-radius: 5px; -} diff --git a/home-config/xdg/mimeapps.list b/home-config/xdg/mimeapps.list index 10ae8f1..f91778a 100644 --- a/home-config/xdg/mimeapps.list +++ b/home-config/xdg/mimeapps.list @@ -58,3 +58,6 @@ x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop; x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop message/rfc822=userapp-Thunderbird-E9G491.desktop x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop +x-scheme-handler/discord=discord.desktop; +x-scheme-handler/slack=slack.desktop; + diff --git a/home-config/zsh/zshrc b/home-config/zsh/zshrc index 1428182..32f1aac 100644 --- a/home-config/zsh/zshrc +++ b/home-config/zsh/zshrc @@ -14,6 +14,8 @@ then return fi +PATH=$PATH:$HOME/.cargo/bin + # vim mode >:) # no ryan i am not copying you set -o vi @@ -33,9 +35,6 @@ alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" alias ls="ls --color=auto" alias su="doas -s" -# Make sure cargo is working with nix packages -alias cargo="CC=$NIX_PROFILE/bin/gcc $NIX_PROFILE/bin/cargo" - # Have manpages use colors man() { env \ diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index 6900561..67fb4ef 100644 --- a/modules/home-config/base-system.scm +++ b/modules/home-config/base-system.scm @@ -6,12 +6,15 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages shells) #:use-module (gnu packages tls) - #:use-module (gnu packages gcc) + #:use-module (gnu packages vpn) #:use-module (gnu packages security-token) #:use-module (gnu packages virtualization) #:use-module (guix packages) #:use-module (nongnu packages linux) #:use-module (srfi srfi-1) + #:use-module (gnu services) + #:use-module (gnu services linux) + #:use-module (gnu services authentication) #:use-module (gnu services security-token) #:use-module (gnu services cups) #:use-module (gnu services desktop) @@ -23,7 +26,6 @@ #:use-module (gnu services docker) #:use-module (gnu services avahi) #:use-module (gnu services spice) - #:use-module (gnu services authentication) #:use-module (gnu services virtualization) #:use-module (home-packages wm) #:use-module (home-packages virtualization)) @@ -50,7 +52,7 @@ (locale "en_US.utf8") (timezone "America/New_York") (keyboard-layout (keyboard-layout "us")) - (host-name "ThisWillChange") + (host-name "ThisWillChange") ;; The list of user accounts ('root' is implicit). (users (cons* (user-account @@ -88,6 +90,7 @@ "bluez" "blueman" "opendoas" + "wireguard-tools" "xdg-desktop-portal" "xdg-desktop-portal-wlr" "v4l2loopback-linux-module" @@ -111,6 +114,12 @@ "vulkan-headers" "spirv-tools" "spirv-headers" + "sdl2" + "openal" + "freealut" + "wxwidgets" + "libpcap" + "v4l2loopback-linux-module" "neovim")) (list swaylock-effects-new virt-manager-new) %my-base-packages)) @@ -124,6 +133,9 @@ (service openssh-service-type) (service pcscd-service-type) (service spice-vdagent-service-type) + (simple-service 'wireguard-module + kernel-module-loader-service-type + '("wireguard")) (service cups-service-type (cups-configuration (web-interface? #t))) @@ -143,11 +155,6 @@ (service bluetooth-service-type) (service pam-limits-service-type) (service fprintd-service-type) - ;; (service special-files-service-type - ;; `(("/lib64" ,(directory-union "rustup-libs" - ;; (list - ;; (file-append glibc "/lib") - ;; (file-append gcc "/lib")))))) (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))) ;; This is the default list of services we diff --git a/modules/home-packages/gcc.scm b/modules/home-packages/gcc.scm deleted file mode 100644 index 5d6a208..0000000 --- a/modules/home-packages/gcc.scm +++ /dev/null @@ -1,12 +0,0 @@ -(define-module (home-packages gcc) - #:use-module (gnu) - #:use-module (guix packages) - #:use-module (gnu packages gcc)) - -(define-public gcc-new - (package - (inherit gcc) - (name "gcc-new") - (outputs (package-outputs gcc)))) - - diff --git a/modules/home-packages/web.scm b/modules/home-packages/web.scm new file mode 100644 index 0000000..c9d236e --- /dev/null +++ b/modules/home-packages/web.scm @@ -0,0 +1,49 @@ +(define-module (home-packages web) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) + #:use-module (gnu packages base) + #:use-module (gnu packages version-control) + #:use-module (gnu packages golang) + #:use-module (gnu packages) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix download) + #:use-module (guix build-system go) + #:use-module (guix build-system trivial) + #:use-module (guix utils)) + +(define-public caddy + (package + (name "caddy") + (version "2.7.4") + ;; (source (origin + ;; (method url-fetch) + ;; (uri (string-append "https://github.com/caddyserver/caddy/archive/refs/tags/v" version + ;; ".tar.gz")) + ;; (sha256 + ;; (base32 + ;; "0ccwwas8kagvg0hb0qbr2yvhrf8aiyg66cn95japbqpvv70qgxlp")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/caddyserver/caddy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jgbkj0azkbs828vsd3gycpab8pycgf55vrxkvnfmwfjpdiq1551")))) +; (native-inputs `(("git" ,git) +; ("sed" ,sed))) + ;; (build-system trivial-build-system) + (build-system go-build-system) + (arguments (list + #:import-path "cmd" + ;; #:unpack-path "github.com/caddyserver/caddy/cmd/caddy" + #:install-source? #f + #:tests? #f)) + (synopsis "A powerful, enterprise-ready, open source web server with automatic HTTPS written in Go ") + (description "Caddy simplifies your infrastructure. It takes care of TLS certificate renewals, OCSP stapling, static file serving, reverse proxying, Kubernetes ingress, and more. + Its modular architecture means you can do more with a single, static binary that compiles for any platform. + Caddy runs great in containers because it has no dependencies—not even libc. Run Caddy practically anywhere.") + (home-page "https://caddyserver.com/") + (license license:asl2.0))) diff --git a/shinji.scm b/shinji.scm index cf71c9e..bad5533 100644 --- a/shinji.scm +++ b/shinji.scm @@ -5,6 +5,12 @@ (inherit base-operating-system) (host-name "shinji") + (kernel-arguments (append (list "intel_iommu=on") + %default-kernel-arguments)) + + (initrd-modules (cons* "vfio_pci" "vfio" "vfio_iommu_type1" + %base-initrd-modules)) + (mapped-devices (list (mapped-device (source (uuid "5c5dcb22-62b1-41af-9116-b8fdfba83ca2")) -- cgit v1.2.3-freya