From c6a11c1d79af5061693a6f3ecdfa80154c0f2d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 10 Feb 2026 22:02:34 +0100 Subject: [PATCH] hold overlays correctly --- configs/applicative.nix | 36 +++------------------------- configs/default.nix | 1 - configs/editor.nix | 9 ------- configs/git.nix | 15 ------------ configs/graphical/default.nix | 3 --- configs/graphical/home-manager.nix | 22 +++-------------- flake.lock | 8 +++---- flake.nix | 26 +++++++++++++++----- packages/applicative-wallpaper.nix | 38 ++++++++++++++++++++++++++++++ 9 files changed, 68 insertions(+), 90 deletions(-) delete mode 100644 configs/git.nix create mode 100644 packages/applicative-wallpaper.nix diff --git a/configs/applicative.nix b/configs/applicative.nix index d6f0f21..7b52a97 100644 --- a/configs/applicative.nix +++ b/configs/applicative.nix @@ -20,39 +20,9 @@ nixpkgs.overlays = [ (final: prev: { - niphas-wallpaper = - let - backgroundColor = config.lib.stylix.colors.withHashtag.base06; - foregroundColor = config.lib.stylix.colors.withHashtag.base01; - width = 1920; - height = 1080; - - svgUrl = "https://applicative.systems/_astro/logo-full.D8zRvqBZ.svg"; - logoSvg = prev.fetchurl { - url = svgUrl; - hash = "sha256-qXDIEZsAPn4eUJ3kb5U6L3PMUCtWGYqhqyIaBt7FntE="; - }; - in - prev.runCommand "applicative-wallpaper.png" - { - nativeBuildInputs = [ prev.imagemagick ]; - } - '' - # 1. We use -background to set the canvas color - # 2. We use -fuzz and -opaque to replace the logo's internal colors - # 3. We use -gravity and -extent to center it on a wallpaper-sized canvas - - convert \ - -background none \ - -density 300 \ - "${logoSvg}" \ - -fuzz 100% -fill "${foregroundColor}" -opaque black \ - -resize 800x800 \ - -gravity center \ - -background "${backgroundColor}" \ - -extent ${toString width}x${toString height} \ - $out - ''; + niphas-wallpaper = prev.callPackage ../packages/applicative-wallpaper.nix { + inherit (config.lib.stylix) colors; + }; }) ]; diff --git a/configs/default.nix b/configs/default.nix index 5583e40..f598ebe 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -168,7 +168,6 @@ in ./clipboard.nix ./cloud.nix ./fonts.nix - ./git.nix ./hledger.nix ./htop.nix ./uni.nix diff --git a/configs/editor.nix b/configs/editor.nix index 396c90b..7e6058a 100644 --- a/configs/editor.nix +++ b/configs/editor.nix @@ -30,15 +30,6 @@ }; }; - nixpkgs.overlays = [ - (final: prev: { - niphas-editor = prev.niphas-editor.override { - withCopilot = true; - colorscheme = "gruvbox-dark-medium"; - }; - }) - ]; - environment.systemPackages = [ pkgs.vim-typewriter pkgs.dawn-editor diff --git a/configs/git.nix b/configs/git.nix deleted file mode 100644 index 103b343..0000000 --- a/configs/git.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - pkgs, - lib, - ... -}: -{ - home-manager.users.me = { - programs.git = { - enable = true; - ignores = pkgs.lib.niveum.ignorePaths; - settings.user.name = pkgs.lib.niveum.kieran.name; - settings.user.email = pkgs.lib.niveum.kieran.email; - }; - }; -} diff --git a/configs/graphical/default.nix b/configs/graphical/default.nix index e74d152..c9b5c74 100644 --- a/configs/graphical/default.nix +++ b/configs/graphical/default.nix @@ -4,9 +4,6 @@ config, ... }: -let - stylixColors = config.lib.stylix.colors; -in { programs.hyprland = { enable = true; diff --git a/configs/graphical/home-manager.nix b/configs/graphical/home-manager.nix index 12630ab..9904da5 100644 --- a/configs/graphical/home-manager.nix +++ b/configs/graphical/home-manager.nix @@ -134,8 +134,6 @@ in settings.default-timeout = 10 * 1000; }; - services.hyprsunset.enable = true; - programs.ashell = { enable = true; settings = { @@ -197,15 +195,6 @@ in }; }; - services.hyprpaper = { - enable = true; - settings = { - ipc = "on"; - splash = false; - preload = [ "${config.users.users.me.home}/.cache/wallpaper/wallpaper" ]; - }; - }; - services.hypridle = { enable = true; settings = { @@ -263,10 +252,8 @@ in "QT_QPA_PLATFORM=wayland" "GDK_BACKEND=wayland" "NIXOS_OZONE_WL=1" - "HYPRSHOT_DIR=${config.home-manager.users.me.xdg.userDirs.download}/screenshots" ]; permission = [ - "${lib.getExe pkgs.hyprshot}, screencopy, allow" "${pkgs.xdg-desktop-portal-hyprland}/libexec/.xdg-desktop-portal-hyprland-wrapped, screencopy, allow" ]; monitor = [ @@ -279,8 +266,8 @@ in (lib.getExe pkgs.ashell) "hyprctl dispatch exec \"[workspace special:${language.obsidian} silent] obsidian\"" "${lib.getExe' pkgs.wl-clipboard "wl-paste"} -t text --watch ${lib.getExe pkgs.clipman} store" - # (lib.getExe pkgs.hyprsunset) - # (lib.getExe pkgs.hyprpaper) + (lib.getExe pkgs.hyprsunset) + (lib.getExe pkgs.hyprpaper) ]; device = [ @@ -354,8 +341,7 @@ in ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" ",XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+" ",XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-" - ", Print, exec, ${lib.getExe pkgs.hyprshot} -m region --clipboard-only" - "${mod}, Print, exec, ${lib.getExe pkgs.hyprshot} -m region" + ", Print, exec, ${lib.getExe pkgs.niphas-screenshot} -m region --clipboard-only" ]; bindl = [ ", XF86AudioNext, exec, playerctl next" @@ -382,8 +368,6 @@ in "${mod}, l, movefocus, r" "${mod}, k, movefocus, u" "${mod}, j, movefocus, d" - "${mod}, F9, exec, hyprctl hyprsunset temperature -1000" - "${mod}, F10, exec, hyprctl hyprsunset temperature +1000" # reset color temperature "${mod}, F12, exec, ${klem}/bin/klem" "${mod} SHIFT, W, exec, hyprlock" diff --git a/flake.lock b/flake.lock index 1d551a8..f72a9e7 100644 --- a/flake.lock +++ b/flake.lock @@ -454,11 +454,11 @@ "wrappers": "wrappers" }, "locked": { - "lastModified": 1770416948, - "narHash": "sha256-gPBY6l691Kd0GuKS0Nu23+FmydfwfGYzpeH45S8mchQ=", + "lastModified": 1770756688, + "narHash": "sha256-raCwOTt5xT7J1ysxdGrmBva6OVrvjf47EgVLi5B5R5o=", "ref": "refs/heads/master", - "rev": "da68e328a3143fa6f7980a22c8c51c81de3fa52e", - "revCount": 35, + "rev": "86bf2150a7cabd225149f35c0ff57576af6ded44", + "revCount": 38, "type": "git", "url": "https://code.kmein.de/kfm/niphas" }, diff --git a/flake.nix b/flake.nix index 8c01f9c..9c3fe4e 100644 --- a/flake.nix +++ b/flake.nix @@ -366,12 +366,25 @@ let profiles.default = [ { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } - { - nixpkgs.overlays = [ - self.overlays.default - niphas.overlays.default - ]; - } + { + nixpkgs.overlays = [ + self.overlays.default + niphas.overlays.default + (final: prev: { + niphas-git = + (prev.niphas-git.passthru.configuration.apply { + settings = { + user.name = prev.lib.niveum.kieran.name; + user.email = prev.lib.niveum.kieran.email; + }; + }).wrapper; + niphas-editor = prev.niphas-editor.override { + withCopilot = true; + colorscheme = "base16-gruvbox-dark-medium"; + }; + }) + ]; + } { system.autoUpgrade = { enable = true; @@ -490,6 +503,7 @@ }; fatteh = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = { inherit self; }; modules = profiles.default ++ profiles.desktop diff --git a/packages/applicative-wallpaper.nix b/packages/applicative-wallpaper.nix new file mode 100644 index 0000000..1a67f10 --- /dev/null +++ b/packages/applicative-wallpaper.nix @@ -0,0 +1,38 @@ +{ + runCommand, + fetchurl, + imagemagick, + colors, +}: +let + backgroundColor = colors.withHashtag.base06; + foregroundColor = colors.withHashtag.base01; + width = 1920; + height = 1080; + + svgUrl = "https://applicative.systems/_astro/logo-full.D8zRvqBZ.svg"; + logoSvg = fetchurl { + url = svgUrl; + hash = "sha256-qXDIEZsAPn4eUJ3kb5U6L3PMUCtWGYqhqyIaBt7FntE="; + }; +in +runCommand "applicative-wallpaper.png" + { + nativeBuildInputs = [ imagemagick ]; + } + '' + # 1. We use -background to set the canvas color + # 2. We use -fuzz and -opaque to replace the logo's internal colors + # 3. We use -gravity and -extent to center it on a wallpaper-sized canvas + + convert \ + -background none \ + -density 300 \ + "${logoSvg}" \ + -fuzz 100% -fill "${foregroundColor}" -opaque black \ + -resize 800x800 \ + -gravity center \ + -background "${backgroundColor}" \ + -extent ${toString width}x${toString height} \ + $out + ''