dachxy/nix-conf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: update flake

Browse source
This commit is contained in:
DACHXY 2025-07-25 16:21:27 +08:00
parent a99b4ad2e7
commit 3a07c0da83
18 changed files with 277 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

1
home/config/ghostty/config
View file

@ -2,6 +2,7 @@ font-family = "CaskaydiaCove Nerd Font Mono"
font-size = 15
theme = Espresso
unfocused-split-opacity = 0.85
desktop-notifications = false
wait-after-command = false
shell-integration = detect

9
home/config/scripts/waybarRestart.sh
View file

@ -1,9 +0,0 @@
#!/usr/bin/env bash
#Restart Waybar and swaync
killall .waybar-wrapped
killall .swaync-wrapped
waybar -c ~/.config/waybar/config.jsonc -s ~/.config/waybar/style.css &
XDG_CONFIG_HOME="$HOME/.dummy" # Prevent swaync use default gtk theme
swaync -c ~/.config/swaync/config.json -s ~/.config/swaync/style.css &

4
home/config/waybar/config.nix
View file

@ -9,7 +9,7 @@ in
map (dev: dev // modulesConfig) [
# Monitor 1
{
output = "DP-2";
output = "DP-6";
layer = "top";
exclusive = true;
passthrough = false;
@ -56,7 +56,7 @@ map (dev: dev // modulesConfig) [
}
# Monitor 2
{
output = "DP-3";
output = "DP-5";
layer = "top";
exclusive = true;
height = 54;

2
home/presets/basic.nix
View file

@ -13,10 +13,8 @@
../user/packages.nix
../user/firefox.nix
../user/shell.nix
../user/swaync.nix
../user/tmux.nix
../user/virtualization.nix
../user/swaync.nix
../user/vscode.nix
../user/yazi.nix
];

5
home/user/hypr/bind.nix
View file

@ -13,9 +13,7 @@ let
filemanager = "${terminal} -e yazi";
scripts = "~/.config/scripts";
# freezeShot = "--freeze";
freezeShot = "";
# clipboard-only = "${clipboardOnly}";
screenshotFolder = "--output-folder ~/Pictures/Screenshots";
clipboardOnly = "${screenshotFolder}";
@ -30,6 +28,8 @@ let
'';
toggleRofi = pkgs.writeShellScriptBin "toggle" ''
GDK_PIXBUF_MODULE_FILE="${pkgs.librsvg}/lib/gdk-pixbuf-2.0/${pkgs.librsvg.version}/loaders.cache" # Make rofi load svg
if ${pkgs.busybox}/bin/pgrep rofi > /dev/null; then
${pkgs.busybox}/bin/pkill rofi
else
@ -54,7 +54,6 @@ in
''${mainMod}, E, exec, ${filemanager}''
''${mainMod}, V, togglefloating, ''
''ALT, SPACE, exec, ${toggleRofi}/bin/toggle -config ~/.config/rofi/apps.rasi -show drun''
''${mainMod} ALT, W, exec, ${scripts}/waybarRestart.sh''
''${mainMod}, P, pseudo, # dwindle''
''${mainMod}, S, togglesplit, # dwindle''
''CTRL ${mainMod} SHIFT, L, exec, hyprlock''

2
home/user/hypr/exec.nix
View file

@ -11,8 +11,6 @@ let
dconf write /org/cinnamon/desktop/applications/terminal/exec-arg "''\'''\'" &
dconf write /org/gnome/desktop/interface/cursor-size ${builtins.toString xcursor-size} &
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
dbus-update-activation-environment --systemd --all &
systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME &
'';
in

2
home/user/hypr/input.nix
View file

@ -9,7 +9,7 @@
follow_mouse = 1;
accel_profile = "flat";
kb_options = "caps:swapescape";
kb_options = [ "caps:swapescape" ];
touchpad = {
natural_scroll = true;

116
home/user/hyprland.nix
View file

@ -76,61 +76,55 @@ in
{
home.packages = with pkgs; [
mpvpaper # Video Wallpaper
yt-dlp
hyprcursor
];
systemd.user.targets.hyprland-session.Unit.Wants = [
"xdg-desktop-autostart.target"
];
wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
systemd.enable = true;
systemd = {
enable = true;
variables = [ "--all" ];
};
package = null;
portalPackage = null;
plugins =
(with inputs.hyprland-plugins.packages.${system}; [
plugins = (
with inputs.hyprland-plugins.packages.${system};
[
xtra-dispatchers
hyprwinwrap
])
++ [
# inputs.hyprgrass.packages.${system}.default
# inputs.hyprtasking.packages.${system}.hyprtasking
];
]
);
settings =
{
debug = {
disable_logs = true;
};
bind = import ./hypr/bind.nix {
inherit settings;
inherit mainMod;
inherit pkgs;
nvidia-offload-enabled = osConfig.hardware.nvidia.prime.offload.enableOffloadCmd;
};
bindm = import ./hypr/bindm.nix { inherit mainMod; };
binde = import ./hypr/binde.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix;
plugin = plugins;
exec-once = [ ''${startScript}'' ];
env = [
''HYPRCURSOR_THEME, ${cursorName}''
''HYPRCURSOR_SIZE, ${builtins.toString settings.hyprland.cursor-size}''
''XCURSOR_THEME, ${cursorName}''
''XCURSOR_SIZE, ${builtins.toString settings.hyprland.xcursor-size}''
''XDG_CURRENT_DESKTOP, Hyprland''
''XDG_SESSION_DESKTOP, Hyprland''
''GDK_PIXBUF_MODULE_FILE, ${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'' # Make rofi load svg
];
workspace = import ./hypr/workspace.nix { monitors = settings.hyprland.monitors; };
}
// window
// windowrule
// input;
settings = {
debug = {
disable_logs = true;
};
bind = import ./hypr/bind.nix {
inherit settings;
inherit mainMod;
inherit pkgs;
nvidia-offload-enabled = osConfig.hardware.nvidia.prime.offload.enableOffloadCmd;
};
bindm = import ./hypr/bindm.nix { inherit mainMod; };
binde = import ./hypr/binde.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix;
plugin = plugins;
exec-once = [ ''${startScript}'' ];
env = [
''HYPRCURSOR_THEME, ${cursorName}''
''HYPRCURSOR_SIZE, ${builtins.toString settings.hyprland.cursor-size}''
''XCURSOR_THEME, ${cursorName}''
''XCURSOR_SIZE, ${builtins.toString settings.hyprland.xcursor-size}''
''XDG_CURRENT_DESKTOP, Hyprland''
''XDG_SESSION_DESKTOP, Hyprland''
];
workspace = import ./hypr/workspace.nix { monitors = settings.hyprland.monitors; };
}
// window
// windowrule
// input;
};
# === gamemode === #
@ -354,16 +348,25 @@ in
ExecStart = "${pkgs.hyprsunset}/bin/hyprsunset -t 3000k";
Restart = "always";
RestartSec = 2;
KillSignal = "SIGKILL"; # Hyprsunset seems not handle the SIGTERM signal
};
};
# === waybar === #
systemd.user.services.waybar = {
Unit = {
PartOf = [ "graphical-session.target" ];
After = [ "graphical-session.target" ];
};
};
programs.waybar = {
enable = true;
style = ../../home/config/waybar/style.css;
settings = import ../../home/config/waybar/config.nix { inherit terminal osConfig wallRand; };
systemd = {
enable = true;
target = "graphical-session.target";
};
};
@ -550,13 +553,26 @@ in
'';
};
systemd.user.services.swaync.Service = {
ExecStart = lib.mkForce ''${pkgs.swaynotificationcenter}/bin/swaync --config ${
config.xdg.configFile."swaync/config.json".target
} --style ${config.xdg.configFile."swaync/style.css".target}'';
Environment = [
"XDG_CONFIG_HOME=/home/_dummy"
];
systemd.user.services.swaync = lib.mkIf config.services.swaync.enable {
Unit = {
Requires = [ "waybar.service" ];
After = [
"waybar.service"
"graphical-session.target"
];
PartOf = [ "graphical-session.target" ];
};
Install = {
WantedBy = [ "graphical-session.target" ];
};
Service = {
ExecStart = lib.mkForce ''${pkgs.swaynotificationcenter}/bin/swaync --config ${
config.xdg.configFile."swaync/config.json".target
} --style ${config.xdg.configFile."swaync/style.css".target}'';
Environment = [
"XDG_CONFIG_HOME=/home/_dummy"
];
};
};
# === rofi === #

1
home/user/nvim.nix
View file

@ -392,7 +392,6 @@
yaml
zig
verilog
]
)).dependencies;
};

187
home/user/swaync.nix
View file

@ -1,187 +0,0 @@
# config from https://github.com/shub39/dotfiles
{ ... }:
{
services.swaync = {
enable = true;
settings = {
"positionX" = "right";
"positionY" = "top";
"layer" = "overlay";
"control-center-margin-top" = 20;
"control-center-margin-bottom" = 20;
"control-center-margin-right" = 20;
"control-center-margin-left" = 20;
"notification-icon-size" = 64;
"notification-body-image-height" = 100;
"notification-body-image-width" = 200;
"timeout" = 3;
"timeout-low" = 2;
"timeout-critical" = 0;
"fit-to-screen" = false;
"control-center-width" = 500;
"control-center-height" = 900;
"notification-window-width" = 490;
"keyboard-shortcuts" = true;
"image-visibility" = "when-available";
"transition-time" = 200;
"hide-on-clear" = true;
"hide-on-action" = true;
"script-fail-notify" = true;
"widgets" = [
"title"
"notifications"
"mpris"
];
};
style = ''
@define-color bgc rgba(0, 0, 0, 0.1);
@define-color borderc #ebdbb2;
@define-color textc #282828;
* {
font-family: JetBrainsMonoNerdFontMono;
font-weight: bold;
font-size: 15px;
border-width: 3px;
border-color: #ebdbb2;
color: #ebdbb2;
}
.control-center .notification-row:focus,
.control-center .notification-row:hover {
opacity: 1;
background: @bgc;
}
.notification-row {
outline: none;
margin: 20px;
padding: 0;
}
.notification {
background: @textc;
margin: 0px;
border-radius: 6px;
border-width: 3px;
border-color: #ebdbb2;
}
.notification-content {
background: @textc;
padding: 7px;
margin: 0;
}
.close-button {
background: @textc;
color: @borderc;
text-shadow: none;
padding: 0;
border-radius: 20px;
margin-top: 9px;
margin-right: 5px;
}
.close-button:hover {
box-shadow: none;
background: @borderc;
color: @textc;
transition: all .15s ease-in-out;
border: none;
}
.notification-action {
color: @bgc;
background: @textc;
}
.summary {
padding-top: 7px;
font-size: 13px;
color: @borderc;
}
.time {
font-size: 11px;
color: @borderc;
margin-right: 40px;
}
.body {
font-size: 12px;
color: @borderc;
}
.control-center {
background-color: @bgc;
border-radius: 20px;
}
.control-center-list {
background: transparent;
}
.control-center-list-placeholder {
opacity: .5;
}
.floating-notifications {
background: transparent;
}
.blank-window {
background: alpha(black, 0.1);
}
.widget-title {
color: @borderc;
padding: 10px 10px;
margin: 10px 10px 5px 10px;
font-size: 1.5rem;
}
.widget-title>button {
font-size: 1rem;
color: @borderc;
padding: 10px;
text-shadow: none;
background: @bgc;
box-shadow: none;
border-radius: 5px;
}
.widget-title>button:hover {
background: @borderc;
color: @textc;
}
.widget-label {
margin: 10px 10px 10px 10px;
}
.widget-label>label {
font-size: 1rem;
color: @borderc;
}
.widget-mpris {
color: @borderc;
padding: 5px 5px 5px 5px;
margin: 10px;
border-radius: 20px;
}
.widget-mpris>box>button {
border-radius: 20px;
}
.widget-mpris-player {
padding: 5px 5px;
margin: 10px;
}
'';
};
}