diff --git a/hypr/eww/eww.yuck b/hypr/eww/eww.yuck index bed4afc..0f22b3c 100644 --- a/hypr/eww/eww.yuck +++ b/hypr/eww/eww.yuck @@ -67,4 +67,4 @@ :stacking "fg" :exclusive true :wm-ignore false - (bar)) +(bar)) diff --git a/hypr/rules/patch/gen.conf b/hypr/rules/patch/gen.conf index 74f5acd..2a6d3a2 100644 --- a/hypr/rules/patch/gen.conf +++ b/hypr/rules/patch/gen.conf @@ -1,4 +1,5 @@ # Fix dragging issues with XWayland windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 -exec-once = swww img $DOTFILES_DIR/img/escapism.gif --transition-step 255 +exec-once = swww img $DOTFILES_DIR/img/desktops/city-balcony.gif --transition-step 255 +# fave is escapism, move back later exec-once = mullvad disconnect diff --git a/img/bloom-circle.png b/img/bloom-circle.png deleted file mode 100644 index 16be4e4..0000000 Binary files a/img/bloom-circle.png and /dev/null differ diff --git a/img/bloom-circle.svg b/img/bloom-circle.svg deleted file mode 100644 index 5cda226..0000000 --- a/img/bloom-circle.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/bloom.png b/img/bloom.png deleted file mode 100644 index 2f0ed0c..0000000 Binary files a/img/bloom.png and /dev/null differ diff --git a/img/bloom.svg b/img/bloom.svg deleted file mode 100644 index 9932072..0000000 --- a/img/bloom.svg +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/blossom.gif b/img/desktops/blossom.gif similarity index 100% rename from img/blossom.gif rename to img/desktops/blossom.gif diff --git a/img/city_balcony.gif b/img/desktops/city-balcony.gif similarity index 100% rename from img/city_balcony.gif rename to img/desktops/city-balcony.gif diff --git a/img/city.gif b/img/desktops/city.gif similarity index 100% rename from img/city.gif rename to img/desktops/city.gif diff --git a/img/cityscape.gif b/img/desktops/cityscape.gif similarity index 100% rename from img/cityscape.gif rename to img/desktops/cityscape.gif diff --git a/img/coffeeshop-night.gif b/img/desktops/coffeeshop-night.gif similarity index 100% rename from img/coffeeshop-night.gif rename to img/desktops/coffeeshop-night.gif diff --git a/img/cybercity.gif b/img/desktops/cybercity.gif similarity index 100% rename from img/cybercity.gif rename to img/desktops/cybercity.gif diff --git a/img/escapism.gif b/img/desktops/escapism.gif similarity index 100% rename from img/escapism.gif rename to img/desktops/escapism.gif diff --git a/img/fairy_pond.gif b/img/desktops/fairy_pond.gif similarity index 100% rename from img/fairy_pond.gif rename to img/desktops/fairy_pond.gif diff --git a/img/flower_mountains.gif b/img/desktops/flower_mountains.gif similarity index 100% rename from img/flower_mountains.gif rename to img/desktops/flower_mountains.gif diff --git a/img/gogh_fish.gif b/img/desktops/gogh_fish.gif similarity index 100% rename from img/gogh_fish.gif rename to img/desktops/gogh_fish.gif diff --git a/img/guitar_wastes.gif b/img/desktops/guitar_wastes.gif similarity index 100% rename from img/guitar_wastes.gif rename to img/desktops/guitar_wastes.gif diff --git a/img/haunted.gif b/img/desktops/haunted.gif similarity index 100% rename from img/haunted.gif rename to img/desktops/haunted.gif diff --git a/img/heartland_tree.gif b/img/desktops/heartland_tree.gif similarity index 100% rename from img/heartland_tree.gif rename to img/desktops/heartland_tree.gif diff --git a/img/hideaway.gif b/img/desktops/hideaway.gif similarity index 100% rename from img/hideaway.gif rename to img/desktops/hideaway.gif diff --git a/img/lab.gif b/img/desktops/lab.gif similarity index 100% rename from img/lab.gif rename to img/desktops/lab.gif diff --git a/img/moon.gif b/img/desktops/moon.gif similarity index 100% rename from img/moon.gif rename to img/desktops/moon.gif diff --git a/img/nighttime_alley.gif b/img/desktops/nighttime_alley.gif similarity index 100% rename from img/nighttime_alley.gif rename to img/desktops/nighttime_alley.gif diff --git a/img/oil.gif b/img/desktops/oil.gif similarity index 100% rename from img/oil.gif rename to img/desktops/oil.gif diff --git a/img/painted_meadow.gif b/img/desktops/painted_meadow.gif similarity index 100% rename from img/painted_meadow.gif rename to img/desktops/painted_meadow.gif diff --git a/img/polluted.gif b/img/desktops/polluted.gif similarity index 100% rename from img/polluted.gif rename to img/desktops/polluted.gif diff --git a/img/space_city_view.gif b/img/desktops/space_city_view.gif similarity index 100% rename from img/space_city_view.gif rename to img/desktops/space_city_view.gif diff --git a/img/space_portal.gif b/img/desktops/space_portal.gif similarity index 100% rename from img/space_portal.gif rename to img/desktops/space_portal.gif diff --git a/img/spooky.gif b/img/desktops/spooky.gif similarity index 100% rename from img/spooky.gif rename to img/desktops/spooky.gif diff --git a/img/still_on.gif b/img/desktops/still_on.gif similarity index 100% rename from img/still_on.gif rename to img/desktops/still_on.gif diff --git a/img/street.gif b/img/desktops/street.gif similarity index 100% rename from img/street.gif rename to img/desktops/street.gif diff --git a/img/summoned.gif b/img/desktops/summoned.gif similarity index 100% rename from img/summoned.gif rename to img/desktops/summoned.gif diff --git a/img/sunset_lake.gif b/img/desktops/sunset_lake.gif similarity index 100% rename from img/sunset_lake.gif rename to img/desktops/sunset_lake.gif diff --git a/img/waterfall.gif b/img/desktops/waterfall.gif similarity index 100% rename from img/waterfall.gif rename to img/desktops/waterfall.gif diff --git a/img/yuri_evening_sunset.gif b/img/desktops/yuri_evening_sunset.gif similarity index 100% rename from img/yuri_evening_sunset.gif rename to img/desktops/yuri_evening_sunset.gif diff --git a/img/ml_logo.svg b/img/ml_logo.svg deleted file mode 100644 index de3c238..0000000 --- a/img/ml_logo.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - MAYDAY - LABS - - - diff --git a/modules/base.nix b/modules/base.nix index d21ee2e..b9401f2 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -3,8 +3,6 @@ environment.systemPackages = with pkgs; [ bash - bc - bashly git linux-firmware kitty @@ -15,24 +13,23 @@ wget unzip zip - kdePackages.kate - nemo-with-extensions - nemo-fileroller - nemo-preview ]; fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk-sans noto-fonts-color-emoji + noto-fonts-monochrome-emoji + libertine liberation_ttf - fira-code fira-code-symbols - nerd-fonts.shure-tech-mono - nerd-fonts.fira-code mplus-outline-fonts.githubRelease dina-font proggyfonts garamond-libre + nerd-fonts = [ + noto + shure-tech-mono + fira-code + dejavu-sans-mono + ] ]; hardware.graphics.enable = true; diff --git a/modules/config/yazi.nix b/modules/config/yazi.nix deleted file mode 100644 index bba21f7..0000000 --- a/modules/config/yazi.nix +++ /dev/null @@ -1,52 +0,0 @@ -# Tools -{ inputs, config, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - yaziPlugins.git - yaziPlugins.sudo - yaziPlugins.mount - yaziPlugins.chmod - yaziPlugins.restore - ]; - - programs.yazi = { - enable = true; - settings.yazi = { - mgr = { - ratio = [ - 3 - 5 - 5 - ]; - show-hidden = "true"; - sort-by = "natural"; - sort-dir-first = "true"; - sort-translit = "true"; - }; - preview = { - wrap = "yes"; - }; - }; - settings.theme = { - mgr = { - cwd = { - fg = "#c0bb6e"; - bg = "#1c2426"; - }; - hovered = { - reversed = true; - }; - preview-hovered = { - reversed = true; - }; - }; - mode = { - normal-main = { - fg = "#c0bb6e"; - bg = "#1c2426"; - }; - }; - }; - }; - -} diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 0c09aa2..482fc92 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -1,7 +1,6 @@ { inputs, config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - hyprland mako libnotify hyprland-qt-support @@ -12,7 +11,7 @@ hyprshot upower hyprcursor - jq # may break, stealing from stable + jq brightnessctl hackneyed syspower @@ -24,6 +23,7 @@ ]; programs.hyprland.enable = true; +# programs.hyprlock.enable = true; programs.iio-hyprland.enable = true; qt = { diff --git a/modules/tools.nix b/modules/tools.nix index 733cbd8..13650d5 100644 --- a/modules/tools.nix +++ b/modules/tools.nix @@ -2,8 +2,6 @@ { inputs, config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - cargo - gradle gh dust ffmpeg @@ -13,24 +11,18 @@ wine yt-dlp deno - image-roll inkscape-with-extensions - # kapow - # uutils-coreutils-noprefix + viewnior libreoffice pinta speedcrunch - inputs.oxide_timer.packages.${pkgs.system}.default # imports morrigan's timer, oxide - ranger - pistol - metadata - mkvtoolnix-cli + inputs.oxide_timer.packages.${pkgs.system}.default # imports morrigan's timer ]; - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; [ - # Add any missing dynamic libraries for unpackaged programs here, - # NOT In environment.systemPackages - ]; +# programs.nix-ld.enable = true; +# programs.nix-ld.libraries = with pkgs; [ +# # Add any missing dynamic libraries for unpackaged programs here, +# # NOT In environment.systemPackages +# ]; }