Compare commits
No commits in common. "9b497a51747c0156ea6065dcad184afdd76115fa" and "db5a0f245871618d3f7027f3f041d254a898a7c1" have entirely different histories.
9b497a5174
...
db5a0f2458
@ -1,14 +1,21 @@
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./hyprlock.nix
|
||||
./hypridle.nix
|
||||
];
|
||||
options.hyprland.enable = lib.mkEnableOption "Hyprland";
|
||||
config = {
|
||||
home.packages = with pkgs; [
|
||||
dunst
|
||||
# hyprlock
|
||||
hyprpaper
|
||||
rofi-wayland
|
||||
slurp
|
||||
swww
|
||||
@ -21,130 +28,6 @@
|
||||
libsForQt5.qt5ct
|
||||
];
|
||||
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings = {
|
||||
splash = false;
|
||||
};
|
||||
};
|
||||
services.hypridle = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general = {
|
||||
lock_cmd = "hyprlock";
|
||||
before_sleep_cmd = "lockhelper";
|
||||
ignore_dbus_inhibit = false;
|
||||
};
|
||||
listener = {
|
||||
timeout = 240;
|
||||
on-timeout = "lockhelper";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
background = [
|
||||
{
|
||||
monitor = "DP-5";
|
||||
path = "/tmp/lockscreen/DP-5.png";
|
||||
blur_passes = 3;
|
||||
contrast = 0.8916;
|
||||
brightness = 0.8172;
|
||||
vibrancy = 0.1696;
|
||||
vibrancy_darkness = 0.0;
|
||||
}
|
||||
{
|
||||
monitor = "DP-6";
|
||||
path = "/tmp/lockscreen/DP-6.png";
|
||||
blur_passes = 3;
|
||||
contrast = 0.8916;
|
||||
brightness = 0.8172;
|
||||
vibrancy = 0.1696;
|
||||
vibrancy_darkness = 0.0;
|
||||
}
|
||||
{
|
||||
monitor = "DP-7";
|
||||
path = "/tmp/lockscreen/DP-7.png";
|
||||
blur_passes = 3;
|
||||
contrast = 0.8916;
|
||||
brightness = 0.8172;
|
||||
vibrancy = 0.1696;
|
||||
vibrancy_darkness = 0.0;
|
||||
}
|
||||
{
|
||||
monitor = "DP-8";
|
||||
path = "/tmp/lockscreen/DP-8.png";
|
||||
blur_passes = 3;
|
||||
contrast = 0.8916;
|
||||
brightness = 0.8172;
|
||||
vibrancy = 0.1696;
|
||||
vibrancy_darkness = 0.0;
|
||||
}
|
||||
];
|
||||
|
||||
general = {
|
||||
no_fade_in = false;
|
||||
grace = 0;
|
||||
disable_loading_bar = true;
|
||||
};
|
||||
|
||||
input-field = [
|
||||
{
|
||||
size = "250, 60";
|
||||
outline_thickness = 2;
|
||||
dots_size = 0.2;
|
||||
dots_spacing = 0.2;
|
||||
dots_center = true;
|
||||
outer_color = "rgba(0, 0, 0, 0)";
|
||||
inner_color = "rgba(0, 0, 0, 0.5)";
|
||||
font_color = "rgb(200, 200, 200)";
|
||||
fade_on_empty = false;
|
||||
font_family = "JetBrains Mono Nerd Font Mono";
|
||||
placeholder_text = "<i><span foreground=\"##cdd6f4\">Input Password...</span></i>";
|
||||
hide_input = false;
|
||||
position = "0, -120";
|
||||
halign = "center";
|
||||
valign = "center";
|
||||
}
|
||||
];
|
||||
|
||||
label = [
|
||||
{
|
||||
text = "cmd[update:2000] echo \"$(date +\"%b %d %H:%M\")\"";
|
||||
color = "rgba(255, 255, 255, 0.6)";
|
||||
font_size = 120;
|
||||
font_family = "JetBrains Mono Nerd Font Mono ExtraBold";
|
||||
position = "0, -300";
|
||||
halign = "center";
|
||||
valign = "top";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# streamcontroller service
|
||||
systemd.user.services = {
|
||||
streamcontroller = {
|
||||
Unit = {
|
||||
Description = "Streamcontroller service";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
Requisite = [ "graphical-session.target" ];
|
||||
};
|
||||
|
||||
Service = {
|
||||
ExecStart = "${pkgs.streamcontroller}/bin/streamcontroller -b";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
|
||||
Install = {
|
||||
WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
package = pkgs.hyprland;
|
||||
@ -188,11 +71,9 @@
|
||||
|
||||
decoration = {
|
||||
rounding = 10;
|
||||
# shadow = {
|
||||
# enable = true;
|
||||
# range = 4;
|
||||
# render_power = 3;
|
||||
# };
|
||||
drop_shadow = true;
|
||||
shadow_range = 4;
|
||||
shadow_render_power = 3;
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 3;
|
||||
@ -337,10 +218,10 @@
|
||||
|
||||
exec-once = [
|
||||
"waybar"
|
||||
# "hyprpaper & sleep 10 && randomwp"
|
||||
# "easyeffects --gapplication-service"
|
||||
# "hypridle"
|
||||
# "streamcontroller -b"
|
||||
"hyprpaper & sleep 10 && randomwp"
|
||||
"easyeffects --gapplication-service"
|
||||
"hypridle"
|
||||
"streamcontroller -b"
|
||||
# "dunst"
|
||||
];
|
||||
};
|
||||
|
@ -1,17 +1,16 @@
|
||||
{ pkgs, lib, ... }:
|
||||
# let
|
||||
# version = "6.2.6.2503";
|
||||
# zoom-override = pkgs.zoom-us.overrideAttrs (old: {
|
||||
# inherit version;
|
||||
# src = pkgs.fetchurl {
|
||||
# url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
# hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc=";
|
||||
# };
|
||||
# });
|
||||
# in
|
||||
let
|
||||
version = "6.2.6.2503";
|
||||
zoom-override = pkgs.zoom-us.overrideAttrs (old: {
|
||||
inherit version;
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc=";
|
||||
};
|
||||
});
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
pkgs.zoom-us
|
||||
#(lib.warn "Using overridden zoom version" zoom-override)
|
||||
(lib.warn "Using overridden zoom version" zoom-override)
|
||||
];
|
||||
}
|
||||
|
@ -26,6 +26,11 @@ if [ -z "$wallpaper_path" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! command -v hyprpaper &> /dev/null; then
|
||||
echo "Could not find hyprpaper command"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "setting $wallpaper_path as wallpaper"
|
||||
hyprctl hyprpaper unload all
|
||||
hyprctl hyprpaper preload "$wallpaper_path"
|
||||
|
@ -25,8 +25,8 @@
|
||||
boot = {
|
||||
# Kernel stuff
|
||||
# kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelPackages = lib.warn "Pinned to kernel 6.11 due to nvidia trouble!" pkgs.linuxPackages_6_11;
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
# kernelPackages = lib.warn "Pinned to kernel 6.10 due to nvidia fbdev trouble!" pkgs.linuxPackages_6_10;
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
|
Loading…
Reference in New Issue
Block a user