Compare commits

...

6 Commits

Author SHA1 Message Date
9b497a5174 Rewrite hyprland config
All checks were successful
Run nix flake check / flake-check (push) Successful in 1m46s
2024-11-20 21:06:17 +01:00
a21d90e1e6 Stop using pinned zoom version 2024-11-20 19:50:14 +01:00
562cc5c5d7 Fix hyprland config vars 2024-11-20 19:48:53 +01:00
e0ca946086 Switch to 6.11 kernel due to nvidia 2024-11-20 19:46:53 +01:00
db5a0f2458 Switch to nvidia beta driver
All checks were successful
Run nix flake check / flake-check (push) Successful in 1m48s
Periodic flake update / flake-update (push) Successful in 1m11s
2024-11-20 19:37:11 +01:00
68aafc6845 flake.lock: Update
All checks were successful
Run nix flake check / flake-check (push) Successful in 1m50s
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add?narHash=sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg%3D' (2024-11-15)
  → 'github:nixos/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
2024-11-20 19:27:34 +01:00
5 changed files with 151 additions and 36 deletions

6
flake.lock generated
View File

@@ -203,11 +203,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1732014248,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,21 +1,14 @@
{ {
inputs,
pkgs, pkgs,
lib, lib,
config, config,
... ...
}: }:
{ {
imports = [
./hyprlock.nix
./hypridle.nix
];
options.hyprland.enable = lib.mkEnableOption "Hyprland"; options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = { config = {
home.packages = with pkgs; [ home.packages = with pkgs; [
dunst dunst
# hyprlock
hyprpaper
rofi-wayland rofi-wayland
slurp slurp
swww swww
@@ -28,6 +21,130 @@
libsForQt5.qt5ct 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 = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = pkgs.hyprland; package = pkgs.hyprland;
@@ -71,9 +188,11 @@
decoration = { decoration = {
rounding = 10; rounding = 10;
drop_shadow = true; # shadow = {
shadow_range = 4; # enable = true;
shadow_render_power = 3; # range = 4;
# render_power = 3;
# };
blur = { blur = {
enabled = true; enabled = true;
size = 3; size = 3;
@@ -218,10 +337,10 @@
exec-once = [ exec-once = [
"waybar" "waybar"
"hyprpaper & sleep 10 && randomwp" # "hyprpaper & sleep 10 && randomwp"
"easyeffects --gapplication-service" # "easyeffects --gapplication-service"
"hypridle" # "hypridle"
"streamcontroller -b" # "streamcontroller -b"
# "dunst" # "dunst"
]; ];
}; };

View File

@@ -1,16 +1,17 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let # let
version = "6.2.6.2503"; # version = "6.2.6.2503";
zoom-override = pkgs.zoom-us.overrideAttrs (old: { # zoom-override = pkgs.zoom-us.overrideAttrs (old: {
inherit version; # inherit version;
src = pkgs.fetchurl { # src = pkgs.fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; # url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc="; # hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc=";
}; # };
}); # });
in # in
{ {
home.packages = [ home.packages = [
(lib.warn "Using overridden zoom version" zoom-override) pkgs.zoom-us
#(lib.warn "Using overridden zoom version" zoom-override)
]; ];
} }

View File

@@ -26,11 +26,6 @@ if [ -z "$wallpaper_path" ]; then
exit 1 exit 1
fi fi
if ! command -v hyprpaper &> /dev/null; then
echo "Could not find hyprpaper command"
exit 1
fi
echo "setting $wallpaper_path as wallpaper" echo "setting $wallpaper_path as wallpaper"
hyprctl hyprpaper unload all hyprctl hyprpaper unload all
hyprctl hyprpaper preload "$wallpaper_path" hyprctl hyprpaper preload "$wallpaper_path"

View File

@@ -25,8 +25,8 @@
boot = { boot = {
# Kernel stuff # Kernel stuff
# kernelPackages = pkgs.linuxPackages_xanmod_latest; # kernelPackages = pkgs.linuxPackages_xanmod_latest;
kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;
# kernelPackages = lib.warn "Pinned to kernel 6.10 due to nvidia fbdev trouble!" pkgs.linuxPackages_6_10; kernelPackages = lib.warn "Pinned to kernel 6.11 due to nvidia trouble!" pkgs.linuxPackages_6_11;
kernelParams = [ kernelParams = [
"quiet" "quiet"
"splash" "splash"
@@ -76,7 +76,7 @@
open = true; open = true;
nvidiaSettings = false; nvidiaSettings = false;
package = config.boot.kernelPackages.nvidiaPackages.latest; package = config.boot.kernelPackages.nvidiaPackages.beta;
# package = config.boot.kernelPackages.nvidiaPackages.mkDriver { # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
# version = "560.28.03"; # version = "560.28.03";
# sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y="; # sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";