From 5687ef3d2052f12e90dc2e5aabf0b94660a7d485 Mon Sep 17 00:00:00 2001 From: Filip Hoffmann Date: Thu, 1 May 2025 18:48:47 +0200 Subject: [PATCH] forgot to commit: updates, gpg deprecation fix, active window screenshot --- flake.lock | 42 ++++++++++++++++++++-------------------- system/configuration.nix | 1 + system/virtualbox.nix | 5 +++++ user/gpg.nix | 2 +- user/hyprland.nix | 32 +++++++++++++++++++++++------- 5 files changed, 53 insertions(+), 29 deletions(-) create mode 100644 system/virtualbox.nix diff --git a/flake.lock b/flake.lock index 6a4f2e2..428d6eb 100644 --- a/flake.lock +++ b/flake.lock @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1745325289, - "narHash": "sha256-RKLaR/x3jsc57lu+giaSa+3xXwky/IZMJ/f8RB+XPWs=", + "lastModified": 1745987135, + "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", "owner": "nix-community", "repo": "home-manager", - "rev": "ce8dc1f77ada561f4deee2c76f7cd6f6c7b8feec", + "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "mnw": { "locked": { - "lastModified": 1744597985, - "narHash": "sha256-lLYB9/tQ0OAKonL0Ku963nqOm0aE1TmLavrzmXAr5Zc=", + "lastModified": 1745705214, + "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cbdcbb5f8eb24e25b932bbc87e29299a72e34b64", + "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1745325559, - "narHash": "sha256-Ice2yq808ks+PGiGsc5ZztlAKc9+EEsWeKVBBaeF4Bk=", + "lastModified": 1746036067, + "narHash": "sha256-3JIo1xX+32gzH1ANuzSjXfIIOcoSFbGBNaqELkvvcpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3f6a4ed5252b74fb35113619be55219a18e7922", + "rev": "547c144d7d62d4bda771cc74d7c057dbb3de0226", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745324162, - "narHash": "sha256-Sjb/LvtWpPtSXacjJCTrLAmWtXNJd0SWxO3PzTvD7Tc=", + "lastModified": 1746034277, + "narHash": "sha256-cjEsFFfKBy4aOcfzQjSgMeQUc3Voa74IlBIbg0XDH10=", "owner": "nix-community", "repo": "nixvim", - "rev": "60638182b8d1b0fe13631d02eafaf8903499ee60", + "rev": "1df98b6636e64b88d765370ceeff5bf158c602ee", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1745219503, - "narHash": "sha256-oE7nEQBfLTwXqs0U5/fpsMVsfccD6NL1TlBE1z9S+Nc=", + "lastModified": 1746010885, + "narHash": "sha256-/Wwmjxwk+zYS8qyWxFw4Ap5iOyitPCz60LceqAYsrBQ=", "owner": "NotAShelf", "repo": "nvf", - "rev": "4045c458dc3e3eaabbb94518a857651cff341542", + "rev": "099907591a98163283b8d89afe9a342216d454da", "type": "github" }, "original": { @@ -399,11 +399,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1745151211, - "narHash": "sha256-qFXfTdO1yvW6DmUPfVLIJgDHfkSd5yimZWvBMrlP/ow=", + "lastModified": 1745983288, + "narHash": "sha256-XUNZDucHnw5SpTG3iJ8xrc6vGdVaP/5jlWErVjOdl/4=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "1dd4328f82115887901a685ecd9fa6e1d1db2d0c", + "rev": "96d7adda80b8bfc06fc0669b68a40feb2339fa95", "type": "github" }, "original": { diff --git a/system/configuration.nix b/system/configuration.nix index d1f0db8..8a12cf6 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -28,6 +28,7 @@ in { ./user.nix ./wireshark.nix ./xserver.nix + ./virtualbox.nix ./zsh.nix nvidia diff --git a/system/virtualbox.nix b/system/virtualbox.nix new file mode 100644 index 0000000..27fd5fd --- /dev/null +++ b/system/virtualbox.nix @@ -0,0 +1,5 @@ +{...}: { + virtualisation.virtualbox.host = { + enable = true; + }; +} diff --git a/user/gpg.nix b/user/gpg.nix index 082eee6..207180f 100644 --- a/user/gpg.nix +++ b/user/gpg.nix @@ -4,6 +4,6 @@ enable = true; enableZshIntegration = true; sshKeys = ["2FF2BC110EEEEF8E569815ABD6AD80451B41E046"]; - pinentryPackage = pkgs.pinentry-curses; + pinentry.package = pkgs.pinentry-curses; }; } diff --git a/user/hyprland.nix b/user/hyprland.nix index 806357b..a984bac 100644 --- a/user/hyprland.nix +++ b/user/hyprland.nix @@ -10,8 +10,24 @@ rev = "c24b061f04bf8fc2079db9b63b5f370e67825da2"; hash = "sha256-ZkcOEaI9AaM/qMc9UBM29kKlUDsNXl5MFTxJmu4ATCA="; }; -in -{ + + bgScript = pkgs.writeShellScriptBin "backgrounds" '' + #!/bin/sh + + # waits for hyprpaper to initialize + sleep 0.5s + + wallpaper=$(shuf -e -n1 ${backgrounds}/*) + loaded_output=$(${pkgs.hyprland}/bin/hyprctl hyprpaper listloaded) + echo $wallpaper > $HOME/wallpaper.txt + if [[ $loaded_output != "no wallpapers loaded" ]]; then + ${pkgs.hyprland}/bin/hyprctl hyprpaper unload all + fi + ${pkgs.hyprland}/bin/hyprctl hyprpaper preload $wallpaper + wall_with_monitor=",''${wallpaper}" + ${pkgs.hyprland}/bin/hyprctl hyprpaper wallpaper $wall_with_monitor + ''; +in { imports = [ ./rofi.nix ./waybar.nix @@ -19,6 +35,7 @@ in home.packages = with pkgs; [ hyprpaper # using the hyprpaper service does not work :( + bgScript ]; xdg.configFile."hypr/hyprpaper.conf".text = ""; @@ -31,14 +48,14 @@ in exec-once = [ "hyprpaper &" "wl-paste --watch cliphist store" - "$HOME/pick_random_wallpaper.sh" + "backgrounds" ]; monitor = [ "eDP-1, 1920x1080@60, 0x0, 1" "HDMI-A-1, 1920x1080@60, 1920x0, 1" ]; - + input = { kb_layout = systemSettings.kbLayout; kb_options = "compose:rctrl"; @@ -80,16 +97,17 @@ in "$mod SHIFT, E, exit" "$mod, P, exec, rofi -show drun" "$mod, period, exec, rofi -show emoji" - "$mod, O, exec, $HOME/pick_random_wallpaper.sh" + "$mod, O, exec, backgrounds" "$mod, F, fullscreen" "$mod, D, exec, discord" "$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy" ", Print, exec, grimblast --freeze copysave area" + "$mod, Print, exec, grimblast --freeze copysave active" ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ", XF86MonBrightnessUp, exec, brightnessctl set +10%" - ", XF86MonBrightnessDown, exec, brightnessctl set 10%-" + ", XF86MonBrightnessUp, exec, brightnessctl set +10%" + ", XF86MonBrightnessDown, exec, brightnessctl set 10%-" "$mod, Space, togglefloating" "$mod, mouse_down, workspace, e+1" "$mod, mouse_up, workspace, e-1" -- 2.51.2