From f437f448970574de4feddda418014fef3995fbae Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sat, 5 Apr 2025 11:40:13 +0200 Subject: [PATCH 1/2] more niri config --- home/vinzenz/default.nix | 1 + home/vinzenz/fuzzel.nix | 31 +++++++++++++++++++++++++++++++ home/vinzenz/niri.nix | 29 ----------------------------- home/vinzenz/swaylock.nix | 21 ++++++++++++++++----- home/vinzenz/waybar.nix | 2 +- 5 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 home/vinzenz/fuzzel.nix diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index 95573f1..59c4747 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -25,6 +25,7 @@ home-manager.users.vinzenz.imports = [ ./configuration.nix ./editorconfig.nix + ./fuzzel.nix ./git.nix ./gnome.nix ./niri.nix diff --git a/home/vinzenz/fuzzel.nix b/home/vinzenz/fuzzel.nix new file mode 100644 index 0000000..db700e8 --- /dev/null +++ b/home/vinzenz/fuzzel.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }: +{ + config.programs.fuzzel = { + enable = true; + settings = { + main = { + terminal = "${pkgs.alacritty}/bin/alacritty"; + icon-theme = "Adwaita"; + counter = true; + font = "sans:size=10"; + }; + colors = { + border = "0003B3FF"; + background = "0F0F0FFF"; + text = "657b83ff"; + prompt = "586e75ff"; + placeholder = "93a1a1ff"; + input = "657b83ff"; + match = "cb4b16ff"; + selection = "eee8d5ff"; + selection-text = "586e75ff"; + selection-match = "cb4b16ff"; + counter = "93a1a1ff"; + }; + border = { + radius = 30; + width = 3; + }; + }; + }; +} diff --git a/home/vinzenz/niri.nix b/home/vinzenz/niri.nix index 57c30eb..9c532ee 100644 --- a/home/vinzenz/niri.nix +++ b/home/vinzenz/niri.nix @@ -28,35 +28,6 @@ }; }; - programs.fuzzel = { - enable = true; - settings = { - main = { - terminal = "${pkgs.alacritty}/bin/alacritty"; - icon-theme = "Adwaita"; - counter = true; - font = "sans:size=10"; - }; - colors = { - border = "0003B3FF"; - background = "0F0F0FFF"; - text = "657b83ff"; - prompt = "586e75ff"; - placeholder = "93a1a1ff"; - input = "657b83ff"; - match = "cb4b16ff"; - selection = "eee8d5ff"; - selection-text = "586e75ff"; - selection-match = "cb4b16ff"; - counter = "93a1a1ff"; - }; - border = { - radius = 30; - width = 3; - }; - }; - }; - programs.niri.settings = { input.keyboard.xkb.layout = "de"; diff --git a/home/vinzenz/swaylock.nix b/home/vinzenz/swaylock.nix index 291a90c..9255f04 100644 --- a/home/vinzenz/swaylock.nix +++ b/home/vinzenz/swaylock.nix @@ -25,15 +25,26 @@ services.swayidle = { enable = true; + systemdTarget = "graphical-session.target"; timeouts = [ { - timeout = 60; + timeout = 30; + command = "${config.programs.swaylock.package}/bin/swaylock"; + } + { + timeout = 60 * 10; + command = "${pkgs.systemd}/bin/systemctl suspend"; + } + ]; + events = [ + { + event = "before-sleep"; + command = "${pkgs.playerctl}/bin/playerctl pause; ${config.programs.swaylock.package}/bin/swaylock"; + } + { + event = "lock"; command = "${config.programs.swaylock.package}/bin/swaylock"; } - #{ - # timeout = 90; - # command = "${pkgs.systemd}/bin/systemctl suspend"; - #} ]; }; }; diff --git a/home/vinzenz/waybar.nix b/home/vinzenz/waybar.nix index 0cd0c55..af276ac 100644 --- a/home/vinzenz/waybar.nix +++ b/home/vinzenz/waybar.nix @@ -6,7 +6,6 @@ }: { home.packages = with pkgs; [ - waybar playerctl cava ]; @@ -14,6 +13,7 @@ programs.waybar = { enable = true; systemd.enable = true; + systemd.target = "graphical-session.target"; settings = { mainBar = { layer = "top"; From 5fc8fe8ac64ec3b29fda34b8cfe4130e24543d68 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sat, 5 Apr 2025 11:42:35 +0200 Subject: [PATCH 2/2] update flake --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a608a1b..edfe1e8 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1743808813, + "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742220949, - "narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=", + "lastModified": 1743791363, + "narHash": "sha256-hGETu0Ilugf0f7S5fFETUP+sS0ATrKcm+7YHs7GBwx4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9", + "rev": "f160e322673614c928e1187c268add9ef038a513", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742103165, - "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", + "lastModified": 1743774669, + "narHash": "sha256-xrg3m1RP7mvBi0sLPJjnn9UiCqN+NKqU94DZJMoaXZU=", "owner": "YaLTeR", "repo": "niri", - "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", + "rev": "e8da89a430f4af0accfe80efe286b2cffd20a4aa", "type": "github" }, "original": { @@ -151,11 +151,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { @@ -208,11 +208,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742083780, - "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", "type": "github" }, "original": {