mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 15:00:13 +01:00
chore: merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
2c790453a1
14 changed files with 100 additions and 256 deletions
|
|
@ -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)];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
@ -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)$"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
# '';
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
# ]
|
||||
}
|
||||
|
|
@ -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"
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue