From 79c8e5061b284a6de3a1d7306f68559169b16c29 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 20 Mar 2026 11:28:20 -0500 Subject: [PATCH] test aurora --- flake.lock | 8 ++--- .../home-manager/dotfiles/hypr/main.conf | 10 +++--- .../home-manager/dotfiles/hypr/pyprland.toml | 6 ++-- .../nathan/home-manager/packages/default.nix | 2 +- .../home-manager/packages/scripts/default.nix | 31 ++++++++++--------- .../{hyprlock => hypridle}/default.nix | 8 ++--- .../programs/hyprland/default.nix | 12 +++---- .../programs/terminal/kitty/default.nix | 2 ++ .../terminal/{lf => yazi}/default.nix | 2 +- .../programs/terminal/zsh/default.nix | 4 +-- system/programs/hyprland/default.nix | 21 ------------- system/services/aurora-greeter/default.nix | 21 +++++++++++++ 12 files changed, 63 insertions(+), 64 deletions(-) rename homes/nathan/home-manager/programs/{hyprlock => hypridle}/default.nix (90%) rename homes/nathan/home-manager/programs/terminal/{lf => yazi}/default.nix (82%) create mode 100644 system/services/aurora-greeter/default.nix diff --git a/flake.lock b/flake.lock index 6d9b396..2e99c00 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1772926598, - "narHash": "sha256-G5lylEQPMCiLmQBM2XtJ3MRfzj+N4D2+u9Ftt2WumUo=", + "lastModified": 1774023962, + "narHash": "sha256-dDQLJOXdUvS+ENvalQXb5J0Fek96iYCk2EzGRp1KUSM=", "ref": "refs/heads/master", - "rev": "95043f84e4210d4028efc348112107d19f3c0258", - "revCount": 7, + "rev": "8c912861e30513d5e4c2e2e241c4a987c4f8a6ee", + "revCount": 12, "type": "git", "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora" }, diff --git a/homes/nathan/home-manager/dotfiles/hypr/main.conf b/homes/nathan/home-manager/dotfiles/hypr/main.conf index 8910700..19aeef8 100644 --- a/homes/nathan/home-manager/dotfiles/hypr/main.conf +++ b/homes/nathan/home-manager/dotfiles/hypr/main.conf @@ -127,7 +127,7 @@ bind = $mainMod, Q, killactive, bind = $mainMod, F, exec, thunar bind = $mainMod SHIFT, F, fullscreen -bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e lf +bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e yazi bind = $mainMod, Insert, exec, libreoffice @@ -263,10 +263,10 @@ windowrule = float on, match:class $kitty windowrule = $scratchpadsize, match:class $kitty windowrule = workspace special silent, match:class $kitty -$lf = ^(scratchpad-lf)$ -windowrule = float on, match:class $lf -windowrule = $scratchpadsize, match:class $lf -windowrule = workspace special silent, match:class $lf +$files = ^(scratchpad-files)$ +windowrule = float on, match:class $files +windowrule = $scratchpadsize, match:class $files +windowrule = workspace special silent, match:class $files $cal = ^(scratchpad-cal)$ windowrule = float on, match:class $cal diff --git a/homes/nathan/home-manager/dotfiles/hypr/pyprland.toml b/homes/nathan/home-manager/dotfiles/hypr/pyprland.toml index b79834c..c4d5245 100644 --- a/homes/nathan/home-manager/dotfiles/hypr/pyprland.toml +++ b/homes/nathan/home-manager/dotfiles/hypr/pyprland.toml @@ -3,11 +3,11 @@ "scratchpads" ] - [scratchpads.lf] + [scratchpads.files] animation = "fromTop" - command = "kitty --class scratchpad-lf lf ~" + command = "kitty --class scratchpad-files yazi ~" lazy = true - class = "scratchpad-lf" + class = "scratchpad-files" margin = 100 multi = true excludes = "*" diff --git a/homes/nathan/home-manager/packages/default.nix b/homes/nathan/home-manager/packages/default.nix index f5cca7b..ca9da8b 100644 --- a/homes/nathan/home-manager/packages/default.nix +++ b/homes/nathan/home-manager/packages/default.nix @@ -31,7 +31,7 @@ rsync curl - (python313.withPackages (ps: with ps; [ + (python314.withPackages (ps: with ps; [ gpustat numpy matplotlib diff --git a/homes/nathan/home-manager/packages/scripts/default.nix b/homes/nathan/home-manager/packages/scripts/default.nix index f7ae83d..c0ef3c6 100644 --- a/homes/nathan/home-manager/packages/scripts/default.nix +++ b/homes/nathan/home-manager/packages/scripts/default.nix @@ -33,22 +33,23 @@ out=''${3:-/dev/null} if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then - yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/nathan/tmp.jpg >> ''$out - cp /tmp/nathan/tmp.jpg /tmp/nathan/tmp2.jpg - pidof mpvpaper && pkill mpvpaper - ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe >> ''$out - sleep 0.3 - hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop" - rm /tmp/nathan/tmp2.jpg + yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/nathan/tmp.jpg >> ''$out + cp /tmp/nathan/tmp.jpg /tmp/nathan/tmp2.jpg + pidof mpvpaper && pkill mpvpaper + ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe >> ''$out + sleep 0.4 + hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop" + rm /tmp/nathan/tmp2.jpg else + yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" /tmp/nathan/tmp.jpg >> ''$out pidof mpvpaper && pkill mpvpaper - hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe" >> ''$out - fi + hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe" >> ''$out + fi - changeColors "''$img" "''$2" >> ''$out - '') + changeColors "''$img" "''$2" >> ''$out + '') - (pkgs.writeShellScriptBin "changeColors" '' + (pkgs.writeShellScriptBin "changeColors" '' img=''$(realpath "''$1") alpha=''${2:-70} @@ -66,9 +67,9 @@ fi colorPrefix - '') + '') - (pkgs.writeShellScriptBin "colorPrefix" '' + (pkgs.writeShellScriptBin "colorPrefix" '' pidof firefox > /dev/null && ${pkgs.pywalfox-native}/bin/pywalfox update & pidof kitty > /dev/null && pkill -USR1 kitty pidof cava > /dev/null && pkill -USR1 cava @@ -77,7 +78,7 @@ done eval "''$@" - '') + '') (pkgs.writeShellScriptBin "onSystemStart" '' diff --git a/homes/nathan/home-manager/programs/hyprlock/default.nix b/homes/nathan/home-manager/programs/hypridle/default.nix similarity index 90% rename from homes/nathan/home-manager/programs/hyprlock/default.nix rename to homes/nathan/home-manager/programs/hypridle/default.nix index 39fddfa..3ade26a 100644 --- a/homes/nathan/home-manager/programs/hyprlock/default.nix +++ b/homes/nathan/home-manager/programs/hypridle/default.nix @@ -2,16 +2,12 @@ flake.homeModules.nathan = { config, lib, pkgs, ... }: { - options.homeconfig.hyprlock.enable = lib.options.mkOption { + options.homeconfig.hypridle.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.homeconfig.hyprlock.enable { - - programs.hyprlock = { - enable = true; - }; + config = lib.mkIf config.homeconfig.hypridle.enable { services.hypridle = { enable = true; diff --git a/homes/nathan/home-manager/programs/hyprland/default.nix b/homes/nathan/home-manager/programs/hyprland/default.nix index a5d3742..0464e1e 100644 --- a/homes/nathan/home-manager/programs/hyprland/default.nix +++ b/homes/nathan/home-manager/programs/hyprland/default.nix @@ -20,13 +20,13 @@ home.activation.extraHyprFile = lib.hm.dag.entryAfter ["writeBoundary"] '' if [[ ! -f ${config.home.homeDirectory}/.config/hypr/otf.conf ]]; then touch ${config.home.homeDirectory}/.config/hypr/otf.conf - fi + fi - if [[ ! -f ${config.home.homeDirectory}/.config/background ]]; then - cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ${config.home.homeDirectory}/.config/background - chmod 600 ${config.home.homeDirectory}/.config/background - fi - ''; + if [[ ! -f ${config.home.homeDirectory}/.config/background ]]; then + cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ${config.home.homeDirectory}/.config/background + chmod 600 ${config.home.homeDirectory}/.config/background + fi + ''; wayland.windowManager.hyprland = { diff --git a/homes/nathan/home-manager/programs/terminal/kitty/default.nix b/homes/nathan/home-manager/programs/terminal/kitty/default.nix index 27d5af2..2202920 100644 --- a/homes/nathan/home-manager/programs/terminal/kitty/default.nix +++ b/homes/nathan/home-manager/programs/terminal/kitty/default.nix @@ -29,6 +29,8 @@ map ctrl+tab next_tab map ctrl+shift+tab previous_tab + allow_remote_control yes + ''; }; }; diff --git a/homes/nathan/home-manager/programs/terminal/lf/default.nix b/homes/nathan/home-manager/programs/terminal/yazi/default.nix similarity index 82% rename from homes/nathan/home-manager/programs/terminal/lf/default.nix rename to homes/nathan/home-manager/programs/terminal/yazi/default.nix index 14814d0..e31d3d9 100644 --- a/homes/nathan/home-manager/programs/terminal/lf/default.nix +++ b/homes/nathan/home-manager/programs/terminal/yazi/default.nix @@ -2,7 +2,7 @@ flake.homeModules.nathan = { ... }: { config = { - programs.lf = { + programs.yazi = { enable = true; }; }; diff --git a/homes/nathan/home-manager/programs/terminal/zsh/default.nix b/homes/nathan/home-manager/programs/terminal/zsh/default.nix index 2bf4776..2a237d0 100644 --- a/homes/nathan/home-manager/programs/terminal/zsh/default.nix +++ b/homes/nathan/home-manager/programs/terminal/zsh/default.nix @@ -25,8 +25,8 @@ vi = "nvim"; vim = "nvim"; - python = "python3.13"; - python3 = "python3.13"; + python = "python3.14"; + python3 = "python3.14"; }; history = { diff --git a/system/programs/hyprland/default.nix b/system/programs/hyprland/default.nix index a9dac8e..f3f2a04 100644 --- a/system/programs/hyprland/default.nix +++ b/system/programs/hyprland/default.nix @@ -29,27 +29,6 @@ portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland; }; - - services = { - upower.enable = true; - gvfs.enable = true; - power-profiles-daemon.enable = true; - }; - - environment.systemPackages = with pkgs; [ - bluez - bluez-tools - libgtop - dart-sass - wl-clipboard - gtksourceview - libsoup_3 - brightnessctl - swww - hyprpicker - hyprsunset - wf-recorder - ]; }; }; } diff --git a/system/services/aurora-greeter/default.nix b/system/services/aurora-greeter/default.nix new file mode 100644 index 0000000..3045692 --- /dev/null +++ b/system/services/aurora-greeter/default.nix @@ -0,0 +1,21 @@ +{ inputs, ... }: { + + flake.nixosModules.default = { config, lib, pkgs, ... }: { + + imports = [ + inputs.aurora.nixosModules.default + ]; + + options.sysconfig.services.aurora-greeter.enable = lib.mkOption { + type = lib.types.bool; + default = false; + }; + + config = lib.mkIf config.sysconfig.services.aurora-greeter.enable { + + services.aurora-greeter = { + enable = false; + }; + }; + }; +}