From 44d29f90e957bbe9795aded08fdbbde7f244ccc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 10 Jul 2025 06:51:51 +0200 Subject: [PATCH] working niri config --- configs/mpv.nix | 2 +- flake.lock | 383 +++++++++++++++++++++----------- flake.nix | 2 + packages/unicodmenu.nix | 6 +- systems/kabsa/configuration.nix | 22 +- 5 files changed, 277 insertions(+), 138 deletions(-) diff --git a/configs/mpv.nix b/configs/mpv.nix index e5e1e7e..691c9ab 100644 --- a/configs/mpv.nix +++ b/configs/mpv.nix @@ -36,7 +36,7 @@ in { "Alt+j" = "add video-pan-y -0.05"; }; scripts = [ - pkgs.mpvScripts.quality-menu + # pkgs.mpvScripts.quality-menu niveumPackages.mpv-visualizer ]; }; diff --git a/flake.lock b/flake.lock index 107dea5..5b299f3 100644 --- a/flake.lock +++ b/flake.lock @@ -178,7 +178,7 @@ "stockholm", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1746626503, @@ -194,6 +194,27 @@ "type": "github" } }, + "centerpiece": { + "inputs": { + "crane": "crane", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1745697341, + "narHash": "sha256-KDYRly/9IKDBmH3D6Jv4BkVer3u/uwkQIXR0vhAuqro=", + "owner": "friedow", + "repo": "centerpiece", + "rev": "2a610e8e0a6b65b733ea98f2ca602235f695b4f3", + "type": "github" + }, + "original": { + "owner": "friedow", + "repo": "centerpiece", + "type": "github" + } + }, "coptic-dictionary": { "inputs": { "kellia-dictionary": "kellia-dictionary", @@ -239,6 +260,21 @@ "type": "github" } }, + "crane": { + "locked": { + "lastModified": 1742394900, + "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", + "owner": "ipetkov", + "repo": "crane", + "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -287,7 +323,7 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_7", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -624,6 +660,24 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1743259333, + "narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "coptic-dictionary", @@ -646,7 +700,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -735,7 +789,7 @@ "inputs": { "fenix": "fenix", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1702906210, @@ -814,12 +868,12 @@ "agenix": "agenix_2", "coptic-dictionary": "coptic-dictionary_2", "flake-utils": "flake-utils", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "menstruation-backend": "menstruation-backend", "menstruation-telegram": "menstruation-telegram", "nix-on-droid": "nix-on-droid", "nixinate": "nixinate", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_4", "nixpkgs-old": "nixpkgs-old", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", @@ -994,7 +1048,7 @@ }, "nixinate_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1742737607, @@ -1012,16 +1066,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693636127, - "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1123,112 +1177,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1615532953, - "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", - "path": "/nix/store/vw365chp87kvfczxm26qiq7z2pq3jk5z-source", - "rev": "916ee862e87ac5ee2439f2fb7856386b4dc906ae", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1615532953, - "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", - "path": "/nix/store/vw365chp87kvfczxm26qiq7z2pq3jk5z-source", - "rev": "916ee862e87ac5ee2439f2fb7856386b4dc906ae", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1653060744, - "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dfd82985c273aac6eced03625f454b334daae2e8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1750400657, "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", @@ -1244,7 +1192,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_11": { "locked": { "lastModified": 1750365781, "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", @@ -1260,7 +1208,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_12": { "locked": { "lastModified": 1746904237, "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", @@ -1276,6 +1224,160 @@ "type": "github" } }, + "nixpkgs_13": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1615532953, + "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", + "path": "/nix/store/vw365chp87kvfczxm26qiq7z2pq3jk5z-source", + "rev": "916ee862e87ac5ee2439f2fb7856386b4dc906ae", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1735554305, + "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1693636127, + "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1615532953, + "narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=", + "path": "/nix/store/vw365chp87kvfczxm26qiq7z2pq3jk5z-source", + "rev": "916ee862e87ac5ee2439f2fb7856386b4dc906ae", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1653060744, + "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dfd82985c273aac6eced03625f454b334daae2e8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -1390,8 +1492,8 @@ "nur_2": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_8", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_11", + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1750553086, @@ -1417,7 +1519,7 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix_4" }, "locked": { "lastModified": 1746056780, @@ -1518,14 +1620,15 @@ "root": { "inputs": { "agenix": "agenix", + "centerpiece": "centerpiece", "coptic-dictionary": "coptic-dictionary", "flake-utils": "flake-utils_3", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "menstruation-backend": "menstruation-backend_2", "menstruation-telegram": "menstruation-telegram_2", "nix-on-droid": "nix-on-droid_2", "nixinate": "nixinate_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_10", "nixpkgs-old": "nixpkgs-old_2", "nixpkgs-unstable": "nixpkgs-unstable_2", "nur": "nur_2", @@ -1668,7 +1771,7 @@ "inputs": { "buildbot-nix": "buildbot-nix", "nix-writers": "nix-writers", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1747157099, @@ -1832,7 +1935,7 @@ "telebots": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1677156381, @@ -1851,7 +1954,7 @@ "telebots_2": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1703313352, @@ -2007,6 +2110,24 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nur", @@ -2027,7 +2148,7 @@ "type": "github" } }, - "treefmt-nix_2": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "stockholm", @@ -2049,7 +2170,7 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_4": { "inputs": { "nixpkgs": [ "stylix", @@ -2110,7 +2231,7 @@ "niveum", "flake-utils" ], - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1615819231, @@ -2132,7 +2253,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1615819231, diff --git a/flake.nix b/flake.nix index 2efc966..df38ff9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ home-manager.url = "github:nix-community/home-manager/release-25.05"; menstruation-backend.url = "github:kmein/menstruation.rs"; menstruation-telegram.url = "github:kmein/menstruation-telegram"; + centerpiece.url = "github:friedow/centerpiece"; nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05"; nixinate.url = "github:matthewcroughan/nixinate"; nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; @@ -71,6 +72,7 @@ nixinate, flake-utils, nix-on-droid, + centerpiece, stylix, ... }: diff --git a/packages/unicodmenu.nix b/packages/unicodmenu.nix index ed17867..92bcc04 100644 --- a/packages/unicodmenu.nix +++ b/packages/unicodmenu.nix @@ -8,7 +8,7 @@ dmenu, gnused, libnotify, - xclip, + wl-clipboard, xdotool, gawk, fetchFromGitHub, @@ -90,7 +90,7 @@ in writers.writeDashBin "unicodmenu" '' history_file=$HOME/.cache/unicodmenu touch "$history_file" - PATH=${lib.makeBinPath [coreutils dmenu gawk gnused libnotify xclip xdotool]} + PATH=${lib.makeBinPath [coreutils dmenu gawk gnused libnotify wl-clipboard xdotool]} all_characters() { tac "$history_file" @@ -101,7 +101,7 @@ in [ "$chosen" != "" ] || exit - echo "$chosen" | tr -d '\n' | xclip -selection clipboard + echo "$chosen" | tr -d '\n' | wl-copy if [ -n "$1" ]; then xdotool key Shift+Insert diff --git a/systems/kabsa/configuration.nix b/systems/kabsa/configuration.nix index 37f777b..b869752 100644 --- a/systems/kabsa/configuration.nix +++ b/systems/kabsa/configuration.nix @@ -3,10 +3,12 @@ niveumPackages, pkgs, lib, + inputs, ... }: let inherit (import ../../lib) retiolumAddresses defaultApplications; + # TODO wrap obsidian: obsidian --no-sandbox --ozone-platform=wayland --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations %U in { imports = [ @@ -19,6 +21,20 @@ in programs.niri.enable = true; services.displayManager.defaultSession = lib.mkForce "niri"; home-manager.users.me = { + imports = [ inputs.centerpiece.hmModules."x86_64-linux".default ]; + programs.centerpiece = { + enable = true; + config.plugin = { + clock.enable = true; + resource_monitor_battery.enable = true; + resource_monitor_cpu.enable = true; + resource_monitor_disks.enable = true; + resource_monitor_memory.enable = true; + system.enable = true; + wifi.enable = true; + }; + }; + programs.alacritty.enable = true; # Super+T in the default setting (terminal) programs.fuzzel.enable = true; # Super+D in the default setting (app launcher) programs.swaylock.enable = true; # Super+Alt+L in the default setting (screen locker) @@ -82,7 +98,7 @@ in }; in '' - spawn-at-startup waybar + spawn-at-startup "waybar" input { warp-mouse-to-focus @@ -224,14 +240,14 @@ in binds { Mod+Shift+Slash { show-hotkey-overlay; } Mod+Return { spawn "${(defaultApplications pkgs).terminal}"; } - Mod+D { spawn "${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}"; } + Mod+D { spawn "fuzzel"; } Mod+Shift+D { spawn "${niveumPackages.notemenu}/bin/notemenu"; } Mod+T { spawn "${(defaultApplications pkgs).fileManager}"; } Mod+Y { spawn "${(defaultApplications pkgs).browser}"; } Mod+P { spawn "rofi-pass"; } Mod+U { spawn "${niveumPackages.unicodmenu}/bin/unicodmenu"; } - Mod+B { spawk "killall -SIGUSR1 waybar"; } + Mod+B { spawn "pkill -SIGUSR1 waybar"; } Mod+F12 { spawn "${klem}/bin/klem"; } Mod+Shift+Q { close-window; }