From 0656bd7a170270188b6535c94a2e7cc499ae6966 Mon Sep 17 00:00:00 2001 From: joy Date: Fri, 11 Oct 2024 00:39:34 +0200 Subject: [PATCH] eeeh some changes --- flake.lock | 12 +++++----- modules/programs/home/cmus/default.nix | 1 - modules/programs/home/mpv/default.nix | 1 - modules/programs/home/zsh/default.nix | 2 +- modules/programs/norm/misc/default.nix | 31 +++++++++++--------------- modules/wm/hyprland/default.nix | 2 +- 6 files changed, 21 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 7546fb8..acd2d74 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1728533014, - "narHash": "sha256-fDu4kCTw82r79DpDRjoX9sh2INwZ5l9Alv1kYXVtyHY=", + "lastModified": 1728596790, + "narHash": "sha256-RTWhRczv04uFJzGf6thqvJ90sL3dTX9hoteu0VGMcB4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "a19c9b6e6fd1d4d82263963345cd8e672dc67aff", + "rev": "610a9c92c573bf57959ffd371cb4921dd681b272", "type": "gitlab" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1728577730, - "narHash": "sha256-HsOIR+Zz/q/MGFk88Wd5VZHuTKc9YKXWFTZ+FieRry8=", + "lastModified": 1728597384, + "narHash": "sha256-vMAPqOkEgXlTSFXtb9wCNQrsNp9QZu/nZ8D9UtHgSYc=", "owner": "joygnu", "repo": "home-manager", - "rev": "2cc02962babff4d1e19ad7954e8b4ac7ed579217", + "rev": "18f8d4d0d39f36efb4fbc036cff168ef28b5f8f2", "type": "github" }, "original": { diff --git a/modules/programs/home/cmus/default.nix b/modules/programs/home/cmus/default.nix index e48c527..7cedc81 100644 --- a/modules/programs/home/cmus/default.nix +++ b/modules/programs/home/cmus/default.nix @@ -1,6 +1,5 @@ { programs.cmus = { enable = true; - theme = "gruvbox"; }; } diff --git a/modules/programs/home/mpv/default.nix b/modules/programs/home/mpv/default.nix index c1d1943..ce1f118 100644 --- a/modules/programs/home/mpv/default.nix +++ b/modules/programs/home/mpv/default.nix @@ -13,7 +13,6 @@ scripts = with pkgs.mpvScripts; [ mpris sponsorblock - # sponsorblock ]; }; } diff --git a/modules/programs/home/zsh/default.nix b/modules/programs/home/zsh/default.nix index e3598c5..0697e18 100644 --- a/modules/programs/home/zsh/default.nix +++ b/modules/programs/home/zsh/default.nix @@ -11,7 +11,7 @@ ls = "${pkgs.eza}/bin/eza --icons -a --group-directories-first"; v = "hx"; cat = "bat"; - lg = "lazygit"; + lg = "${pkgs.lazygit}/bin/lazygit"; ser = "ssh root@joygnu.org"; ip = "sh ~/nix/modules/programs/home/zsh/scripts/ip.sh"; rb = "sh ~/nix/modules/programs/home/zsh/scripts/rebuild.sh"; diff --git a/modules/programs/norm/misc/default.nix b/modules/programs/norm/misc/default.nix index a843148..6f56b6a 100644 --- a/modules/programs/norm/misc/default.nix +++ b/modules/programs/norm/misc/default.nix @@ -1,11 +1,21 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ # cli - cmus + git htop ncdu - git - zoxide + libnotify + brightnessctl + ffmpeg + lm_sensors + sent + texliveFull + alejandra + tree + zip + unzip + yt-dlp + wget fastfetch cmatrix cava @@ -14,20 +24,6 @@ sl cbonsai pipes - libnotify - brightnessctl - lazygit - ffmpeg - lm_sensors - sent - texliveFull - alejandra - tmux - tree - zip - unzip - yt-dlp - wget #gui imv keepassxc @@ -37,7 +33,6 @@ boxbuddy transmission_4-gtk kdePackages.kdenlive - networkmanagerapplet ferdium drawio obs-studio diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index eec2aae..9b05c1c 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -83,6 +83,7 @@ "$mod, O, exec, sh $sciPath/mpv.sh" "$mod+Shift, TAB,hyprexpo:expo, toggleoverview" "$mod, B, exec, rofimoji" + "$mod, F, exec, alacritty -e hx" # controls "$mod, Q, killactive" "$mod, W, togglefloating" @@ -94,7 +95,6 @@ "$mod, up, exec, sh $sciPath/volume.sh -i" "$mod, down, exec, sh $sciPath/volume.sh -d" "$mod, P, exec, hyprctl dispatch togglefloating active; hyprctl dispatch pin active" - # cmus "$mod, D, exec, sh $sciPath/cmus.sh" "$mod, space, exec, playerctl play-pause"