diff --git a/.config/eww/eww b/.config/eww/eww deleted file mode 120000 index 6d2bb0a..0000000 --- a/.config/eww/eww +++ /dev/null @@ -1 +0,0 @@ -eww \ No newline at end of file diff --git a/.config/eww/scripts/workspace b/.config/eww/scripts/workspace index bfd6221..c40f04b 100755 --- a/.config/eww/scripts/workspace +++ b/.config/eww/scripts/workspace @@ -9,7 +9,7 @@ for num in $(hyprctl workspaces | grep ID | awk '{print $3}'); do done #initial check for focused workspace -for num in $(hyprctl monitors | grep -B 4 "focused: yes" | awk 'NR==1{print $3}'); do +for num in $(hyprctl monitors | grep -B 5 "focused: yes" | awk 'NR==1{print $3}'); do export f"$num"="$num" export fnum=f"$num" export mon=$(hyprctl monitors | grep -B 2 "\($num\)" | awk 'NR==1{print $2}') diff --git a/.config/tridactyl/tridactylrc b/.config/tridactyl/tridactylrc index d20b979..35e770c 100644 --- a/.config/tridactyl/tridactylrc +++ b/.config/tridactyl/tridactylrc @@ -43,6 +43,9 @@ autocontain -s office.com work autocontain -s microsoftonline.com work autocontain -s microsoft.com work autocontain -s live.com work +autocontain -s amazon.com shopping +autocontain -s newegg.com shopping +autocontain -s ebay.com shopping "" Quickmarks set quickmark od https://odysee.com/$/following diff --git a/eww/geticons b/eww/geticons deleted file mode 160000 index 322fba4..0000000 --- a/eww/geticons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 322fba4d3641bfa0ccf72d051e56840508fc5b0d diff --git a/eww/scripts/geticons b/eww/scripts/geticons deleted file mode 100755 index 669d2d9..0000000 Binary files a/eww/scripts/geticons and /dev/null differ diff --git a/home/home.nix b/home/home.nix index 5b9cc85..1059b20 100644 --- a/home/home.nix +++ b/home/home.nix @@ -593,9 +593,10 @@ window#waybar > box { programs.nushell = { enable = true; + package = pkgs.nushellFull; shellAliases = { # ls = "exa -l"; - la = "exa -la"; + la = "ls -la"; mpf = "mpv --profile=fast"; mps = "mpv --profile=slow"; ec = "emacsclient -t"; @@ -610,18 +611,27 @@ window#waybar > box { ytd = "yt-dlp -o '~/Videos/%(title)s.%(ext)s'"; }; extraConfig = '' - let-env config = { + $env.config = { show_banner: false } ''; + environmentVariables = { + EDITOR = "emacsclient -t"; + }; }; home.file.".config/dunst" = { source = ../.config/dunst; }; - programs.direnv.enable = true; - programs.direnv.nix-direnv.enable = true; + services.pueue.enable = true; + + programs.atuin.enable = true; + + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; # programs.qutebrowser.enable = true; home.file.".config/qutebrowser/config.py" = { @@ -705,6 +715,7 @@ window#waybar > box { programs.starship = { enable = true; + enableNushellIntegration = true; enableBashIntegration = true; settings = { format = '' diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 20e17d3..c020a18 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -210,7 +210,7 @@ in binde = , XF86MonBrightnessUp, exec, brightnessctl s +10% binde = , XF86MonBrightnessDown, exec, brightnessctl s 10%- - bind=SUPERSHIFT,g,exec,bar.sh + bind=SUPERSHIFT,g,exec,eww.sh bind=SUPERALT,n,exec,eww update rightside=true bindm=SUPER,mouse:272,movewindow diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index 0e5840f..19c04c3 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -18,6 +18,7 @@ binutils podman-compose exa + nushellFull # img2pdf yt-dlp bat