treewide: upstreaming changes

Signed-off-by: s0me1newithhand7s <117505144+s0me1newithhand7s@users.noreply.github.com>
This commit is contained in:
s0me1newithhand7s 2025-10-24 20:48:35 +03:00
parent d159232b37
commit e4e1b03c7e
No known key found for this signature in database
160 changed files with 3408 additions and 5474 deletions

View file

@ -1,48 +1,51 @@
{
{self, ...}: {
imports = [
./fonts/fonts.nix
./options/gui.nix
"${self}/hand7s/fonts/fonts.nix"
"${self}/hand7s/options/gui.nix"
./wayland/hyprland.nix
./wayland/river.nix
./wayland/sway.nix
"${self}/hand7s/wayland/hyprland.nix"
"${self}/hand7s/wayland/river.nix"
"${self}/hand7s/wayland/sway.nix"
./home/defaults.nix
./home/gui.nix
./home/keyboard.nix
./home/packages.nix
./home/shellAliases.nix
"${self}/hand7s/home/defaults.nix"
"${self}/hand7s/home/gui.nix"
"${self}/hand7s/home/keyboard.nix"
"${self}/hand7s/home/packages.nix"
"${self}/hand7s/home/shellAliases.nix"
./nixpkgs/config.nix
./nixpkgs/overlays.nix
"${self}/hand7s/nixpkgs/config.nix"
"${self}/hand7s/nixpkgs/overlays.nix"
./services/hypridle.nix
./services/swayidle.nix
./services/kdeconnect.nix
"${self}/hand7s/services/hypridle.nix"
"${self}/hand7s/services/swayidle.nix"
"${self}/hand7s/services/kdeconnect.nix"
./systemd/hyprpanel-service.nix
./systemd/hyprpolkitagent-service.nix
./systemd/yambar-service.nix
"${self}/hand7s/systemd/hyprpolkitagent-service.nix"
./programs/bat.nix
./programs/eza.nix
./programs/fish.nix
./programs/fzf.nix
./programs/ghostty.nix
./programs/git.nix
./programs/mpv.nix
./programs/helix.nix
./programs/index.nix
./programs/obs-studio.nix
./programs/starship.nix
./programs/firefox.nix
./programs/swaylock.nix
./programs/yazi.nix
./programs/zoxide.nix
./programs/chrome.nix
./programs/hyprlock.nix
./programs/spicetify.nix
./programs/vscode.nix
./programs/yambar.nix
"${self}/hand7s/programs/bat.nix"
"${self}/hand7s/programs/eza.nix"
"${self}/hand7s/programs/fish.nix"
"${self}/hand7s/programs/fzf.nix"
"${self}/hand7s/programs/ghostty.nix"
"${self}/hand7s/programs/git.nix"
"${self}/hand7s/programs/mpv.nix"
"${self}/hand7s/programs/helix.nix"
"${self}/hand7s/programs/index.nix"
"${self}/hand7s/programs/obs-studio.nix"
"${self}/hand7s/programs/starship.nix"
"${self}/hand7s/programs/firefox.nix"
"${self}/hand7s/programs/swaylock.nix"
"${self}/hand7s/programs/yazi.nix"
"${self}/hand7s/programs/zoxide.nix"
"${self}/hand7s/programs/chrome.nix"
"${self}/hand7s/programs/hyprlock.nix"
"${self}/hand7s/programs/hyprpanel.nix"
"${self}/hand7s/programs/spicetify.nix"
"${self}/hand7s/programs/vscode.nix"
"${self}/hand7s/programs/zellij.nix"
"${self}/hand7s/programs/zed-editor.nix"
"${self}/hand7s/programs/direnv.nix"
"${self}/hand7s/programs/kitty.nix"
"${self}/hand7s/programs/noctalia.nix"
];
}

View file

@ -16,6 +16,11 @@
osConfig.networking.hostName == "s0mePC-nix"
)
then "Hyprland"
else if
(
osConfig.networking.hostName == "s0mew0rkstat1on-nix"
)
then "Hyprland"
else if
(
osConfig.networking.hostName == "s0melapt0p-nix"

View file

@ -1,6 +1,7 @@
{...}: {
home = {
keyboard = {
variant = "";
layout = "us, ru";
options = [
"grp:caps_toggle"

View file

@ -7,19 +7,22 @@
home = {
packages = with pkgs;
[
xh
fd
gh
sd
xh
dua
nvd
git
gat
dust
sops
comma
rsync
procs
sbctl
gping
dconf
tokei
comma
ifuse
trippy
bottom
@ -29,21 +32,24 @@
gitoxide
tty-clock
deploy-rs
monero-cli
nixos-anywhere
wireguard-tools
yubico-piv-tool
yubikey-manager
libimobiledevice
nix-output-monitor
yubikey-touch-detector
yubikey-personalization
netbird-ui
]
++ lib.optionals (
osConfig.networking.hostName == "s0mePC-nix"
) [
tetrio-desktop
netbird-ui
thunderbird
mindustry
thunderbird
tetrio-desktop
min-ed-launcher
qbittorrent-enhanced
]
++ lib.optionals (

View file

@ -1,9 +1,13 @@
{...}: {
{
pkgs,
lib,
...
}: {
home = {
shellAliases = {
e = "eza";
et = "eza -T";
k = "kubectl";
e = "${lib.getExe pkgs.eza}";
et = "${lib.getExe pkgs.eza} -T";
k = "${lib.getExe pkgs.kubectl}";
};
};
}

View file

@ -3,7 +3,6 @@
settings = {
substituters = [
# cache.nixos.org
"https://nixos-cache-proxy.cofob.dev"
"https://cache.nixos.org"
# cache.garnix.org
"https://cache.garnix.io"

View file

@ -1,7 +1,6 @@
{inputs, ...}: {
{...}: {
nixpkgs = {
overlays = [
inputs.hyprpanel.overlay
];
};
}

View file

@ -20,6 +20,7 @@ in {
sessionType = lib.mkOption {
type = lib.types.enum [
"DWL"
"Sway"
"River"
"Hyprland"
@ -40,16 +41,17 @@ in {
[
vesktop
nekoray
ayugram
anki-bin
obsidian
playerctl
monero-gui
mindustry
bitwarden
lan-mouse
parsec-bin
pwvucontrol
easyeffects
ayugram
element-desktop
hyprpolkitagent
freesm-launcher
@ -63,10 +65,10 @@ in {
cfg.sessionType == "Sway"
) [
swaykbdd
sway-contrib.grimshot
sway-contrib.inactive-windows-transparency
autotiling-rs
sway-audio-idle-inhibit
sway-contrib.grimshot
sway-contrib.inactive-windows-transparency
]
++ lib.optionals (
cfg.sessionType == "River"
@ -78,7 +80,7 @@ in {
++ lib.optionals (
cfg.sessionType == "Hyprland"
) [
hyprpanel
inputs.noctalia.packages.${system}.default
grimblast
];
};
@ -90,10 +92,12 @@ in {
fuzzel.enable = true;
ghostty.enable = true;
firefox.enable = true;
alacritty.enable = true;
};
services = with lib.mkDefault; {
hyprpaper.enable = true;
kdeconnect.enable = true;
};
};

View file

@ -1,9 +1,13 @@
{...}: {
{
pkgs,
lib,
...
}: {
programs = {
bat = {
enable = true;
config = {
pager = "less -FR";
pager = "${lib.getExe pkgs.less} -FR";
};
};
};

View file

@ -0,0 +1,10 @@
{...}: {
programs = {
direnv = {
enable = true;
nix-direnv = {
enable = true;
};
};
};
}

View file

@ -8,6 +8,21 @@ in {
programs = {
firefox = {
package = zen-browser;
profiles = rec {
default = {
userContent = "
--zen-colors-primary: #82aaff !important;
--zen-colors-secondary: #c099ff !important;
--zen-colors-tertiary: #1e2030 !important;
--zen-colors-border: #3b4261 !important;
--zen-dialog-background: #222436 !important;
.tab-background[selected=[selected=''] {
background-color: #6c598c !important;
}
";
};
};
};
};
}

View file

@ -1,11 +1,15 @@
{...}: {
{
lib,
pkgs,
...
}: {
programs = {
fish = {
enable = true;
generateCompletions = true;
functions = {
fish_greeting = {
body = "echo ' ~ 𝑠𝑛𝑜𝑤𝑦 𝑝𝑙𝑎𝑐𝑒, 𝑓𝑢𝑙𝑙 𝑜𝑓 𝑓𝑙𝑎𝑘𝑒𝑠! '";
body = "${lib.getExe' pkgs.uutils-coreutils-noprefix "echo"} ' ~ 𝑠𝑛𝑜𝑤𝑦 𝑝𝑙𝑎𝑐𝑒, 𝑓𝑢𝑙𝑙 𝑜𝑓 𝑓𝑙𝑎𝑘𝑒𝑠! '";
};
};
};

View file

@ -16,8 +16,7 @@
keybind = [
"ctrl+shift+d=new_split:right"
"ctrl+shift+h=goto_split:left"
"ctrl+shift+l=goto_split:right"
"ctrl+shift+a=new_split:down"
];
};
};

View file

@ -1,18 +1,23 @@
{config, ...}: {
{
pkgs,
osConfig,
...
}: {
programs = {
git = {
enable = true;
package = pkgs.git;
userEmail = "117505144+s0me1newithhand7s@users.noreply.github.com";
userName = "s0me1newithhand7s";
aliases = {
pushall = "push github; push gitlab";
pushall-f = "push --force github; push --force gitlab";
pushall = "push github && push gitlab";
pushall-f = "push --force github && push --force gitlab";
};
signing = {
format = "ssh";
signByDefault = true;
key = config.sops.secrets.sshKeyOpen.path;
key = osConfig.sops.secrets.sshKey.path;
};
lfs = {

View file

@ -5,12 +5,11 @@
}: {
programs = {
helix = {
enable = true;
package = pkgs.helix_git;
enable = true;
defaultEditor = true;
extraPackages = with pkgs; [
nixd
nixfmt-rfc-style
];
settings = {
@ -44,9 +43,9 @@
};
formatter = {
command = "${lib.getExe pkgs.nixfmt-rfc-style}";
command = "${lib.getExe pkgs.nix}";
args = [
"--indent=4"
"fmt"
];
};

View file

@ -23,7 +23,7 @@
text_align = "center";
color = config.lib.stylix.colors.base01;
font_size = 48;
font_family = "Nerd Hack Font";
font_family = config.stylix.fonts.emoji.name;
rotate = 0;
position = "0, 50";
@ -42,7 +42,7 @@
text_align = "center";
color = config.lib.stylix.colors.base06;
font_size = 26;
font_family = "Nerd Hack Font";
font_family = config.stylix.fonts.emoji.name;
rotate = 0;
position = "200, -50";

View file

@ -0,0 +1,440 @@
{
pkgs,
lib,
...
}: {
programs = {
hyprpanel = {
enable = false;
settings = {
layout = {
"bar.layouts" = {
"*" = {
left = [
"dashboard"
"workspaces"
"media"
];
middle = [
"clock"
"power"
];
right = [
"network"
"kbinput"
"volume"
"systray"
"notifications"
];
};
};
};
scalingPriority = "hyprland";
tear = false;
dummy = true;
hyprpanel = {
restartAgs = true;
restartCommand = "${lib.getExe' pkgs.systemd "systemctl"} --user restart hyprpanel.service";
};
bar = {
autoHide = "never";
scrollSpeed = 5;
battery = {
hideLabelWhenFull = true;
label = true;
};
bluetooth = {
label = true;
};
clock = {
format = "%a, %b %d %I:%M:%S %p";
icon = "󰸗";
showIcon = true;
showTime = true;
};
launcher = {
icon = " ";
autoDetectIcon = true;
};
media = {
format = "{artist: - }{title}";
show_active_only = true;
show_label = true;
truncation = true;
truncation_size = 30;
};
network = {
label = true;
showWifiInfo = true;
truncation = true;
truncation_size = 10;
};
notifications = {
show_total = false;
hideCountWhenZero = true;
};
volume = {
label = true;
scrollDown = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-";
scrollUp = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+";
rightClick = "${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle";
};
windowtitle = {
icon = true;
label = true;
class_name = false;
custom_title = true;
truncation = true;
truncation_size = 50;
};
workspaces = {
show_icons = false;
show_numbered = false;
showApplicationIcons = true;
showAllActive = true;
showWsIcons = true;
numbered_active_indicator = "highlight";
workspaces = 20;
monitorSpecific = true;
reverse_scroll = false;
scroll_speed = 5;
spacing = 1.0;
workspaceMask = true;
ignored = "";
applicationIconEmptyWorkspace = "";
applicationIconFallback = "󰣆";
icons = {
active = "";
available = "";
occupied = "";
};
};
customModules = {
scrollSpeed = 5;
cava = {
showIcon = true;
icon = "";
spaceCharacter = "";
showActiveOnly = true;
stereo = false;
autoSensitivity = true;
bars = 10;
channels = 2;
framerate = 165;
samplerate = 48000;
lowCutoff = 20;
highCutoff = 20000;
barCharacters = [
""
""
""
""
""
""
""
""
];
};
cpu = {
icon = "";
label = true;
round = true;
pollingInterval = 1000;
};
cpuTemp = {
icon = "";
label = true;
pollingInterval = 500;
round = true;
showUnit = true;
sensor = "";
};
hypridle = {
label = true;
pollingInterval = 500;
offIcon = "";
offLabel = "OFF";
onIcon = "";
onLabel = "ON";
};
hyprsunset = {
label = true;
pollingInterval = 500;
offIcon = "󰛨";
offLabel = "OFF";
onIcon = "󱩌";
onLabel = "ON";
};
kbLayout = {
icon = "󰌌";
label = true;
labelType = "code";
rightClick = "${lib.getExe' pkgs.hyprland "hyprctl"} switchxkblayout monsgeek-monsgeek-keyboard next";
};
netstat = {
icon = "󰖟";
label = true;
pollingInterval = 250;
dynamicIcon = true;
round = true;
rateUnit = "auto";
networkInLabel = "";
networkOutLabel = "";
};
power = {
icon = "";
showLabel = true;
leftClick = "menu:powerdropdown";
};
microphone = {
label = true;
mutedIcon = "";
unmutedIcon = "";
leftClick = "menu:audio";
};
ram = {
icon = "";
label = true;
labelType = "percentage";
pollingInterval = 250;
round = true;
};
storage = {
icon = "󰋊";
label = true;
labelType = "percentage";
pollingInterval = 2000;
round = false;
};
submap = {
label = true;
showSubmapName = true;
enabledIcon = "󰌐";
enabledText = "ON";
disabledIcon = "󰌌";
disabledText = "OFF";
};
updates = {
label = true;
autoHide = true;
padZero = true;
pollingInterval = 1440000;
updateCommand = "nix flake update --flake ~/Projects/flake";
icon = {
pending = "󰏗";
updated = "󰏖";
};
};
weather = {
label = true;
unit = "metric";
};
};
};
menus = {
transition = "crossfade";
transitionTime = 200;
clock = {
time = {
military = false;
hideSeconds = true;
};
weather = {
enabled = true;
location = "Yelabuga";
unit = "metric";
key = "ac3df6535cac4448a4c83337252702";
};
};
dashboard = {
shortcuts = {
left = {
shortcut1 = {
command = "${lib.getExe pkgs.google-chrome}";
icon = "";
tooltip = "Google Chrome";
};
shortcut2 = {
command = "spotify";
icon = "";
tooltip = "Spotify";
};
shortcut3 = {
command = "${lib.getExe pkgs.discord}";
icon = "";
tooltip = "Discord";
};
shortcut4 = {
command = "ayugram-desktop";
icon = "";
tooltip = "Telegram";
};
};
right = {
shortcut1 = {
command = "${lib.getExe pkgs.fuzzel}";
icon = "";
tooltip = "Search";
};
shortcut3 = {
command = "${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png";
icon = "󰄀";
tooltip = "Screenshot";
};
};
};
stats = {
enable_gpu = false;
enabled = true;
interval = 1000;
};
directories = {
enabled = true;
};
powermenu = {
avatar = {
image = "/home/hand7s/Pictures/pfp4_mini.jpg";
name = "system";
};
};
};
media = {
displayTime = true;
displayTimeTooltip = true;
noMediaText = "-";
hideAlbum = false;
hideAuthor = false;
};
power = {
confirmation = true;
showLabel = true;
logout = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch exit";
reboot = "${lib.getExe' pkgs.systemd "systemctl"} reboot";
shutdown = "${lib.getExe' pkgs.systemd "systemctl"} poweroff";
sleep = "${lib.getExe' pkgs.systemd "systemctl"} suspend";
};
volume = {
raiseMaximumVolume = false;
};
};
notifications = {
active_monitor = true;
cache_actions = true;
clearDelay = 50;
displayedTotal = 5;
showActionsOnHover = true;
timeout = 5000;
};
theme = {
matugen = false;
name = "tokyo-night-vivid";
font = {
name = "Hack Font Nerd Regular";
size = "16px";
weight = 600;
};
bar = {
transparent = false;
floating = true;
layer = "top";
location = "top";
margin_bottom = "0";
margin_sides = "20px";
margin_top = "20px";
border_radius = "10px";
border = {
location = "full";
width = "2px";
};
buttons = {
enableBorders = false;
monochrome = false;
style = "default";
};
};
osd = {
enable = true;
active_monitor = true;
duration = 2500;
location = "right";
margins = "5px 5px 5px 5px";
muted_zero = false;
radius = "10px";
};
};
wallpaper = {
enable = false;
pywal = false;
image = "";
};
};
};
};
}

12
hand7s/programs/kitty.nix Normal file
View file

@ -0,0 +1,12 @@
{...}: {
programs = {
kitty = {
enable = true;
enableGitIntegration = true;
shellIntegration = {
enableFishIntegration = true;
};
};
};
}

View file

@ -0,0 +1,7 @@
{...}: {
programs = {
mangohud = {
enable = true;
};
};
}

View file

@ -15,6 +15,7 @@
forceBlackScreenCorners = true;
showScreenCorners = true;
screenRadiusRatio = 2;
radiusRatio = 0.7;
};
appLauncher = {
@ -186,6 +187,15 @@
];
};
ui = {
fontDefault = "Nerd Fonts Hack";
fontDefaultScale = 1;
fontFixed = "Nerd Fonts Hack";
fontFixedScale = 1;
idleInhibitorEnabled = false;
tooltipsEnabled = true;
};
location = {
name = "Yelaguba";
showWeekNumberInCalendar = true;

View file

@ -16,7 +16,6 @@
waveform
obs-vkcapture
obs-pipewire-audio-capture
obs-webkitgtk
];
};
};

View file

@ -1,6 +1,7 @@
{
lib,
config,
pkgs,
lib,
...
}: {
programs = {
@ -16,14 +17,14 @@
];
userSettings = lib.mkForce {
"editor.fontFamily" = "'Hack Nerd Font'";
"editor.fontFamily" = config.stylix.fonts.emoji.name;
"editor.fontSize" = 16;
"editor.cursorBlinking" = "smooth";
"editor.cursorSmoothCaretAnimation" = "on";
"editor.wordWrap" = "on";
"workbench.colorTheme" = "Blazing Red";
"workbench.colorTheme" = "Tokyo Night Moon";
"workbench.sideBar.location" = "right";
"workbench.activityBar.location" = "top";
"workbench.editor.editorActionsLocation" = "titleBar";
@ -31,6 +32,8 @@
"window.menuBarVisibility" = "hidden";
"terminal.integrated.cursorBlinking" = true;
"files.autoSave" = "afterDelay";
"[nix]" = {

File diff suppressed because it is too large Load diff

View file

@ -19,6 +19,20 @@
show_hidden = true;
show_symlink = true;
prepend_keymap = [
{
on = "R";
run = "plugin rsync";
desc = "Copy files using rsync";
}
{
on = "c, m";
run = "plugin chmod";
desc = "Chmod on selected files";
}
];
};
preview = {
@ -57,23 +71,39 @@
cursor_blink = true;
};
plugins = {
inherit
(pkgs.yaziPlugins)
starship
rsync
git
chmod
full-border
;
};
plugin = {
prepend_fetchers = [
{
id = "git";
name = "*";
run = "git";
}
initLua = ''
require("full-border"):setup({ type = ui.Border.ROUNDED })
require("starship"):setup()
require("git"):setup()
'';
{
id = "git";
name = "*/";
run = "git";
}
];
};
};
plugins = {
inherit
(pkgs.yaziPlugins)
starship
rsync
git
chmod
full-border
;
};
initLua = ''
require("full-border"):setup({ type = ui.Border.ROUNDED })
require("starship"):setup()
require("git"):setup()
'';
};
};
}

View file

@ -0,0 +1,32 @@
{pkgs, ...}: {
programs = {
zed-editor = {
enable = false;
package = pkgs.zed-editor_git;
installRemoteServer = true;
userSettings = {
vim_mode = true;
features = {
copilot = false;
};
tab_bar = {
show = false;
};
telemetry = {
metrics = false;
};
};
extensions = [
"nix"
"xy-zed"
];
extraPackages = [
pkgs.nixd
];
};
};
}

View file

@ -1,7 +1,24 @@
{...}: {
{
pkgs,
lib,
...
}: {
programs = {
zellij = {
enable = true;
settings = {
default_shell = "${lib.getExe pkgs.fish}";
show_startup_tips = false;
show_release_notes = false;
simplified_ui = true;
ui = {
pane_frames = {
rounded_corners = true;
hide_session_name = false;
};
};
};
};
};
}

View file

@ -19,7 +19,7 @@
{
event = "before-sleep";
command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power off'";
command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power off'";
}
{
@ -31,8 +31,8 @@
timeouts = [
{
timeout = 300;
command = "${libgetExe pkgs.brightnessctl} -s set 10";
resumeCommand = "${libgetExe pkgs.brightnessctl} -r";
command = "${lib.getExe pkgs.brightnessctl} -s set 10";
resumeCommand = "${lib.getExe pkgs.brightnessctl} -r";
}
{
@ -42,7 +42,7 @@
{
timeout = 900;
command = "${lib.getExe' pkgs.systemd "systemctl"} suspend";
command = "${lib.getExe' pkgs.systemd "systemctl"} suspend";
}
];
};

View file

@ -1,54 +1,15 @@
{
{self, ...}: {
imports = [
./fonts/fonts.nix
./options/gui.nix
"${self}/hand7s/nix/settings/substituters.nix"
"${self}/hand7s/nix/settings/trusted-public-keys.nix"
"${self}/hand7s/nix/package.nix"
./wayland/hyprland.nix
./wayland/river.nix
"${self}/hand7s/stylix/base16Scheme.nix"
"${self}/hand7s/stylix/cursor.nix"
"${self}/hand7s/stylix/defaults.nix"
"${self}/hand7s/stylix/fonts.nix"
"${self}/hand7s/stylix/image.nix"
./nix/settings/substituters.nix
./nix/settings/trusted-public-keys.nix
./nix/package.nix
./stylix/base16Scheme.nix
./stylix/cursor.nix
./stylix/defaults.nix
./stylix/fonts.nix
./stylix/image.nix
./nixpkgs/config.nix
./nixpkgs/overlays.nix
./home/defaults.nix
./home/gui.nix
./home/keyboard.nix
./home/packages.nix
./home/shellAliases.nix
./services/hypridle.nix
./systemd/hyprpanel-service.nix
./systemd/hyprpolkitagent-service.nix
./programs/bat.nix
./programs/eza.nix
./programs/fish.nix
./programs/fzf.nix
./programs/ghostty.nix
./programs/git.nix
./programs/helix.nix
./programs/index.nix
./programs/obs-studio.nix
./programs/starship.nix
./programs/yazi.nix
./programs/zoxide.nix
./programs/chrome.nix
./programs/fuzzel.nix
./programs/hyprlock.nix
./programs/hyprpanel.nix
./programs/spicetify.nix
./programs/vscode.nix
./programs/waybar.nix
./programs/wlogout.nix
"${self}/hand7s/"
];
}

View file

@ -1,24 +1,24 @@
{...}: {
stylix = {
base16Scheme = {
scheme = "Ólafur Bjarki Bogason";
name = "Tokyo Night Moon";
base00 = "#222436";
base01 = "#1e2030";
base02 = "#2d3f76";
base03 = "#636da6";
base04 = "#828bb8";
base05 = "#3b4261";
base06 = "#828bb8";
base07 = "#c8d3f5";
base08 = "#ff757f";
base09 = "#ffc777";
base0A = "#ffc777";
base0B = "#c3e88d";
base0C = "#86e1fc";
base0D = "#82aaff";
base0E = "#fca7ea";
base0F = "#c53b53";
scheme = "Tokyonight by Folke Lemaitre (https://github.com/folke)";
name = "Tokyonight";
base00 = "#24283b";
base01 = "#1f2335";
base02 = "#292e42";
base03 = "#565f89";
base04 = "#a9b1d6";
base05 = "#c0caf5";
base06 = "#c0caf5";
base07 = "#c0caf5";
base08 = "#f7768e";
base09 = "#ff9e64";
base0A = "#e0af68";
base0B = "#9ece6a";
base0C = "#1abc9c";
base0D = "#41a6b5";
base0E = "#bb9af7";
base0F = "#ff007c";
};
};
}

View file

@ -5,7 +5,7 @@
applications = 10;
desktop = 8;
popups = 10;
terminal = 8;
terminal = 10;
};
monospace = {

View file

@ -9,19 +9,22 @@
hyprpolkitagent = {
Unit = {
Description = "Hyprpolkitagent service.";
WantedBy = "graphical-session.target";
After = "graphical-session.target";
PartOf = "graphical-session.target";
};
Service = {
Type = "simple";
ExecStart = "${lib.getExe pkgs.hyprpolkitagent}";
Restart = "always";
RestartSec = 10;
RestartSec = 1;
TimeoutStopSec = 10;
};
Install = {
After = "graphical-session.target";
ConditionEnvironment = "WAYLAND_DISPLAY";
PartOf = "graphical-session.target";
WantedBy = [
"graphical-session.target"
];
};
};
};

View file

@ -1,30 +0,0 @@
{
pkgs,
lib,
...
}: {
systemd = {
user = {
services = {
yambar = {
Unit = {
Description = "Yambar service.";
WantedBy = "graphical-session.target";
};
Service = {
ExecStart = "${lib.getExe pkgs.yambar}";
Restart = "always";
RestartSec = 1;
};
Install = {
After = "graphical-session.target";
ConditionEnvironment = "WAYLAND_DISPLAY";
PartOf = "graphical-session.target";
};
};
};
};
};
}

View file

@ -16,11 +16,6 @@
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
systemd = {
enable = true;
enableXdgAutostart = true;
};
settings = {
monitor = ", 2560x1440@165.00Hz, 0x0, 1";
@ -31,7 +26,7 @@
layout = "dwindle";
snap = {
enabled = true;
enabled = false;
window_gap = "5";
monitor_gap = "5";
border_overlap = false;
@ -67,20 +62,6 @@
workspace_swipe_distance = 400;
};
group = {
auto_group = true;
insert_after_current = true;
focus_removed_window = true;
drag_into_group = "2";
merge_groups_on_drag = true;
merge_groups_on_groupbar = true;
group_on_movetoworkspace = true;
groupbar = {
enabled = true;
};
};
decoration = {
active_opacity = "0.85";
inactive_opacity = "0.65";
@ -110,15 +91,17 @@
"${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service"
"${lib.getExe' pkgs.systemd "systemctl"} --user start noctalis.service"
# "${lib.getExe' pkgs.systemd "systemctl"} --user start noctalis.service"
"${lib.getExe inputs.noctalia.packages.${pkgs.system}.default}"
"${lib.getExe' pkgs.hyprland "hyprctl"} setcursor material_light_cursors 20"
];
bind = [
"ALT, return, exec, ${lib.getExe pkgs.ghostty}"
"ALT, Q, killactive,"
"ALT SHIFT, Q, closeunfocused,"
"ALT, S, exec, ${lib.getExe pkgs.fuzzel}"
"ALT, S, exec, ${lib.getExe inputs.noctalia.packages.${pkgs.system}.default} ipc call launcher toggle"
"ALT, F, fullscreen, 0"
"ALT, L, exec, ${lib.getExe pkgs.hyprlock}"
@ -131,34 +114,32 @@
"ALT, up, movefocus, u"
"ALT, down, movefocus, d"
"ALT, 1, split-workspace, 1"
"ALT, 2, split-workspace, 2"
"ALT, 3, split-workspace, 3"
"ALT, 4, split-workspace, 4"
"ALT, 5, split-workspace, 5"
"ALT, 6, split-workspace, 6"
"ALT, 7, split-workspace, 7"
"ALT, 8, split-workspace, 8"
"ALT, 9, split-workspace, 9"
"ALT, 0, split-workspace, 10"
"ALT, 1, workspace, 1"
"ALT, 2, workspace, 2"
"ALT, 3, workspace, 3"
"ALT, 4, workspace, 4"
"ALT, 5, workspace, 5"
"ALT, 6, workspace, 6"
"ALT, 7, workspace, 7"
"ALT, 8, workspace, 8"
"ALT, 9, workspace, 9"
"ALT, 0, workspace, 10"
"ALT, H, togglespecialworkspace, special"
"ALT SHIFT, 1, split-movetoworkspace, 1"
"ALT SHIFT, 2, split-movetoworkspace, 2"
"ALT SHIFT, 3, split-movetoworkspace, 3"
"ALT SHIFT, 4, split-movetoworkspace, 4"
"ALT SHIFT, 5, split-movetoworkspace, 5"
"ALT SHIFT, 6, split-movetoworkspace, 6"
"ALT SHIFT, 7, split-movetoworkspace, 7"
"ALT SHIFT, 8, split-movetoworkspace, 8"
"ALT SHIFT, 9, split-movetoworkspace, 9"
"ALT SHIFT, 0, split-movetoworkspace, 10"
"ALT SHIFT, H, split-movetoworkspace, special"
"ALT SHIFT, 1, movetoworkspacesilent, 1"
"ALT SHIFT, 2, movetoworkspacesilent, 2"
"ALT SHIFT, 3, movetoworkspacesilent, 3"
"ALT SHIFT, 4, movetoworkspacesilent, 4"
"ALT SHIFT, 5, movetoworkspacesilent, 5"
"ALT SHIFT, 6, movetoworkspacesilent, 6"
"ALT SHIFT, 7, movetoworkspacesilent, 7"
"ALT SHIFT, 8, movetoworkspacesilent, 8"
"ALT SHIFT, 9, movetoworkspacesilent, 9"
"ALT SHIFT, 0, movetoworkspacesilent, 10"
"ALT SHIFT, H, movetoworkspacesilent, special"
"ALT, mouse_down, workspace, e+1"
"ALT, mouse_up, workspace, e-1"
"ALT, TAB, overview:toggle"
];
bindel = [
@ -205,6 +186,10 @@
initial_workspace_tracking = "2";
};
render = {
cm_auto_hdr = 0;
};
binds = {
workspace_back_and_forth = true;
allow_workspace_cycles = true;
@ -227,11 +212,9 @@
};
plugin = {
split-monitor-workspaces = {
count = 10;
keep_focused = 1;
enable_notifications = 1;
enable_persistent_workspaces = 1;
hyprscrolling = {
fullscreen_on_one_column = true;
follow_focus = true;
};
easymotion = {
@ -273,11 +256,16 @@
};
plugins = [
pkgs.hyprlandPlugins.hypr-dynamic-cursors
pkgs.hyprlandPlugins.xtra-dispatchers
pkgs.hyprlandPlugins.hyprwinwrap
pkgs.hyprlandPlugins.hyprgrass
pkgs.hyprlandPlugins.hyprscrolling
# pkgs.hyprlandPlugins.hypr-dynamic-cursors
# pkgs.hyprlandPlugins.xtra-dispatchers
# pkgs.hyprlandPlugins.hyprwinwrap
# pkgs.hyprlandPlugins.hyprgrass
# pkgs.hyprlandPlugins.hyprscrolling
# inputs.hyprcurs.packages.${pkgs.system}.hypr-dynamic-cursors
# inputs.hyprplugs.packages.${pkgs.system}.hyprscrolling
# inputs.hyprplugs.packages.${pkgs.system}.xtra-dispatchers
# inputs.hyprplugs.packages.${pkgs.system}.hyprwinwrap
];
};
};

View file

@ -102,8 +102,8 @@
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe pkgs.wayidle} -t=300 ${lib.getExe pkgs.brightnessctl} -s set 10
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe pkgs.wayidle} -t=600 ${lib.getExe pkgs.waylock}
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=300 ${lib.getExe pkgs.brightnessctl} -s set 10
${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=600 ${lib.getExe pkgs.waylock}
'';
};
};

View file

@ -71,6 +71,10 @@
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service";
}
{
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service";
}
{
command = "${lib.getExe pkgs.sway-audio-idle-inhibit}";
}
@ -82,10 +86,6 @@
{
command = "${lib.getExe pkgs.swaykbdd}";
}
{
command = "${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service";
}
];
keybindings = lib.mkOptionDefault {
@ -138,7 +138,7 @@
"XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next";
"XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.brightnessctl} set 5%-";
"XF86MonBrightnessUp" = "exec $${lib.getExe pkgs.brightnessctl} set +5%";
"XF86MonBrightnessUp" = "exec ${lib.getExe pkgs.brightnessctl} set +5%";
};
modes = {