diff --git a/README.md b/README.md index 8706b2d..2d255db 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ | --------------------------- | :---------------------------------------------------------------------------------------------: | **Window Manager** | [Hyprland][Hyprland] | | **Bar** | [Waybar][waybar] | -| **Application Launcher** | [wofi][wofi] | +| **Application Launcher** | [bemenu][bemenu] | | **Notification Daemon** | [Mako][mako] | | **Terminal Emulator** | [Kitty][kitty] | | **Shell** | [zsh][zsh] | @@ -224,7 +224,7 @@ Other dotfiles that I learned / copy from: [Hyprland]: https://github.com/hyprwm/Hyprland [Kitty]: https://github.com/kovidgoyal/kitty [Waybar]: https://github.com/Alexays/Waybar -[wofi]: https://hg.sr.ht/~scoopta/wofi +[bemenu]: https://github.com/Cloudef/bemenu [zsh]: https://ohmyz.sh/ [swaylock]: https://github.com/swaywm/swaylock [mpv]: https://github.com/mpv-player/mpv diff --git a/flake.lock b/flake.lock index 3cc52ed..3d2cf2f 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1739004667, - "narHash": "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw=", + "lastModified": 1740777046, + "narHash": "sha256-hPp+DnTYjE6M9Mdau7inbqMeLR1SpSPVyuxd+nabwaA=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "ac55bbdb6cee760af9315899b5b187a40ce43e46", + "rev": "b5c8adb16f4729572c67883da1bcb46e11f195d6", "type": "github" }, "original": { @@ -450,11 +450,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1740845322, + "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1740365530, - "narHash": "sha256-g9Q8wHAbjMOwJgTIV3XuKw7S47b/XnDOgtmQP0lswQI=", + "lastModified": 1740854078, + "narHash": "sha256-y0EWjnJgyQ9SMti5yqKvSMFwhAT2S3iycD1eRf4SXg0=", "ref": "refs/heads/main", - "rev": "3458d7ac93a101ea534ef6d0bcbc32725e267045", - "revCount": 5840, + "rev": "2acbb59bf218331a090f402982f22fd7f85ae50f", + "revCount": 5854, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -962,11 +962,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1740361404, - "narHash": "sha256-hKaJ6QDZuxcbwifzcfLyiK9nmlIx1uQqWQwJ45PBn88=", + "lastModified": 1740838504, + "narHash": "sha256-5pF6whS+PQJlrFHuDNKGBDFT676nFFCJcw68UzMmddM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "1e6dc4b9895602f9459d6ff3a11b0cd144321207", + "rev": "5e173f8c31fd9544002f37c1a107d839fcc83687", "type": "github" }, "original": { @@ -977,11 +977,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740387674, - "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -1048,11 +1048,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -1243,11 +1243,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1740400501, - "narHash": "sha256-Io6PeaGBb9MN5cFpXzbt9XpB5ZQTeZ3CMmFK/FdaX70=", + "lastModified": 1740858475, + "narHash": "sha256-YIdIgnmg5AlArjennCIv5NqZUU54rGgHxm4lLWqMy3g=", "owner": "nix-community", "repo": "NUR", - "rev": "ef57fcfbc0b94951efd61231cf45d53e3efa72ff", + "rev": "efadff3f90fb07193808c0eff037addae42cfaa7", "type": "github" }, "original": { diff --git a/hosts/yoshino/default.nix b/hosts/yoshino/default.nix index 5c184a4..08dfdb7 100644 --- a/hosts/yoshino/default.nix +++ b/hosts/yoshino/default.nix @@ -36,6 +36,7 @@ [ acpi_call cpupower + v4l2loopback ] ++ [pkgs.cpupower-gui]; }; diff --git a/modules/home/default.nix b/modules/home/default.nix index 4cf86ac..3e85ef2 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -4,17 +4,13 @@ ++ [(import ./swaync/default.nix)] ++ [(import ./fonts.nix)] ++ [(import ./hyprland)] - ++ [(import ./sway)] ++ [(import ./kitty.nix)] - ++ [(import ./mako.nix)] ++ [(import ./nvim.nix)] ++ [(import ./zathura.nix)] ++ [(import ./packages.nix)] ++ [(import ./scripts/scripts.nix)] ++ [(import ./swaylock.nix)] - ++ [(import ./vscodium.nix)] ++ [(import ./waybar)] - ++ [(import ./wofi.nix)] ++ [(import ./zsh.nix)] ++ [(import ./tmux.nix)]; } diff --git a/modules/home/default.yoshino.nix b/modules/home/default.yoshino.nix deleted file mode 100644 index d6a0228..0000000 --- a/modules/home/default.yoshino.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ...}: { - imports = - [(import ./git.nix)] # version control - ++ [(import ./swaync/default.nix)] # notification panel - ++ [(import ./fonts.nix)] # fonts - ++ [(import ./hyprland)] # window manager - ++ [(import ./kitty.nix)] # terminal - ++ [(import ./mako.nix)] # notification deamon - ++ [(import ./nvim.nix)] # neovim editor - ++ [(import ./zathura.nix)] # neovim editor - ++ [(import ./packages.yoshino.nix)] # other packages - ++ [(import ./scripts/scripts.nix)] # personal scripts - ++ [(import ./swaylock.nix)] # lock screen - ++ [(import ./waybar)] # status bar - ++ [(import ./wofi.nix)] # launcher - ++ [(import ./zsh.nix)] # shell - ++ [(import ./tmux.nix)]; # terminal multiplexer -} diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 4fcb14b..1e559df 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -221,12 +221,12 @@ "$mainMod, E, exec, thunar" "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped" "$mainMod, C ,exec, hyprpicker -a" - "$mainMod, W ,exec, pkill wofi || wallpaper-picker" + "$mainMod, W ,exec, wallpaper-picker" # clipboard manager "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy" - "$mainMod SHIFT, F, exec, firefox" + "$mainMod SHIFT, F, exec, librewolf" "$mainMod SHIFT, W, exec, wdisplays" "$mainMod SHIFT, T, exec, thunderbird" "$mainMod SHIFT, E, exec, element-desktop" @@ -235,8 +235,8 @@ "$mainMod, N,exec, swaync-client -t" # screenshot - "SUPER SHIFT, S, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" - "$mainMod SHIFT, S, exec, grimblast --notify --cursor copy area" + "SUPER SHIFT, S, exec, grimblast save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" + "$mainMod SHIFT, S, exec, grimblast copy area" "$mainMod SHIFT, G, exec, grabtext" # switch focus @@ -326,16 +326,13 @@ "size 950 600,title:^(float_kitty)$" "float,audacious" "workspace 8 silent, audacious" - "pin,wofi" - "float,wofi" - "noborder,wofi" "tile, neovide" "idleinhibit focus,mpv" "float,udiskie" "float,title:^(Transmission)$" "float,title:^(Volume Control)$" - "float,title:^(Firefox — Sharing Indicator)$" - "move 0 0,title:^(Firefox — Sharing Indicator)$" + "float,title:^(Librewolf — Sharing Indicator)$" + "move 0 0,title:^(Librewolf — Sharing Indicator)$" "size 700 450,title:^(Volume Control)$" "move 40 55%,title:^(Volume Control)$" "workspace 10, thunderbird" @@ -355,7 +352,7 @@ "opacity 1.0 override 1.0 override, class:(Aseprite)" "opacity 1.0 override 1.0 override, class:(Unity)" "idleinhibit focus, class:^(mpv)$" - "idleinhibit fullscreen, class:^(firefox)$" + "idleinhibit fullscreen, class:^(librewolf)$" "float,class:^(pavucontrol-qt)$" "float,class:^(pavucontrol)$" "float,class:^(SoundWireServer)$" diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 7900ed4..390ff2a 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -24,7 +24,7 @@ systemd.enable = true; plugins = [ # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace - # inputs.Hyswipe.packages.${pkgs.system}.Hyswipe + inputs.Hyswipe.packages.${pkgs.system}.Hyswipe ]; }; } diff --git a/modules/home/mako.nix b/modules/home/mako.nix deleted file mode 100644 index bdd387e..0000000 --- a/modules/home/mako.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, pkgs, ... }: -{ - # services = { - # mako = { - # enable = true; - # font = "JetBrainsMono Nerd Font 12"; - # padding = "15"; - # defaultTimeout = 5000; - # borderSize = 2; - # borderRadius = 5; - # backgroundColor = "#1e1e2e"; - # borderColor = "#b4befe"; - # progressColor = "over #313244"; - # textColor = "#cdd6f4"; - # icons = true; - # actions = true; - # extraConfig = '' - # text-alignment=center - # [urgency=high] - # default-timeout=100000000 - # border-color=#fab387 - # ''; - # }; - # }; -} diff --git a/modules/home/packages.nix b/modules/home/packages.nix index ca58b67..783fb4d 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -1,87 +1,86 @@ { inputs, pkgs, ... }: { home.packages = with pkgs; [ - pciutils # List PCI(e) devices and controllers - bandwhich # Terminal bandwidth utilization tool - powertop - element-desktop # Nheko is kinda shit so sadly this has to happen - iamb # In-terminal-Matrix-messaging - signal-desktop # Since the bridge is broken :( - tesseract # Screen grabbing text from images/PDFs/etc - pixcat # Display images in the terminal - lm_sensors # Show sensor outputs, i.e. temperatures - yubikey-touch-detector # Display notification when YubiKey requires a headpat - bitwarden-cli # Use Bitwarden as a CLI secrets manager - # wikit # Wikipedia summaries from the terminal, not added to Nix yet - # reader # Firefox reader mode but in the terminal, not added to Nix yet - vimv # edit filenames in batch with $EDITOR - # pastel # generate, analyze, convert and manipulate colors - glow # Render Markdown from the terminal - # htmlq # jq but for HTML - eva # Calculator - anki-bin # Flashcards - obs-studio # Record video stuff - exiftool # Read exif data from CLI - translate-shell # Google Translate but in the CLI - wireguard-tools # VPN connections - openresolv # required for wireguard-tools + # Environment shit + tesseract + yubikey-touch-detector + wireguard-tools + openresolv + xdg-utils + killall + libnotify + openssl + pamixer + playerctl + wl-clipboard + cliphist + poweralertd + ffmpeg + unzip + wget + xxd + gcc + gnumake + python3 + + # CLI shit + vimv + iamb + pass + pixcat + lm_sensors + neofetch + hyfetch + glow + eva + exiftool + translate-shell progress zip - ripdrag pwgen jq tmux - wdisplays htop - firefox - nsxiv eza file fzf lazygit - gitleaks # TODO: adds pre-commit hook - libreoffice - xfce.thunar - lunar-client + gitleaks ripgrep yt-dlp - # wineWowPackages.wayland - # element-desktop # wayland version is very laggy for me - spotify spotify-player - thunderbird - neofetch - hyfetch nodejs_22 yarn + # wikit # Wikipedia summaries from the terminal, not added to Nix yet + # reader # Firefox reader mode but in the terminal, not added to Nix yet + # pastel # generate, analyze, convert and manipulate colors - # C / C++ - gcc - gnumake + # GUI shit + element-desktop + signal-desktop + anki-bin + obs-studio + wdisplays + librewolf + ungoogled-chromium + nsxiv + libreoffice + xfce.thunar + spotify + thunderbird + lxqt.pavucontrol-qt + mpv - # Python - python3 + # Gaming + lunar-client - ffmpeg - killall - libnotify - mpv # video player - openssl - pamixer # pulseaudio command line mixer - lxqt.pavucontrol-qt # pulseaudio volume controle (GUI) - playerctl # controller for media players - wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste) - cliphist # clipboard history manager - poweralertd - unzip - wget - xdg-utils - xxd inputs.alejandra.defaultPackage.${system} inputs.nixvim.packages.${pkgs.system}.default - ]; - # environment.systemPackages = with pkgs; [ - # nodePackages. - # ] + # Email/calendar/etc + neomutt + khard + khal + w3m + ]; } diff --git a/modules/home/packages.yoshino.nix b/modules/home/packages.yoshino.nix deleted file mode 100644 index 838e604..0000000 --- a/modules/home/packages.yoshino.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ inputs, pkgs, ... }: -{ - home.packages = with pkgs; [ - pciutils # List PCI(e) devices and controllers - bandwhich # Terminal bandwidth utilization tool - element-desktop # Nheko is kinda shit so sadly this has to happen - signal-desktop # Since the bridge is broken :( - tesseract # Screen grabbing text from images/PDFs/etc - pixcat # Display images in the terminal - lm_sensors # Show sensor outputs, i.e. temperatures - yubikey-touch-detector # Display notification when YubiKey requires a headpat - linuxKernel.packages.linux_hardened.v4l2loopback # Use A7ii as webcam - # wikit # Wikipedia summaries from the terminal, not added to Nix yet - # reader # Firefox reader mode but in the terminal, not added to Nix yet - vimv # edit filenames in batch with $EDITOR - pastel # generate, analyze, convert and manipulate colors - glow # Render Markdown from the terminal - htmlq # jq but for HTML - android-tools # ADB/Fastboot - eva # Calculator - # termpdfpy # Read PDFs from the terminal, errors out for now - anki-bin # Review flashcards - vimv # Bulk rename - exiftool # Read exif data from CLI - translate-shell # Google Translate but in the CLI - wireguard-tools # VPN connections - openresolv # required for wireguard-tools - progress - zip - ripdrag - pwgen - jq - tmux - wdisplays - htop - firefox - nsxiv - eza - file - fzf - lazygit - gitleaks # TODO: adds pre-commit hook - xfce.thunar - lunar-client - jdk - ripgrep - yt-dlp - wineWowPackages.wayland - spotify - thunderbird - neofetch - hyfetch - nodejs_22 - yarn - - # C / C++ - gcc - gnumake - - # Python - python3 - - ffmpeg - killall - libnotify - man-pages # extra man pages - mpv # video player - openssl - pamixer # pulseaudio command line mixer - lxqt.pavucontrol-qt # pulseaudio volume controle (GUI) - playerctl # controller for media players - wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste) - cliphist # clipboard history manager - unzip - wget - xdg-utils - xxd - inputs.alejandra.defaultPackage.${system} - inputs.nixvim.packages.${pkgs.system}.default - ]; - - # environment.systemPackages = with pkgs; [ - # nodePackages. - # ] -} diff --git a/modules/home/scripts/scripts/keybinds.sh b/modules/home/scripts/scripts/keybinds.sh deleted file mode 100755 index 4381f42..0000000 --- a/modules/home/scripts/scripts/keybinds.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -config_file=~/.config/hypr/hyprland.conf -keybinds=$(grep -oP '(?<=bind=).*' $config_file) -keybinds=$(echo "$keybinds" | sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g') -wofi -W 750 -dmenu -p "Keybinds" <<< "$keybinds" diff --git a/modules/home/scripts/scripts/shutdown-script.sh b/modules/home/scripts/scripts/shutdown-script.sh deleted file mode 100755 index 8813d2e..0000000 --- a/modules/home/scripts/scripts/shutdown-script.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env zsh - -respond="$(echo "------------- Shutdown --------------\n------------- Restart ---------------\n-------------- Cancel ---------------" | wofi --show dmenu -k /dev/null)" - -if [ $respond = '------------- Shutdown --------------' ] -then - echo "shutdown" - shutdown now -elif [ $respond = '------------- Restart ---------------' ] -then - echo "restart" - reboot -else - notify-send "cancel shutdown" -fi diff --git a/modules/home/scripts/scripts/wallpaper-picker.sh b/modules/home/scripts/scripts/wallpaper-picker.sh index 1c2bece..899ad1a 100755 --- a/modules/home/scripts/scripts/wallpaper-picker.sh +++ b/modules/home/scripts/scripts/wallpaper-picker.sh @@ -2,11 +2,11 @@ wallpaper_path=$HOME/Pictures/wallpapers wallpapers_folder=$HOME/Pictures/wallpapers/others -wallpaper_name="$(ls $wallpapers_folder | wofi --show dmenu --sort-order=alphabetical)" +wallpaper_name="$(ls $wallpapers_folder | bemenu -l 15)" if [[ -f $wallpapers_folder/$wallpaper_name ]]; then find ~/Pictures/wallpapers -maxdepth 1 -type f -delete cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name wall-change $wallpaper_path/$wallpaper_name else exit 1 -fi \ No newline at end of file +fi diff --git a/roles/creative.nix b/roles/creative.nix index ee0b0c5..6d19932 100644 --- a/roles/creative.nix +++ b/roles/creative.nix @@ -15,7 +15,7 @@ in { darktable audacity obs-studio - kdenlive + kdePackages.kdenlive ]; }; };