liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

chore: merge remote-tracking branch 'refs/remotes/origin/master'

Browse source
This commit is contained in:
Ahwx 2025-03-03 13:21:09 +01:00
commit 2c790453a1
14 changed files with 100 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -58,7 +58,7 @@
| --------------------------- | :---------------------------------------------------------------------------------------------: | --------------------------- | :---------------------------------------------------------------------------------------------:
| **Window Manager** | [Hyprland][Hyprland] | | **Window Manager** | [Hyprland][Hyprland] |
| **Bar** | [Waybar][waybar] | | **Bar** | [Waybar][waybar] |
| **Application Launcher** | [wofi][wofi] | | **Application Launcher** | [bemenu][bemenu] |
| **Notification Daemon** | [Mako][mako] | | **Notification Daemon** | [Mako][mako] |
| **Terminal Emulator** | [Kitty][kitty] | | **Terminal Emulator** | [Kitty][kitty] |
| **Shell** | [zsh][zsh] | | **Shell** | [zsh][zsh] |
@ -224,7 +224,7 @@ Other dotfiles that I learned / copy from:
[Hyprland]: https://github.com/hyprwm/Hyprland [Hyprland]: https://github.com/hyprwm/Hyprland
[Kitty]: https://github.com/kovidgoyal/kitty [Kitty]: https://github.com/kovidgoyal/kitty
[Waybar]: https://github.com/Alexays/Waybar [Waybar]: https://github.com/Alexays/Waybar
[wofi]: https://hg.sr.ht/~scoopta/wofi [bemenu]: https://github.com/Cloudef/bemenu
[zsh]: https://ohmyz.sh/ [zsh]: https://ohmyz.sh/
[swaylock]: https://github.com/swaywm/swaylock [swaylock]: https://github.com/swaywm/swaylock
[mpv]: https://github.com/mpv-player/mpv [mpv]: https://github.com/mpv-player/mpv

50
flake.lock generated
View file

@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1739004667, "lastModified": 1740777046,
"narHash": "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw=", "narHash": "sha256-hPp+DnTYjE6M9Mdau7inbqMeLR1SpSPVyuxd+nabwaA=",
"owner": "KZDKM", "owner": "KZDKM",
"repo": "Hyprspace", "repo": "Hyprspace",
"rev": "ac55bbdb6cee760af9315899b5b187a40ce43e46", "rev": "b5c8adb16f4729572c67883da1bcb46e11f195d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -450,11 +450,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740347597, "lastModified": 1740845322,
"narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -579,11 +579,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1740365530, "lastModified": 1740854078,
"narHash": "sha256-g9Q8wHAbjMOwJgTIV3XuKw7S47b/XnDOgtmQP0lswQI=", "narHash": "sha256-y0EWjnJgyQ9SMti5yqKvSMFwhAT2S3iycD1eRf4SXg0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3458d7ac93a101ea534ef6d0bcbc32725e267045", "rev": "2acbb59bf218331a090f402982f22fd7f85ae50f",
"revCount": 5840, "revCount": 5854,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -962,11 +962,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1740361404, "lastModified": 1740838504,
"narHash": "sha256-hKaJ6QDZuxcbwifzcfLyiK9nmlIx1uQqWQwJ45PBn88=", "narHash": "sha256-5pF6whS+PQJlrFHuDNKGBDFT676nFFCJcw68UzMmddM=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "1e6dc4b9895602f9459d6ff3a11b0cd144321207", "rev": "5e173f8c31fd9544002f37c1a107d839fcc83687",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -977,11 +977,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1740387674, "lastModified": 1740646007,
"narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d58f642ddb23320965b27beb0beba7236e9117b5", "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1048,11 +1048,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1740126099, "lastModified": 1740695751,
"narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1160,11 +1160,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1740126099, "lastModified": 1740695751,
"narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1243,11 +1243,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1740400501, "lastModified": 1740858475,
"narHash": "sha256-Io6PeaGBb9MN5cFpXzbt9XpB5ZQTeZ3CMmFK/FdaX70=", "narHash": "sha256-YIdIgnmg5AlArjennCIv5NqZUU54rGgHxm4lLWqMy3g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ef57fcfbc0b94951efd61231cf45d53e3efa72ff", "rev": "efadff3f90fb07193808c0eff037addae42cfaa7",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
hosts/yoshino/default.nix
View file

@ -36,6 +36,7 @@
[ [
acpi_call acpi_call
cpupower cpupower
v4l2loopback
] ]
++ [pkgs.cpupower-gui]; ++ [pkgs.cpupower-gui];
}; };

4
modules/home/default.nix
View file

@ -4,17 +4,13 @@
++ [(import ./swaync/default.nix)] ++ [(import ./swaync/default.nix)]
++ [(import ./fonts.nix)] ++ [(import ./fonts.nix)]
++ [(import ./hyprland)] ++ [(import ./hyprland)]
++ [(import ./sway)]
++ [(import ./kitty.nix)] ++ [(import ./kitty.nix)]
++ [(import ./mako.nix)]
++ [(import ./nvim.nix)] ++ [(import ./nvim.nix)]
++ [(import ./zathura.nix)] ++ [(import ./zathura.nix)]
++ [(import ./packages.nix)] ++ [(import ./packages.nix)]
++ [(import ./scripts/scripts.nix)] ++ [(import ./scripts/scripts.nix)]
++ [(import ./swaylock.nix)] ++ [(import ./swaylock.nix)]
++ [(import ./vscodium.nix)]
++ [(import ./waybar)] ++ [(import ./waybar)]
++ [(import ./wofi.nix)]
++ [(import ./zsh.nix)] ++ [(import ./zsh.nix)]
++ [(import ./tmux.nix)]; ++ [(import ./tmux.nix)];
} }

18
modules/home/default.yoshino.nix
View file

@ -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
}

17
modules/home/hyprland/config.nix
View file

@ -221,12 +221,12 @@
"$mainMod, E, exec, thunar" "$mainMod, E, exec, thunar"
"$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped" "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped"
"$mainMod, C ,exec, hyprpicker -a" "$mainMod, C ,exec, hyprpicker -a"
"$mainMod, W ,exec, pkill wofi || wallpaper-picker" "$mainMod, W ,exec, wallpaper-picker"
# clipboard manager # clipboard manager
"$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy" "$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, W, exec, wdisplays"
"$mainMod SHIFT, T, exec, thunderbird" "$mainMod SHIFT, T, exec, thunderbird"
"$mainMod SHIFT, E, exec, element-desktop" "$mainMod SHIFT, E, exec, element-desktop"
@ -235,8 +235,8 @@
"$mainMod, N,exec, swaync-client -t" "$mainMod, N,exec, swaync-client -t"
# screenshot # screenshot
"SUPER SHIFT, S, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" "SUPER SHIFT, S, exec, grimblast save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png"
"$mainMod SHIFT, S, exec, grimblast --notify --cursor copy area" "$mainMod SHIFT, S, exec, grimblast copy area"
"$mainMod SHIFT, G, exec, grabtext" "$mainMod SHIFT, G, exec, grabtext"
# switch focus # switch focus
@ -326,16 +326,13 @@
"size 950 600,title:^(float_kitty)$" "size 950 600,title:^(float_kitty)$"
"float,audacious" "float,audacious"
"workspace 8 silent, audacious" "workspace 8 silent, audacious"
"pin,wofi"
"float,wofi"
"noborder,wofi"
"tile, neovide" "tile, neovide"
"idleinhibit focus,mpv" "idleinhibit focus,mpv"
"float,udiskie" "float,udiskie"
"float,title:^(Transmission)$" "float,title:^(Transmission)$"
"float,title:^(Volume Control)$" "float,title:^(Volume Control)$"
"float,title:^(Firefox — Sharing Indicator)$" "float,title:^(Librewolf — Sharing Indicator)$"
"move 0 0,title:^(Firefox — Sharing Indicator)$" "move 0 0,title:^(Librewolf — Sharing Indicator)$"
"size 700 450,title:^(Volume Control)$" "size 700 450,title:^(Volume Control)$"
"move 40 55%,title:^(Volume Control)$" "move 40 55%,title:^(Volume Control)$"
"workspace 10, thunderbird" "workspace 10, thunderbird"
@ -355,7 +352,7 @@
"opacity 1.0 override 1.0 override, class:(Aseprite)" "opacity 1.0 override 1.0 override, class:(Aseprite)"
"opacity 1.0 override 1.0 override, class:(Unity)" "opacity 1.0 override 1.0 override, class:(Unity)"
"idleinhibit focus, class:^(mpv)$" "idleinhibit focus, class:^(mpv)$"
"idleinhibit fullscreen, class:^(firefox)$" "idleinhibit fullscreen, class:^(librewolf)$"
"float,class:^(pavucontrol-qt)$" "float,class:^(pavucontrol-qt)$"
"float,class:^(pavucontrol)$" "float,class:^(pavucontrol)$"
"float,class:^(SoundWireServer)$" "float,class:^(SoundWireServer)$"

2
modules/home/hyprland/hyprland.nix
View file

@ -24,7 +24,7 @@
systemd.enable = true; systemd.enable = true;
plugins = [ plugins = [
# inputs.Hyprspace.packages.${pkgs.system}.Hyprspace # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace
# inputs.Hyswipe.packages.${pkgs.system}.Hyswipe inputs.Hyswipe.packages.${pkgs.system}.Hyswipe
]; ];
}; };
} }

25
modules/home/mako.nix
View file

@ -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
# '';
# };
# };
}

123
modules/home/packages.nix
View file

@ -1,87 +1,86 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
pciutils # List PCI(e) devices and controllers # Environment shit
bandwhich # Terminal bandwidth utilization tool tesseract
powertop yubikey-touch-detector
element-desktop # Nheko is kinda shit so sadly this has to happen wireguard-tools
iamb # In-terminal-Matrix-messaging openresolv
signal-desktop # Since the bridge is broken :( xdg-utils
tesseract # Screen grabbing text from images/PDFs/etc killall
pixcat # Display images in the terminal libnotify
lm_sensors # Show sensor outputs, i.e. temperatures openssl
yubikey-touch-detector # Display notification when YubiKey requires a headpat pamixer
bitwarden-cli # Use Bitwarden as a CLI secrets manager playerctl
# wikit # Wikipedia summaries from the terminal, not added to Nix yet wl-clipboard
# reader # Firefox reader mode but in the terminal, not added to Nix yet cliphist
vimv # edit filenames in batch with $EDITOR poweralertd
# pastel # generate, analyze, convert and manipulate colors ffmpeg
glow # Render Markdown from the terminal unzip
# htmlq # jq but for HTML wget
eva # Calculator xxd
anki-bin # Flashcards gcc
obs-studio # Record video stuff gnumake
exiftool # Read exif data from CLI python3
translate-shell # Google Translate but in the CLI
wireguard-tools # VPN connections # CLI shit
openresolv # required for wireguard-tools vimv
iamb
pass
pixcat
lm_sensors
neofetch
hyfetch
glow
eva
exiftool
translate-shell
progress progress
zip zip
ripdrag
pwgen pwgen
jq jq
tmux tmux
wdisplays
htop htop
firefox
nsxiv
eza eza
file file
fzf fzf
lazygit lazygit
gitleaks # TODO: adds pre-commit hook gitleaks
libreoffice
xfce.thunar
lunar-client
ripgrep ripgrep
yt-dlp yt-dlp
# wineWowPackages.wayland
# element-desktop # wayland version is very laggy for me
spotify
spotify-player spotify-player
thunderbird
neofetch
hyfetch
nodejs_22 nodejs_22
yarn 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++ # GUI shit
gcc element-desktop
gnumake signal-desktop
anki-bin
obs-studio
wdisplays
librewolf
ungoogled-chromium
nsxiv
libreoffice
xfce.thunar
spotify
thunderbird
lxqt.pavucontrol-qt
mpv
# Python # Gaming
python3 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.alejandra.defaultPackage.${system}
inputs.nixvim.packages.${pkgs.system}.default inputs.nixvim.packages.${pkgs.system}.default
];
# environment.systemPackages = with pkgs; [ # Email/calendar/etc
# nodePackages. neomutt
# ] khard
khal
w3m
];
} }

85
modules/home/packages.yoshino.nix
View file

@ -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.
# ]
}

6
modules/home/scripts/scripts/keybinds.sh
View file

@ -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"

15
modules/home/scripts/scripts/shutdown-script.sh
View file

@ -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
modules/home/scripts/scripts/wallpaper-picker.sh
View file

@ -2,7 +2,7 @@
wallpaper_path=$HOME/Pictures/wallpapers wallpaper_path=$HOME/Pictures/wallpapers
wallpapers_folder=$HOME/Pictures/wallpapers/others 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 if [[ -f $wallpapers_folder/$wallpaper_name ]]; then
find ~/Pictures/wallpapers -maxdepth 1 -type f -delete find ~/Pictures/wallpapers -maxdepth 1 -type f -delete
cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name

2
roles/creative.nix
View file

@ -15,7 +15,7 @@ in {
darktable darktable
audacity audacity
obs-studio obs-studio
kdenlive kdePackages.kdenlive
]; ];
}; };
}; };