Compare commits
49 Commits
56c18519b3
...
working-br
| Author | SHA1 | Date | |
|---|---|---|---|
| 3392366413 | |||
| 85e1ecd46a | |||
| 3f83fc9d57 | |||
| f536cea5c3 | |||
| 3d5c6a443b | |||
| 283f9ad213 | |||
| 513cf526d8 | |||
| 069de41562 | |||
| 5bf0216460 | |||
| 62a324a746 | |||
| e380f07018 | |||
| 424a74773f | |||
| 064a996b73 | |||
| 20e338c380 | |||
| 57b5471d58 | |||
| c53b236d5b | |||
| aa5037b107 | |||
| 1de9399021 | |||
| 5748f4b2e7 | |||
| 8a573b1726 | |||
| 6d59c86b02 | |||
| f3843fd686 | |||
| e71e9c7a1d | |||
| 5e44c0e28c | |||
| 6b43a528f9 | |||
| cdb9b3f2f8 | |||
| 8f05b33391 | |||
| b7ba045305 | |||
| c631417ec5 | |||
| 702907d454 | |||
| f15568d031 | |||
| 76405677a0 | |||
| ffdbf536b5 | |||
| cce655e475 | |||
| f536023a14 | |||
| e8357a95ee | |||
| cb1249357d | |||
| 5aa036def8 | |||
| 1b45ef06f1 | |||
| 692558b7b8 | |||
| ae61c718e6 | |||
| fcf8b46e38 | |||
| 88366d7dbe | |||
| 972ca7186a | |||
| 7943950c79 | |||
| b3a27173eb | |||
| f6087ae017 | |||
| c18257042d | |||
| 93ac73b583 |
@@ -36,11 +36,14 @@
|
|||||||
../../modules/application-groups/android.nix
|
../../modules/application-groups/android.nix
|
||||||
../../modules/application-groups/downloads.nix
|
../../modules/application-groups/downloads.nix
|
||||||
../../modules/application-groups/gaming.nix
|
../../modules/application-groups/gaming.nix
|
||||||
|
../../modules/application-groups/hobby-rc.nix
|
||||||
../../modules/application-groups/homelab.nix
|
../../modules/application-groups/homelab.nix
|
||||||
../../modules/application-groups/media.nix
|
../../modules/application-groups/media.nix
|
||||||
|
../../modules/application-groups/media-creation.nix
|
||||||
../../modules/application-groups/pcb-design.nix
|
../../modules/application-groups/pcb-design.nix
|
||||||
../../modules/application-groups/productivity.nix
|
../../modules/application-groups/productivity.nix
|
||||||
../../modules/application-groups/programming.nix
|
../../modules/application-groups/programming.nix
|
||||||
|
../../modules/application-groups/radio.nix
|
||||||
../../modules/application-groups/social.nix
|
../../modules/application-groups/social.nix
|
||||||
../../modules/application-groups/system-utilities.nix
|
../../modules/application-groups/system-utilities.nix
|
||||||
../../modules/application-groups/virtualization.nix
|
../../modules/application-groups/virtualization.nix
|
||||||
|
|||||||
@@ -32,11 +32,14 @@
|
|||||||
../../modules/application-groups/android.nix
|
../../modules/application-groups/android.nix
|
||||||
../../modules/application-groups/downloads.nix
|
../../modules/application-groups/downloads.nix
|
||||||
../../modules/application-groups/gaming.nix
|
../../modules/application-groups/gaming.nix
|
||||||
|
../../modules/application-groups/hobby-rc.nix
|
||||||
../../modules/application-groups/homelab.nix
|
../../modules/application-groups/homelab.nix
|
||||||
../../modules/application-groups/media.nix
|
../../modules/application-groups/media.nix
|
||||||
|
../../modules/application-groups/media-creation.nix
|
||||||
../../modules/application-groups/pcb-design.nix
|
../../modules/application-groups/pcb-design.nix
|
||||||
../../modules/application-groups/productivity.nix
|
../../modules/application-groups/productivity.nix
|
||||||
../../modules/application-groups/programming.nix
|
../../modules/application-groups/programming.nix
|
||||||
|
../../modules/application-groups/radio.nix
|
||||||
../../modules/application-groups/social.nix
|
../../modules/application-groups/social.nix
|
||||||
../../modules/application-groups/system-utilities.nix
|
../../modules/application-groups/system-utilities.nix
|
||||||
../../modules/application-groups/virtualization.nix
|
../../modules/application-groups/virtualization.nix
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
virtualisation.waydroid.enable = true;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
gallery-dl
|
||||||
transmission_4-qt
|
transmission_4-qt
|
||||||
yt-dlp
|
yt-dlp
|
||||||
];
|
];
|
||||||
|
|||||||
9
modules/application-groups/hobby-rc.nix
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
|
programs.qgroundcontrol.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
inav-configurator
|
||||||
|
mission-planner
|
||||||
|
];
|
||||||
|
}
|
||||||
11
modules/application-groups/media-creation.nix
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
audacity
|
||||||
|
darktable
|
||||||
|
inkscape
|
||||||
|
kdePackages.kdenlive
|
||||||
|
obs-studio
|
||||||
|
pinta
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,19 +1,5 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
{
|
||||||
spotifyPlayerDesktopEntry = pkgs.writeTextFile {
|
|
||||||
name = "spotify-player-desktop";
|
|
||||||
destination = "/share/applications/spotify-player.desktop";
|
|
||||||
text = ''
|
|
||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
Name=Spotify Player
|
|
||||||
Exec=kitty -e spotify_player
|
|
||||||
Icon=spotify_player
|
|
||||||
Terminal=false
|
|
||||||
Categories=Media;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
boot = {
|
boot = {
|
||||||
# Make v4l2loopback kernel module available to NixOS.
|
# Make v4l2loopback kernel module available to NixOS.
|
||||||
extraModulePackages = with config.boot.kernelPackages; [
|
extraModulePackages = with config.boot.kernelPackages; [
|
||||||
@@ -40,20 +26,15 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
||||||
audacity
|
|
||||||
darktable
|
|
||||||
deadbeef
|
|
||||||
glava
|
glava
|
||||||
obs-studio
|
gimp
|
||||||
# plex-desktop --> Encountering build failures
|
imv
|
||||||
|
plex-desktop
|
||||||
projectm_3
|
projectm_3
|
||||||
sox
|
sox
|
||||||
|
spotify
|
||||||
spotify-player
|
spotify-player
|
||||||
spotifyPlayerDesktopEntry
|
|
||||||
vlc
|
vlc
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kicad
|
kicad
|
||||||
pcb2gcode
|
#pcb2gcode
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,5 +2,7 @@
|
|||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
obsidian
|
obsidian
|
||||||
|
kdePackages.okular
|
||||||
|
texliveFull
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,17 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
{
|
||||||
jetbrainsToolboxDesktopEntry = pkgs.writeTextFile {
|
|
||||||
name = "jetbrains-toolbox-desktop";
|
|
||||||
destination = "/share/applications/jetbrains-toolbox.desktop";
|
|
||||||
text = ''
|
|
||||||
[Desktop Entry]
|
|
||||||
Type=Application
|
|
||||||
Name=JetBrains Toolbox
|
|
||||||
Exec=jetbrains-toolbox
|
|
||||||
Icon=jetbrains-toolbox
|
|
||||||
Terminal=false
|
|
||||||
Categories=Development;IDE;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
arduino-ide
|
arduino-ide
|
||||||
|
dfu-util
|
||||||
gcc
|
gcc
|
||||||
|
gnumake
|
||||||
jetbrains-toolbox
|
jetbrains-toolbox
|
||||||
jetbrainsToolboxDesktopEntry
|
|
||||||
nix-update
|
nix-update
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
nixos-generators
|
nixos-generators
|
||||||
nodejs
|
nodejs
|
||||||
platformio
|
# platformio
|
||||||
python311Full
|
python314
|
||||||
python3Full
|
|
||||||
stm32cubemx
|
stm32cubemx
|
||||||
stm32flash
|
stm32flash
|
||||||
teensy-udev-rules
|
teensy-udev-rules
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
hardware.rtl-sdr.enable = true;
|
hardware.rtl-sdr.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
chirp
|
||||||
soapysdr
|
soapysdr
|
||||||
soapyrtlsdr
|
soapyrtlsdr
|
||||||
];
|
];
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
telegram-desktop
|
|
||||||
discord
|
discord
|
||||||
|
slack
|
||||||
|
telegram-desktop
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +1,25 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
hardware.keyboard.qmk.enable = true;
|
||||||
|
hardware.logitech.wireless.enable = true;
|
||||||
|
hardware.logitech.wireless.enableGraphical = true;
|
||||||
|
|
||||||
programs.thunar.enable = true;
|
programs.thunar.enable = true;
|
||||||
programs.thunar.plugins = with pkgs.xfce; [
|
programs.thunar.plugins = with pkgs.xfce; [
|
||||||
thunar-archive-plugin
|
thunar-archive-plugin
|
||||||
thunar-volman
|
thunar-volman
|
||||||
];
|
];
|
||||||
services.gvfs.enable = true; # Mount, trash, and other functionalities
|
|
||||||
services.tumbler.enable = true; # Thumbnail support for images
|
|
||||||
|
|
||||||
programs.ydotool.enable = true;
|
programs.ydotool.enable = true;
|
||||||
|
|
||||||
|
services.glances.enable = true;
|
||||||
|
services.gvfs.enable = true; # Mount, trash, and other functionalities
|
||||||
|
services.hardware.openrgb.enable = true;
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
services.tumbler.enable = true; # Thumbnail support for images
|
||||||
hardware.logitech.wireless.enable = true;
|
|
||||||
hardware.logitech.wireless.enableGraphical = true;
|
|
||||||
hardware.keyboard.qmk.enable = true;
|
|
||||||
|
|
||||||
services.hardware.openrgb.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
btop
|
btop-cuda
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
dnsutils
|
dnsutils
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
@@ -31,9 +30,12 @@
|
|||||||
imagemagick
|
imagemagick
|
||||||
iotop
|
iotop
|
||||||
jq
|
jq
|
||||||
|
kdePackages.qt6ct
|
||||||
killall
|
killall
|
||||||
kitty
|
kitty
|
||||||
|
swappy
|
||||||
lf
|
lf
|
||||||
|
minicom
|
||||||
ncdu
|
ncdu
|
||||||
networkmanager
|
networkmanager
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
@@ -42,7 +44,7 @@
|
|||||||
openrgb-with-all-plugins
|
openrgb-with-all-plugins
|
||||||
pciutils
|
pciutils
|
||||||
rofi-bluetooth
|
rofi-bluetooth
|
||||||
rpi-imager
|
# rpi-imager # <- Build Failure
|
||||||
rpiboot
|
rpiboot
|
||||||
s-tui
|
s-tui
|
||||||
scrcpy
|
scrcpy
|
||||||
@@ -53,6 +55,7 @@
|
|||||||
usbutils
|
usbutils
|
||||||
util-linux
|
util-linux
|
||||||
wget
|
wget
|
||||||
|
xev
|
||||||
xfce.mousepad
|
xfce.mousepad
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
|
virtualisation.containers.policy = {
|
||||||
|
default = [ { type = "insecureAcceptAnything"; } ];
|
||||||
|
|
||||||
|
};
|
||||||
virtualisation.podman = {
|
virtualisation.podman = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dockerCompat = true;
|
dockerCompat = true;
|
||||||
|
dockerSocket.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|||||||
71
modules/applications/netextender/flake.nix
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
# TODO: This was hacked together until it worked...Clean it up before merging
|
||||||
|
{
|
||||||
|
description = "SonicWall NetExtender Flake";
|
||||||
|
|
||||||
|
outputs =
|
||||||
|
{ self, nixpkgs, ... }:
|
||||||
|
let
|
||||||
|
systems = [ "x86_64-linux" ];
|
||||||
|
neVersion = "10.3.0-21";
|
||||||
|
neUrl = "https://software.sonicwall.com/NetExtender/NetExtender-linux-amd64-${neVersion}.tar.gz";
|
||||||
|
|
||||||
|
# ✅ Define the overlay function directly
|
||||||
|
overlay = final: prev: {
|
||||||
|
netextender = prev.stdenv.mkDerivation rec {
|
||||||
|
pname = "netextender";
|
||||||
|
version = neVersion;
|
||||||
|
src = prev.fetchurl {
|
||||||
|
url = neUrl;
|
||||||
|
sha256 = "sha256-pnF/KRQMAcPnTj0Ni+sKKkw+H72WHf2iYVkWsWNCndc=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
prev.autoPatchelfHook
|
||||||
|
prev.makeWrapper
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
prev.openssl_3
|
||||||
|
prev.zlib
|
||||||
|
prev.gtk2
|
||||||
|
prev.pango
|
||||||
|
prev.cairo
|
||||||
|
prev.xorg.libX11
|
||||||
|
];
|
||||||
|
|
||||||
|
unpackPhase = "tar -xzf $src";
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
BIN_CLI=$(find . -type f -iname nxcli -perm -111 | head -n1)
|
||||||
|
BIN_SVC=$(find . -type f -iname neservice -perm -111 | head -n1)
|
||||||
|
install -Dm755 "$BIN_CLI" $out/bin/nxcli
|
||||||
|
install -Dm755 "$BIN_SVC" $out/bin/neservice
|
||||||
|
ln -sf nxcli $out/bin/netextender
|
||||||
|
ln -sf neservice $out/bin/nxservice
|
||||||
|
for exe in nxcli neservice; do
|
||||||
|
wrapProgram $out/bin/$exe \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${prev.lib.makeLibraryPath buildInputs}
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
overlays = {
|
||||||
|
x86_64-linux = overlay;
|
||||||
|
};
|
||||||
|
|
||||||
|
packages = {
|
||||||
|
x86_64-linux =
|
||||||
|
let
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
overlays = [ overlay ];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
default = pkgs.netextender;
|
||||||
|
netextender = pkgs.netextender;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,5 +1,14 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
boot = {
|
||||||
|
extraModulePackages = [ config.boot.kernelPackages.evdi ];
|
||||||
|
initrd = {
|
||||||
|
# List of modules that are always loaded by the initrd.
|
||||||
|
kernelModules = [
|
||||||
|
"evdi"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
services.xserver.videoDrivers = [
|
services.xserver.videoDrivers = [
|
||||||
"displaylink"
|
"displaylink"
|
||||||
"modesetting"
|
"modesetting"
|
||||||
|
|||||||
@@ -1,11 +1,19 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
fonts.fontDir.enable = true;
|
fonts.fontDir.enable = true;
|
||||||
fonts.fontconfig.enable = true;
|
fonts.fontconfig = {
|
||||||
fonts.fontconfig.antialias = true;
|
enable = true;
|
||||||
|
antialias = true;
|
||||||
|
defaultFonts = {
|
||||||
|
monospace = [ "JetBrains Mono" ];
|
||||||
|
sansSerif = [ "JetBrains Mono" ];
|
||||||
|
serif = [ "JetBrains Mono" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-emoji
|
noto-fonts-color-emoji
|
||||||
liberation_ttf
|
liberation_ttf
|
||||||
fira-code
|
fira-code
|
||||||
fira-code-symbols
|
fira-code-symbols
|
||||||
|
|||||||
@@ -1,52 +1,46 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
programs.hyprland = {
|
|
||||||
enable = true;
|
|
||||||
xwayland.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.displayManager.gdm = {
|
|
||||||
enable = true;
|
|
||||||
wayland = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.xserver = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enable32Bit = true;
|
enable32Bit = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
};
|
||||||
|
programs.hyprlock.enable = true;
|
||||||
|
programs.waybar.enable = true;
|
||||||
|
|
||||||
|
services.displayManager.gdm = {
|
||||||
|
enable = true;
|
||||||
|
wayland = true;
|
||||||
|
};
|
||||||
|
services.hypridle.enable = true;
|
||||||
|
services.xserver.enable = true;
|
||||||
|
|
||||||
xdg.portal.enable = true;
|
xdg.portal.enable = true;
|
||||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||||
|
|
||||||
programs.hyprlock.enable = true;
|
|
||||||
services.hypridle.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
waybar
|
|
||||||
dunst
|
|
||||||
libnotify
|
|
||||||
rofi-wayland
|
|
||||||
nwg-look
|
|
||||||
nwg-displays
|
|
||||||
slurp
|
|
||||||
grim
|
|
||||||
arandr
|
arandr
|
||||||
|
bemenu
|
||||||
|
dunst
|
||||||
|
grim
|
||||||
|
hyprpaper
|
||||||
|
hyprpicker
|
||||||
|
j4-dmenu-desktop
|
||||||
|
kanshi
|
||||||
|
libnotify
|
||||||
|
mako
|
||||||
|
nwg-look
|
||||||
|
rofi
|
||||||
|
slurp
|
||||||
|
swayimg
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wlogout
|
wlogout
|
||||||
flameshot
|
|
||||||
wofi
|
|
||||||
swayimg
|
|
||||||
hyprpicker
|
|
||||||
kanshi
|
|
||||||
mako
|
|
||||||
|
|
||||||
(pkgs.waybar.overrideAttrs (oldAttrs: {
|
|
||||||
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
|
|
||||||
}))
|
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,10 +22,15 @@
|
|||||||
|
|
||||||
programs.bash.shellAliases = {
|
programs.bash.shellAliases = {
|
||||||
# Nix rebuild, switch
|
# Nix rebuild, switch
|
||||||
nrs = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#$(hostname); }";
|
nrs = "bash -c \"cd /etc/nixos && sudo nixos-rebuild switch --flake .#$(hostname) ; exit\"";
|
||||||
|
# with tracing
|
||||||
|
tnrs = "bash -c \"cd /etc/nixos && sudo nixos-rebuild switch --show-trace --flake .#$(hostname) ; exit\"";
|
||||||
|
|
||||||
|
|
||||||
# Nix flake update, rebuild, switch
|
# Nix flake update, rebuild, switch
|
||||||
nus = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname)";
|
nus = "bash -c \"cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#$(hostname) ; exit\"";
|
||||||
|
# with tracing
|
||||||
|
tnus = "bash -c \"cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --show-trace --flake .#$(hostname) ; exit\"";
|
||||||
|
|
||||||
# Special cleanup, needed when efi partition runs out of space. Deletes all but the last five generations.
|
# Special cleanup, needed when efi partition runs out of space. Deletes all but the last five generations.
|
||||||
# Remember to make that partition bigger in the future...
|
# Remember to make that partition bigger in the future...
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
extraRules = [
|
extraRules = [
|
||||||
{
|
{
|
||||||
|
groups = [ "wheel" ];
|
||||||
commands = [
|
commands = [
|
||||||
{
|
{
|
||||||
command = "${pkgs.systemd}/bin/reboot";
|
command = "${pkgs.systemd}/bin/reboot";
|
||||||
@@ -14,7 +15,16 @@
|
|||||||
options = [ "NOPASSWD" ];
|
options = [ "NOPASSWD" ];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
groups = [ "wheel" ];
|
}
|
||||||
|
{
|
||||||
|
users = [ "caperren" ];
|
||||||
|
commands = [
|
||||||
|
{
|
||||||
|
command = "${pkgs.nvtopPackages.full}/bin/nvtop";
|
||||||
|
options = [ "NOPASSWD" "SETENV" ];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,12 +13,13 @@ in
|
|||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Corwin Perren";
|
description = "Corwin Perren";
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
"networkmanager"
|
|
||||||
"wheel"
|
|
||||||
"input"
|
|
||||||
"dialout"
|
|
||||||
"plugdev"
|
|
||||||
"adbusers"
|
"adbusers"
|
||||||
|
"dialout"
|
||||||
|
"input"
|
||||||
|
"networkmanager"
|
||||||
|
"plugdev"
|
||||||
|
"podman"
|
||||||
|
"wheel"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -33,18 +34,74 @@ in
|
|||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Corwin Perren";
|
settings.user = {
|
||||||
userEmail = "caperren@gmail.com";
|
name = "Corwin Perren";
|
||||||
|
email = "caperren@gmail.com";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
programs.bash.enable = true;
|
||||||
|
programs.bemenu.enable = true;
|
||||||
|
|
||||||
|
programs.kitty = {
|
||||||
|
enable = true;
|
||||||
|
font.name = "JetBrains Mono";
|
||||||
|
settings = {
|
||||||
|
allow_remote_control = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Assets/scripts
|
||||||
|
home.file.".config/streamdeck-ui/icons".source = ./dotfiles/streamdeck/icons;
|
||||||
|
home.file.".config/hypr/scripts".source = ./dotfiles/.config/hypr/scripts;
|
||||||
|
|
||||||
|
# Application config files
|
||||||
|
home.file.".config/containers/policy.json".source = ./dotfiles/.config/containers/policy.json;
|
||||||
|
home.file.".config/glances/glances.conf".source = ./dotfiles/.config/glances/glances.conf;
|
||||||
home.file.".config/hypr/hypridle.conf".source = ./dotfiles/hypridle/hypridle.conf;
|
home.file.".config/hypr/hypridle.conf".source = ./dotfiles/hypridle/hypridle.conf;
|
||||||
|
home.file.".config/hypr/hyprpaper.conf".source = ./dotfiles/hyprpaper/hyprpaper.conf;
|
||||||
|
home.file.".config/hypr/backgrounds/black.png".source = ./dotfiles/hyprpaper/backgrounds/black.png;
|
||||||
home.file.".config/hypr/hyprland-common.conf".source = ./dotfiles/hyprland/hyprland-common.conf;
|
home.file.".config/hypr/hyprland-common.conf".source = ./dotfiles/hyprland/hyprland-common.conf;
|
||||||
home.file.".config/hypr/hyprland.conf".source = hyprlandConfigPath + "/hyprland.conf";
|
home.file.".config/hypr/hyprland.conf".source = hyprlandConfigPath + "/hyprland.conf";
|
||||||
home.file.".config/kanshi/config".source = kanshiConfigPath + "/config";
|
home.file.".config/kanshi/config".source = kanshiConfigPath + "/config";
|
||||||
|
home.file.".config/streamdeck-ui/.streamdeck_ui_link.json" = {
|
||||||
|
source = ./dotfiles/streamdeck/.streamdeck_ui.json;
|
||||||
|
# Copy the symlinked version to its final location, otherwise it has no write permissions
|
||||||
|
# on the config file, which breaks the entire app
|
||||||
|
onChange = ''
|
||||||
|
cat ~/.config/streamdeck-ui/.streamdeck_ui_link.json > ~/.streamdeck_ui.json
|
||||||
|
chmod 600 ~/.streamdeck_ui.json
|
||||||
|
'';
|
||||||
|
force = true;
|
||||||
|
};
|
||||||
home.file.".config/spotify-player/app.toml".text = spotifyPlayerAppTomlText;
|
home.file.".config/spotify-player/app.toml".text = spotifyPlayerAppTomlText;
|
||||||
home.file.".config/waybar/config".source = waybarConfigPath + "/config";
|
home.file.".config/waybar/config".source = waybarConfigPath + "/config";
|
||||||
|
home.file.".config/waybar/style.css".source = ./dotfiles/waybar/style.css;
|
||||||
home.file.".config/wlogout/layout".source = ./dotfiles/wlogout/layout;
|
home.file.".config/wlogout/layout".source = ./dotfiles/wlogout/layout;
|
||||||
|
|
||||||
|
# Desktop entry files so bemenu can find them
|
||||||
|
home.file.".local/share/applications/alltop.desktop".source =
|
||||||
|
./dotfiles/.local/share/applications/alltop.desktop;
|
||||||
|
home.file.".local/share/applications/glava.desktop".source =
|
||||||
|
./dotfiles/.local/share/applications/glava.desktop;
|
||||||
|
home.file.".local/share/applications/phonerdp.desktop".source =
|
||||||
|
./dotfiles/.local/share/applications/phonerdp.desktop;
|
||||||
|
home.file.".local/share/applications/spotify-player.desktop".source =
|
||||||
|
./dotfiles/.local/share/applications/spotify-player.desktop;
|
||||||
|
|
||||||
|
# Custom bash aliases
|
||||||
|
home.shellAliases = {
|
||||||
|
# Phone remote desktop over usb (adb), with some default flags I want
|
||||||
|
phonerdp = "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake --power-off-on-close";
|
||||||
|
|
||||||
|
# Streamdeck isn't easy to manually edit, so make a save command to copy any updates to the repo
|
||||||
|
savestreamdeck = "cp ~/.streamdeck_ui.json ~/.nixos-configs/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json";
|
||||||
|
|
||||||
|
# Nice to have an alias if I ever want to launch this from cmdline, or see the dbus help string
|
||||||
|
screenshot = "~/.config/hypr/scripts/screenshot.sh";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Theming
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
@@ -62,10 +119,30 @@ in
|
|||||||
name = "Bibata-Modern-Ice";
|
name = "Bibata-Modern-Ice";
|
||||||
package = pkgs.bibata-cursors;
|
package = pkgs.bibata-cursors;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
font.name = "JetBrains Mono 11";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home.sessionPath = [
|
||||||
|
"$HOME/.local/share"
|
||||||
|
];
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
GTK_THEME = "Adwaita-dark";
|
GTK_THEME = "Adwaita-dark";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
xdg.mimeApps = {
|
||||||
|
enable = true;
|
||||||
|
defaultApplications = {
|
||||||
|
"application/pdf" = [ "okularApplication_pdf.desktop" ];
|
||||||
|
"x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||||
|
"x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||||
|
"text/html" = [ "firefox.desktop" ];
|
||||||
|
"image/*" = [ "imv.desktop" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
xresources.properties = {
|
||||||
|
"Xft.font" = "JetBrains Mono";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
7
users/caperren/dotfiles/.config/containers/policy.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"default": [
|
||||||
|
{
|
||||||
|
"type": "insecureAcceptAnything"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
44
users/caperren/dotfiles/.config/glances/glances.conf
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
##############################################################################
|
||||||
|
# Custom Glances Configuration Overrides
|
||||||
|
##############################################################################
|
||||||
|
[global]
|
||||||
|
# Managed by NixOS configs
|
||||||
|
check_update=false
|
||||||
|
|
||||||
|
[percpu]
|
||||||
|
# All of my systems are 16 core
|
||||||
|
max_cpu_display=16
|
||||||
|
|
||||||
|
[ip]
|
||||||
|
# Useful for validating vpn connectivity
|
||||||
|
public_disabled=False
|
||||||
|
public_refresh_interval=300
|
||||||
|
public_api=https://ipv4.ipleak.net/json/
|
||||||
|
public_field=ip
|
||||||
|
public_template={continent_code}/{country_code}/{region_code}/{city_name}/{isp_name}
|
||||||
|
|
||||||
|
[diskio]
|
||||||
|
# Don't care about loop devices
|
||||||
|
hide=loop.*,/dev/loop.*
|
||||||
|
|
||||||
|
[smart]
|
||||||
|
disable=False
|
||||||
|
|
||||||
|
[fs]
|
||||||
|
# Nix store is duplicate of / on NixOS
|
||||||
|
hide=/nix/store
|
||||||
|
|
||||||
|
# Leaving this all commented for now as it doesn't like large number of files
|
||||||
|
#[folders]
|
||||||
|
# Home overview is helpful
|
||||||
|
#folder_1_path=/home/caperren
|
||||||
|
#folder_1_refresh=120
|
||||||
|
# Steam is normally the largest
|
||||||
|
#folder_2_path=/home/caperren/.local/share/Steam
|
||||||
|
#folder_2_refresh=120
|
||||||
|
# Then Downloads next
|
||||||
|
#folder_3_path=/home/caperren/Downloads
|
||||||
|
#folder_3_refresh=120
|
||||||
|
# With code generally coming last
|
||||||
|
#folder_4_path=/home/caperren/code
|
||||||
|
#folder_4_refresh=120
|
||||||
116
users/caperren/dotfiles/.config/hypr/scripts/screenshot.sh
Executable file
@@ -0,0 +1,116 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Unashamedly taken from: https://www.reddit.com/r/hyprland/comments/13ivh0c/comment/jkgk65k
|
||||||
|
# Small edits made for my particular needs
|
||||||
|
|
||||||
|
# Flags:
|
||||||
|
|
||||||
|
# r: region
|
||||||
|
# s: screen
|
||||||
|
#
|
||||||
|
# c: clipboard
|
||||||
|
# f: file
|
||||||
|
# i: interactive
|
||||||
|
|
||||||
|
# p: pixel
|
||||||
|
|
||||||
|
# Example hyprland bindings
|
||||||
|
#bind = CTRL, SUPER, ALT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh
|
||||||
|
#bind = , PRINT, exec, ~/.config/hypr/scripts/screenshot.sh rc
|
||||||
|
#bind = SUPER, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh rf
|
||||||
|
#bind = CTRL, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh ri
|
||||||
|
#bind = SHIFT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh sc
|
||||||
|
#bind = SUPER SHIFT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh sf
|
||||||
|
#bind = CTRL SHIFT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh si
|
||||||
|
#bind = ALT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh p
|
||||||
|
|
||||||
|
screenshotPath=~/Pictures/screenshots
|
||||||
|
|
||||||
|
hyprpicker_launch(){
|
||||||
|
# Start hyprpicker with screen render (freeze), no fancy, no zoom
|
||||||
|
# We're just using this to lock the screen in place for grim ingest
|
||||||
|
hyprpicker -r -n -z -d >/dev/null 2>&1 &
|
||||||
|
sleep 0.5
|
||||||
|
}
|
||||||
|
|
||||||
|
hyprpicker_kill(){
|
||||||
|
killall hyprpicker >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
trap hyprpicker_kill EXIT
|
||||||
|
|
||||||
|
generate_filename(){
|
||||||
|
# Make sure screenshots path exists first
|
||||||
|
if [ ! -d "$screenshotPath" ]; then
|
||||||
|
mkdir -p "$screenshotPath"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$screenshotPath/$(date +%Y-%m-%d_%H-%M-%S).png"
|
||||||
|
}
|
||||||
|
|
||||||
|
active_screen_grim_region(){
|
||||||
|
hyprctl -j monitors | jq -r '.[] | select(.focused) | "\(.x),\(.y) \(.width)x\(.height)"' -
|
||||||
|
}
|
||||||
|
|
||||||
|
grim_from_region() {
|
||||||
|
local filename="${1:-}"
|
||||||
|
local region="${2:-}"
|
||||||
|
|
||||||
|
hyprpicker_launch
|
||||||
|
|
||||||
|
# Get region of screen to capture, if not passed in
|
||||||
|
if [ -z "$region" ]; then
|
||||||
|
region=$(slurp -b '#000000b0' -c '#00000000') || exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Start grim while screen is still frozen, kill hyprpicker, and pass through data
|
||||||
|
if [ -z "$filename" ]; then
|
||||||
|
grim -g "$region" - | {
|
||||||
|
hyprpicker_kill || true
|
||||||
|
cat
|
||||||
|
}
|
||||||
|
else
|
||||||
|
grim -g "$region" "$filename" | {
|
||||||
|
hyprpicker_kill || true
|
||||||
|
cat
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ $1 == rc ]]; then
|
||||||
|
grim_from_region | wl-copy
|
||||||
|
notify-send 'Copied to Clipboard' Screenshot
|
||||||
|
|
||||||
|
elif [[ $1 == rf ]]; then
|
||||||
|
grim_from_region "$(generate_filename)"
|
||||||
|
notify-send 'Screenshot Taken' "$filename"
|
||||||
|
|
||||||
|
elif [[ $1 == ri ]]; then
|
||||||
|
grim_from_region | swappy -f - -o "$(generate_filename)"
|
||||||
|
|
||||||
|
elif [[ $1 == sc ]]; then
|
||||||
|
grim_from_region "" "$(active_screen_grim_region)" | wl-copy
|
||||||
|
notify-send 'Copied to Clipboard' Screenshot
|
||||||
|
|
||||||
|
elif [[ $1 == sf ]]; then
|
||||||
|
grim_from_region "$(generate_filename)" "$(active_screen_grim_region)"
|
||||||
|
notify-send 'Screenshot Taken' "$filename"
|
||||||
|
|
||||||
|
elif [[ $1 == si ]]; then
|
||||||
|
grim_from_region "" "$(active_screen_grim_region)" | swappy -f - -o "$(generate_filename)"
|
||||||
|
|
||||||
|
elif [[ $1 == p ]]; then
|
||||||
|
color=$(hyprpicker -a -r)
|
||||||
|
wl-copy "$color"
|
||||||
|
notify-send 'Copied to Clipboard' "$color"
|
||||||
|
|
||||||
|
else
|
||||||
|
notify-send 'Screenshot Shortcuts' "Print:\t\t\tRegion to clip
|
||||||
|
Super+Print:\t\tRegion to file
|
||||||
|
Ctrl+Print:\t\tRegion to editor
|
||||||
|
Shift+Print:\t\t\Screen to clip
|
||||||
|
Shift+Super+Print:\tScreen to file
|
||||||
|
Ctrl+Shift+Print:\tScreen to editor
|
||||||
|
Alt+Print:\t\tColor picker to clip" -t 20000
|
||||||
|
|
||||||
|
fi
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=All Top
|
||||||
|
Exec=bash -c "kitty --single-instance --detach bash -c 'kitten @ launch --type=window --title btop btop ; kitten @ launch --type=window --title nvtop nvtop'"
|
||||||
|
Icon=alltop
|
||||||
|
Terminal=false
|
||||||
|
Categories=Utilities;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=Glava
|
||||||
|
Exec=glava
|
||||||
|
Icon=glava
|
||||||
|
Terminal=false
|
||||||
|
Categories=Media;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=Phone RDP
|
||||||
|
Exec=bash -c "scrcpy --no-audio --orientation=0 --turn-screen-off --stay-awake --power-off-on-close"
|
||||||
|
Icon=phonerdp
|
||||||
|
Terminal=false
|
||||||
|
Categories=Utilities;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=Spotify Player
|
||||||
|
Exec=kitty -e spotify_player
|
||||||
|
Icon=spotify_player
|
||||||
|
Terminal=false
|
||||||
|
Categories=Media;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Unfortunate legacy config needed because hyprland can't hot switch variable refresh rate
|
# Unfortunate legacy config needed because hyprland can't hot switch variable refresh rate
|
||||||
monitor=eDP-2,2560x1600@165,auto,1,vrr,1
|
monitor = eDP-2,2560x1600@165,auto,1,vrr,1
|
||||||
|
|
||||||
# Source configs
|
# Source configs
|
||||||
source = ~/.config/hypr/hyprland-common.conf
|
source = ~/.config/hypr/hyprland-common.conf
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
# Always enable new monitors in automatic mode
|
# Always enable new monitors in automatic mode, for when kanshi doesn't know about the setup
|
||||||
monitor=,preferred,auto,1
|
monitor=,preferred,auto,1
|
||||||
|
|
||||||
# Set programs that you use
|
# Set programs that you use
|
||||||
$terminal = kitty
|
$terminal = kitty
|
||||||
$fileManager = thunar
|
$fileManager = thunar
|
||||||
$menu = wofi --show drun
|
$menu = j4-dmenu-desktop --dmenu='bemenu --ignorecase --line-height 22 --hf "##10AC25" --ff "##10AC25" --tf "##10AC25"' --term='kitty'
|
||||||
|
|
||||||
# Some default env vars.
|
# Some default env vars
|
||||||
env = XCURSOR_SIZE,24
|
env = XCURSOR_SIZE,24
|
||||||
env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
|
env = QT_QPA_PLATFORMTHEME,qt6ct
|
||||||
|
|
||||||
input {
|
input {
|
||||||
kb_layout = us
|
kb_layout = us
|
||||||
@@ -75,10 +75,6 @@ dwindle {
|
|||||||
preserve_split = yes # you probably want this
|
preserve_split = yes # you probably want this
|
||||||
}
|
}
|
||||||
|
|
||||||
gestures {
|
|
||||||
workspace_swipe = off
|
|
||||||
}
|
|
||||||
|
|
||||||
misc {
|
misc {
|
||||||
force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
|
force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
|
||||||
}
|
}
|
||||||
@@ -87,14 +83,13 @@ windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
|
|||||||
|
|
||||||
$mainMod = SUPER
|
$mainMod = SUPER
|
||||||
|
|
||||||
bind = $mainMod, T, exec, $terminal
|
|
||||||
bind = $mainMod, C, killactive,
|
|
||||||
|
|
||||||
# Launch terminal
|
# Launch terminal
|
||||||
|
bind = $mainMod, T, exec, $terminal
|
||||||
bind = SHIFT_SUPER, Return, exec, $terminal
|
bind = SHIFT_SUPER, Return, exec, $terminal
|
||||||
|
|
||||||
# Close active window
|
# Close active window
|
||||||
bind = $mainMod, Shift+q, killactive,
|
bind = $mainMod, Shift+q, killactive,
|
||||||
|
bind = $mainMod, C, killactive,
|
||||||
|
|
||||||
bind = $mainMod, M, exit,
|
bind = $mainMod, M, exit,
|
||||||
bind = $mainMod, E, exec, $fileManager
|
bind = $mainMod, E, exec, $fileManager
|
||||||
@@ -161,17 +156,31 @@ bindl=, XF86AudioNext, exec, playerctl next
|
|||||||
bind = ,XF86MonBrightnessDown, exec, brightnessctl s 1%-
|
bind = ,XF86MonBrightnessDown, exec, brightnessctl s 1%-
|
||||||
bind = ,XF86MonBrightnessUp, exec, brightnessctl s +1%
|
bind = ,XF86MonBrightnessUp, exec, brightnessctl s +1%
|
||||||
|
|
||||||
|
# Screenshots
|
||||||
|
bind = , PRINT, exec, ~/.config/hypr/scripts/screenshot.sh rc
|
||||||
|
bind = SUPER, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh rf
|
||||||
|
bind = CTRL, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh ri
|
||||||
|
bind = SHIFT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh sc
|
||||||
|
bind = SUPER_SHIFT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh sf
|
||||||
|
bind = CTRL_SHIFT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh si
|
||||||
|
bind = ALT, PRINT, exec, ~/.config/hypr/scripts/screenshot.sh p
|
||||||
|
|
||||||
|
|
||||||
|
# Jetbrains window rules
|
||||||
|
# Prevent initial focus for JetBrains popups
|
||||||
|
windowrulev2 = noinitialfocus, class:^jetbrains-.*$, floating:1, title:^$|^\s$|^win\d+$
|
||||||
|
|
||||||
# Application launch
|
# Application launch
|
||||||
exec-once = kanshi
|
exec-once = kanshi # Automatically handles display configurations
|
||||||
exec-once = ydotoold
|
exec-once = ydotoold # Autoclicker/autokeyboard for automation
|
||||||
exec-once = hypridle
|
exec-once = hypridle # Hyprland/wayland specific idle lock tool
|
||||||
|
exec-once = hyprpaper # Hyprland/wayland specific wallpaper tool
|
||||||
|
|
||||||
exec-once = wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 10%
|
exec-once = wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 10% # Keep eardrums intact on reboot
|
||||||
|
|
||||||
# Loop needed until waybar gtk icon crash fixed
|
exec-once = waybar # Wayland specific status bar
|
||||||
exec-once = bash -c "while true; do waybar; sleep 3; done"
|
|
||||||
|
|
||||||
exec-once = sleep 5 && nm-applet
|
exec-once = sleep 5 && nm-applet # Traditional notifications area
|
||||||
exec-once = sleep 5 && blueman-applet
|
exec-once = sleep 5 && blueman-applet # Traditional bluetooth management tool
|
||||||
exec-once = sleep 5 && streamdeck -n
|
exec-once = sleep 5 && streamdeck -n # Streamdeck management tool
|
||||||
exec-once = sleep 5 && Telegram -startintray
|
exec-once = sleep 5 && Telegram -startintray # Gotta keep in touch with peeps
|
||||||
BIN
users/caperren/dotfiles/hyprpaper/backgrounds/1.jpg
Normal file
|
After Width: | Height: | Size: 708 KiB |
BIN
users/caperren/dotfiles/hyprpaper/backgrounds/2.jpg
Normal file
|
After Width: | Height: | Size: 912 KiB |
BIN
users/caperren/dotfiles/hyprpaper/backgrounds/black.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
5
users/caperren/dotfiles/hyprpaper/hyprpaper.conf
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
preload = ~/.config/hypr/backgrounds/black.png
|
||||||
|
wallpaper = ,~/.config/hypr/backgrounds/black.png
|
||||||
|
|
||||||
|
ipc = off
|
||||||
|
splash = false
|
||||||
1599
users/caperren/dotfiles/streamdeck/.streamdeck_ui.json
Normal file
BIN
users/caperren/dotfiles/streamdeck/icons/btop-logo.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/cogs-solid.png
Normal file
|
After Width: | Height: | Size: 24 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/discord-logo.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/expand-solid.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/firefox-logo.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/glances-logo.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/glava-standin-icon.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
|
After Width: | Height: | Size: 11 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/kitty-logo.png
Normal file
|
After Width: | Height: | Size: 7.8 KiB |
|
After Width: | Height: | Size: 9.2 KiB |
|
After Width: | Height: | Size: 8.0 KiB |
|
After Width: | Height: | Size: 9.0 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 20 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/microphone-solid.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/obsidian-logo.png
Normal file
|
After Width: | Height: | Size: 24 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/power-off-solid-red.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/retweet-solid-red.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 11 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/slash-solid-full.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/spotify-logo.png
Normal file
|
After Width: | Height: | Size: 24 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/steam_logo.png
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/telegram-logo.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/thunar-icon.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/unifi-camera-logo.png
Normal file
|
After Width: | Height: | Size: 679 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/unifi-protect-logo.png
Normal file
|
After Width: | Height: | Size: 145 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/video-solid-full.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/volume-down-solid.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 14 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/volume-mute-solid.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
users/caperren/dotfiles/streamdeck/icons/volume-up-solid.png
Normal file
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 12 KiB |
@@ -2,25 +2,28 @@
|
|||||||
"layer": "top",
|
"layer": "top",
|
||||||
"position": "top",
|
"position": "top",
|
||||||
"modules-left": [
|
"modules-left": [
|
||||||
"custom/logo",
|
// "custom/logo",
|
||||||
"clock",
|
"clock",
|
||||||
|
"temperature",
|
||||||
"disk",
|
"disk",
|
||||||
"memory",
|
"memory",
|
||||||
"cpu",
|
"cpu"
|
||||||
"hyprland/window"
|
|
||||||
],
|
],
|
||||||
"modules-center": [
|
"modules-center": [
|
||||||
|
"hyprland/window",
|
||||||
"hyprland/workspaces"
|
"hyprland/workspaces"
|
||||||
],
|
],
|
||||||
"modules-right": [
|
"modules-right": [
|
||||||
"tray",
|
"tray",
|
||||||
"idle_inhibitor",
|
"idle_inhibitor",
|
||||||
"pulseaudio",
|
"pulseaudio",
|
||||||
|
"battery",
|
||||||
|
"backlight",
|
||||||
"custom/exit"
|
"custom/exit"
|
||||||
],
|
],
|
||||||
"reload_style_on_change": true,
|
"reload_style_on_change": true,
|
||||||
"custom/logo": {
|
"custom/logo": {
|
||||||
"format": "<span font='20'></span>",
|
"format": "<span font='15'></span>",
|
||||||
"tooltip": false
|
"tooltip": false
|
||||||
},
|
},
|
||||||
"hyprland/workspaces": {
|
"hyprland/workspaces": {
|
||||||
@@ -38,8 +41,51 @@
|
|||||||
"9": "9"
|
"9": "9"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"backlight": {
|
||||||
|
"device": "intel_backlight",
|
||||||
|
"format": "{percent}% {icon}",
|
||||||
|
"format-icons": [
|
||||||
|
"",
|
||||||
|
""
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"battery": {
|
||||||
|
"bat": "BAT0",
|
||||||
|
"adapter": "AC",
|
||||||
|
"interval": 10,
|
||||||
|
"full-at": 100,
|
||||||
|
"states": {
|
||||||
|
"full": 100,
|
||||||
|
"good": 75,
|
||||||
|
"warning": 30,
|
||||||
|
"critical": 15,
|
||||||
|
"empty": 5
|
||||||
|
},
|
||||||
|
"format": "{icon} {capacity}%",
|
||||||
|
"format-charging": " {capacity}%",
|
||||||
|
"format-plugged": " {capacity}%",
|
||||||
|
"format-icons": [
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
""
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"temperature": {
|
||||||
|
"interval": 1,
|
||||||
|
"critical-threshold": 90,
|
||||||
|
"format": "{icon} {temperatureC}°C",
|
||||||
|
"format-icons": [
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
""
|
||||||
|
]
|
||||||
|
},
|
||||||
"idle_inhibitor": {
|
"idle_inhibitor": {
|
||||||
"format": "<span font='16'>{icon}</span>",
|
"format": "{icon}",
|
||||||
"format-icons": {
|
"format-icons": {
|
||||||
"activated": "",
|
"activated": "",
|
||||||
"deactivated": ""
|
"deactivated": ""
|
||||||
@@ -48,9 +94,9 @@
|
|||||||
"tooltip-format-deactivated": "idle-inhibitor <span color='#ee99a0'>off</span>"
|
"tooltip-format-deactivated": "idle-inhibitor <span color='#ee99a0'>off</span>"
|
||||||
},
|
},
|
||||||
"clock": {
|
"clock": {
|
||||||
"format": "{:%I:%M:%S %p | %a | %F}",
|
"format": "{:%I:%M:%S %p} |",
|
||||||
"interval": 1,
|
"interval": 1,
|
||||||
"tooltip-format": "\n<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
"tooltip-format": "<big>{:%I:%M:%S %p | %a | %F}</big>\n\n<tt><big>{calendar}</big></tt>",
|
||||||
"calendar-weeks-pos": "right",
|
"calendar-weeks-pos": "right",
|
||||||
"today-format": "<span color='#7645AD'><b><u>{}</u></b></span>",
|
"today-format": "<span color='#7645AD'><b><u>{}</u></b></span>",
|
||||||
"format-calendar": "<span color='#aeaeae'><b>{}</b></span>",
|
"format-calendar": "<span color='#aeaeae'><b>{}</b></span>",
|
||||||
@@ -59,34 +105,37 @@
|
|||||||
},
|
},
|
||||||
"disk": {
|
"disk": {
|
||||||
"interval": 30,
|
"interval": 30,
|
||||||
"format": " {percentage_used}%",
|
"format": " {}%",
|
||||||
"path": "/"
|
"tooltip-format": "{used} / {total} used"
|
||||||
},
|
},
|
||||||
"cpu": {
|
"cpu": {
|
||||||
|
"format": " {usage:02}% {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
|
||||||
|
"tooltip": false,
|
||||||
"interval": 1,
|
"interval": 1,
|
||||||
"format": " {usage}%",
|
|
||||||
"min-length": 6,
|
|
||||||
"max-length": 6,
|
|
||||||
"format-icons": [
|
"format-icons": [
|
||||||
"▁",
|
// green,
|
||||||
"▂",
|
"<span color='#69ff94'>▁</span>",
|
||||||
"▃",
|
// blue,
|
||||||
"▄",
|
"<span color='#2aa9ff'>▂</span>",
|
||||||
"▅",
|
// white,
|
||||||
"▆",
|
"<span color='#f8f8f2'>▃</span>",
|
||||||
"▇",
|
// white,
|
||||||
"█"
|
"<span color='#f8f8f2'>▄</span>",
|
||||||
|
// yellow,
|
||||||
|
"<span color='#ffffa5'>▅</span>",
|
||||||
|
// yellow,
|
||||||
|
"<span color='#ffffa5'>▆</span>",
|
||||||
|
// orange,
|
||||||
|
"<span color='#ff9977'>▇</span>",
|
||||||
|
// red,
|
||||||
|
"<span color='#dd532e'>█</span>"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"memory": {
|
"memory": {
|
||||||
"format": " {percentage}%"
|
"format": " {percentage:02}%"
|
||||||
},
|
},
|
||||||
"hyprland/window": {
|
"hyprland/window": {
|
||||||
"format": "( {class} )",
|
"format": "( {class} )",
|
||||||
"rewrite": {
|
|
||||||
"(.*) - Mozilla Firefox": "🌎 $1",
|
|
||||||
"(.*) - zsh": "> [$1]"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"pulseaudio": {
|
"pulseaudio": {
|
||||||
"format": "{volume:02}% {icon}",
|
"format": "{volume:02}% {icon}",
|
||||||
@@ -116,7 +165,7 @@
|
|||||||
"spacing": 10
|
"spacing": 10
|
||||||
},
|
},
|
||||||
"custom/exit": {
|
"custom/exit": {
|
||||||
"format": "",
|
"format": "| ",
|
||||||
"on-click": "wlogout -b 2",
|
"on-click": "wlogout -b 2",
|
||||||
"tooltip": false
|
"tooltip": false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,14 +2,15 @@
|
|||||||
"layer": "top",
|
"layer": "top",
|
||||||
"position": "top",
|
"position": "top",
|
||||||
"modules-left": [
|
"modules-left": [
|
||||||
"custom/logo",
|
// "custom/logo",
|
||||||
"clock",
|
"clock",
|
||||||
|
"temperature",
|
||||||
"disk",
|
"disk",
|
||||||
"memory",
|
"memory",
|
||||||
"cpu",
|
"cpu"
|
||||||
"hyprland/window"
|
|
||||||
],
|
],
|
||||||
"modules-center": [
|
"modules-center": [
|
||||||
|
"hyprland/window",
|
||||||
"hyprland/workspaces"
|
"hyprland/workspaces"
|
||||||
],
|
],
|
||||||
"modules-right": [
|
"modules-right": [
|
||||||
@@ -22,7 +23,7 @@
|
|||||||
],
|
],
|
||||||
"reload_style_on_change": true,
|
"reload_style_on_change": true,
|
||||||
"custom/logo": {
|
"custom/logo": {
|
||||||
"format": "<span font='20'></span>",
|
"format": "<span font='15'></span>",
|
||||||
"tooltip": false
|
"tooltip": false
|
||||||
},
|
},
|
||||||
"hyprland/workspaces": {
|
"hyprland/workspaces": {
|
||||||
@@ -50,23 +51,42 @@
|
|||||||
},
|
},
|
||||||
"battery": {
|
"battery": {
|
||||||
"bat": "BAT0",
|
"bat": "BAT0",
|
||||||
"interval": 60,
|
"adapter": "AC",
|
||||||
|
"interval": 10,
|
||||||
|
"full-at": 100,
|
||||||
"states": {
|
"states": {
|
||||||
|
"full": 100,
|
||||||
|
"good": 75,
|
||||||
"warning": 30,
|
"warning": 30,
|
||||||
"critical": 15
|
"critical": 15,
|
||||||
|
"empty": 5
|
||||||
},
|
},
|
||||||
"format": "{capacity}% {icon}",
|
"format": "{icon} {capacity}%",
|
||||||
|
"format-charging": " {capacity}%",
|
||||||
|
"format-plugged": " {capacity}%",
|
||||||
"format-icons": [
|
"format-icons": [
|
||||||
"",
|
"",
|
||||||
"",
|
"",
|
||||||
"",
|
"",
|
||||||
"",
|
"",
|
||||||
""
|
""
|
||||||
],
|
]
|
||||||
"max-length": 25
|
},
|
||||||
|
"temperature": {
|
||||||
|
"hwmon-path": "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon5/temp1_input",
|
||||||
|
"interval": 1,
|
||||||
|
"critical-threshold": 90,
|
||||||
|
"format": "{icon} {temperatureC}°C",
|
||||||
|
"format-icons": [
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
""
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"idle_inhibitor": {
|
"idle_inhibitor": {
|
||||||
"format": "<span font='16'>{icon}</span>",
|
"format": "{icon}",
|
||||||
"format-icons": {
|
"format-icons": {
|
||||||
"activated": "",
|
"activated": "",
|
||||||
"deactivated": ""
|
"deactivated": ""
|
||||||
@@ -75,9 +95,9 @@
|
|||||||
"tooltip-format-deactivated": "idle-inhibitor <span color='#ee99a0'>off</span>"
|
"tooltip-format-deactivated": "idle-inhibitor <span color='#ee99a0'>off</span>"
|
||||||
},
|
},
|
||||||
"clock": {
|
"clock": {
|
||||||
"format": "{:%I:%M:%S %p | %a | %F}",
|
"format": "{:%I:%M:%S %p} |",
|
||||||
"interval": 1,
|
"interval": 1,
|
||||||
"tooltip-format": "\n<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
"tooltip-format": "<big>{:%I:%M:%S %p | %a | %F}</big>\n\n<tt><big>{calendar}</big></tt>",
|
||||||
"calendar-weeks-pos": "right",
|
"calendar-weeks-pos": "right",
|
||||||
"today-format": "<span color='#7645AD'><b><u>{}</u></b></span>",
|
"today-format": "<span color='#7645AD'><b><u>{}</u></b></span>",
|
||||||
"format-calendar": "<span color='#aeaeae'><b>{}</b></span>",
|
"format-calendar": "<span color='#aeaeae'><b>{}</b></span>",
|
||||||
@@ -86,34 +106,37 @@
|
|||||||
},
|
},
|
||||||
"disk": {
|
"disk": {
|
||||||
"interval": 30,
|
"interval": 30,
|
||||||
"format": " {percentage_used}%",
|
"format": " {}%",
|
||||||
"path": "/"
|
"tooltip-format": "{used} / {total} used"
|
||||||
},
|
},
|
||||||
"cpu": {
|
"cpu": {
|
||||||
|
"format": " {usage:02}% {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
|
||||||
|
"tooltip": false,
|
||||||
"interval": 1,
|
"interval": 1,
|
||||||
"format": " {usage}%",
|
|
||||||
"min-length": 6,
|
|
||||||
"max-length": 6,
|
|
||||||
"format-icons": [
|
"format-icons": [
|
||||||
"▁",
|
// green,
|
||||||
"▂",
|
"<span color='#69ff94'>▁</span>",
|
||||||
"▃",
|
// blue,
|
||||||
"▄",
|
"<span color='#2aa9ff'>▂</span>",
|
||||||
"▅",
|
// white,
|
||||||
"▆",
|
"<span color='#f8f8f2'>▃</span>",
|
||||||
"▇",
|
// white,
|
||||||
"█"
|
"<span color='#f8f8f2'>▄</span>",
|
||||||
|
// yellow,
|
||||||
|
"<span color='#ffffa5'>▅</span>",
|
||||||
|
// yellow,
|
||||||
|
"<span color='#ffffa5'>▆</span>",
|
||||||
|
// orange,
|
||||||
|
"<span color='#ff9977'>▇</span>",
|
||||||
|
// red,
|
||||||
|
"<span color='#dd532e'>█</span>"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"memory": {
|
"memory": {
|
||||||
"format": " {percentage}%"
|
"format": " {percentage:02}%"
|
||||||
},
|
},
|
||||||
"hyprland/window": {
|
"hyprland/window": {
|
||||||
"format": "( {class} )",
|
"format": "( {class} )",
|
||||||
"rewrite": {
|
|
||||||
"(.*) - Mozilla Firefox": "🌎 $1",
|
|
||||||
"(.*) - zsh": "> [$1]"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"pulseaudio": {
|
"pulseaudio": {
|
||||||
"format": "{volume:02}% {icon}",
|
"format": "{volume:02}% {icon}",
|
||||||
@@ -143,7 +166,7 @@
|
|||||||
"spacing": 10
|
"spacing": 10
|
||||||
},
|
},
|
||||||
"custom/exit": {
|
"custom/exit": {
|
||||||
"format": "",
|
"format": "| ",
|
||||||
"on-click": "wlogout -b 2",
|
"on-click": "wlogout -b 2",
|
||||||
"tooltip": false
|
"tooltip": false
|
||||||
}
|
}
|
||||||
|
|||||||
51
users/caperren/dotfiles/waybar/style.css
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
* {
|
||||||
|
border: none;
|
||||||
|
border-radius: 0;
|
||||||
|
font-family: "JetBrains Mono", monospace;
|
||||||
|
font-size: 14px;
|
||||||
|
box-shadow: none;
|
||||||
|
text-shadow: none;
|
||||||
|
transition-duration: 0s;
|
||||||
|
}
|
||||||
|
|
||||||
|
window {
|
||||||
|
background: rgba(0, 0, 0, 0.00);
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button {
|
||||||
|
padding: 0 5px;
|
||||||
|
color: rgba(217, 216, 216, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.visible {
|
||||||
|
color: rgba(217, 216, 216, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.focused {
|
||||||
|
border-top: 3px solid rgba(217, 216, 216, 1);
|
||||||
|
border-bottom: 3px solid rgba(217, 216, 216, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.urgent {
|
||||||
|
color: rgba(238, 46, 36, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#memory,
|
||||||
|
#idle_inhibitor,
|
||||||
|
#pulseaudio,
|
||||||
|
#backlight {
|
||||||
|
margin: 0 6px 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#disk {
|
||||||
|
margin: 0 0 0 10px;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#clock {
|
||||||
|
margin: 0 6px 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#custom-exit {
|
||||||
|
margin: 0 16px 0 6px;
|
||||||
|
}
|
||||||