chore: update

mobsenpai · May 4, 2024 · 23b72a4 · 23b72a4
1 parent 2882835
commit 23b72a4
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 93 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -3,22 +3,18 @@
 <h1 align="center">花 - Hana</h1>
 
 <p align="center">
-  <a href="#">
-    <img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png" title="Banner"/>
-  </a>
+  <a href="#"><img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png" alt="Banner"/></a>
 </p>
 
-<br>
-
 <p align="center">
-  <img src="https://github.com/mobsenpai/hana/actions/workflows/flake-check.yml/badge.svg" alt="Workflow Badge" height="20"/>
-  <img src="https://github.com/mobsenpai/hana/actions/workflows/fmt.yml/badge.svg" alt="Workflow Bagdge" height="20">
-  <img src="https://img.shields.io/github/license/mobsenpai/hana" alt="License Badge"  height="20"/>
+  <img src="https://github.com/mobsenpai/hana/actions/workflows/flake-check.yml/badge.svg" alt="Workflow Badge" />
+  <img src="https://github.com/mobsenpai/hana/actions/workflows/fmt.yml/badge.svg" alt="Workflow Bagdge" >
+  <img src="https://img.shields.io/github/license/mobsenpai/hana" alt="License Badge"/>
 </p>
 
 <br>
 
-<img src="https://github.com/mobsenpai/hana/assets/92603465/cadf9440-971d-4b99-8edd-2bd10832edf3" align="right" width="400px">
+<img src="https://github.com/mobsenpai/hana/assets/92603465/0577c6b8-46e4-4a0e-bacb-99f9128e9e16" alt="Showcase" align="right" width="390px">
 
 > [!NOTE]
 >
@@ -32,7 +28,7 @@
 
 ## :snowflake: About Hana
 
-Welcome to "花 - Hana", a repository showcasing my personal collection of dotfiles. These dotfiles are tailored for NixOS and Home-Manager, utilizing the power of [flakes](https://nixos.wiki/wiki/Flakes) and [flake-parts](https://github.com/hercules-ci/flake-parts) for optimal organization and efficiency.
+Welcome to "花 - Hana", a repository showcasing my personal collection of dotfiles. These dotfiles are tailored for NixOS and Home-Manager, utilizing the declarative power of nixos for optimal organization and efficiency.
 
 To explore the flake outputs and their functionalities, run:
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -13,9 +13,12 @@
     hypridle.url = "github:hyprwm/hypridle";
     hyprlock.url = "github:hyprwm/hyprlock";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";
 
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    hypridle.inputs.nixpkgs.follows = "nixpkgs";
+    hyprlock.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {...} @ inputs: {

diff --git a/modules/home-manager/bundles/desktop.nix b/modules/home-manager/bundles/desktop.nix
@@ -22,9 +22,5 @@
     home.packages = with pkgs; [
       appflowy
     ];
-
-    xdg.mimeApps.defaultApplications = {
-      "inode/directory" = "pcmanfm.desktop";
-    };
   };
 }
diff --git a/modules/home-manager/config/gtk.nix b/modules/home-manager/config/gtk.nix
@@ -9,8 +9,8 @@
     @define-color accent_bg_color ${xcolors.orange0};
     @define-color accent_fg_color ${xcolors.fg1};
 
-    @define-color destructive_color ${xcolors.aqua1};
-    @define-color destructive_bg_color ${xcolors.aqua0};
+    @define-color destructive_color ${xcolors.red1};
+    @define-color destructive_bg_color ${xcolors.red0};
     @define-color destructive_fg_color ${xcolors.fg1};
 
     @define-color success_color ${xcolors.green1};
@@ -19,7 +19,7 @@
 
     @define-color warning_color ${xcolors.yellow1};
     @define-color warning_bg_color ${xcolors.yellow0};
-    @define-color warning_fg_color ${xcolors.fg1};
+    @define-color warning_fg_color ${xcolors.bg0};
 
     @define-color error_color ${xcolors.red1};
     @define-color error_bg_color ${xcolors.red0};
@@ -28,26 +28,42 @@
     @define-color window_bg_color ${xcolors.bg0};
     @define-color window_fg_color ${xcolors.fg1};
 
-    @define-color view_bg_color ${xcolors.bg0};
+    @define-color view_bg_color ${xcolors.bg1};
     @define-color view_fg_color ${xcolors.fg1};
 
-    @define-color headerbar_bg_color ${xcolors.bg0};
+    @define-color headerbar_bg_color ${xcolors.bg1};
     @define-color headerbar_fg_color ${xcolors.fg1};
-    @define-color headerbar_border_color ${xcolors.fg1};
+    @define-color headerbar_border_color @headerbar_fg_color;
     @define-color headerbar_backdrop_color @window_bg_color;
     @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
+    @headerbar_darker_shade_color rgba(0, 0, 0, 0.9);
+
+    @define-color sidebar_bg_color ${xcolors.bg3};
+    @define-color sidebar_fg_color ${xcolors.fg1};
+    @define-color sidebar_backdrop_color ${xcolors.bg2};
+    @define-color sidebar_border_color rgba(0, 0, 0, 0.36);
+    @define-color sidebar_shade_color rgba(0, 0, 0, 0.25);
+
+    @define-color secondary_sidebar_bg_color ${xcolors.bg2};
+    @define-color secondary_sidebar_fg_color ${xcolors.fg1};
+    @define-color secondary_sidebar_backdrop_color ${xcolors.bg1};
+    @define-color secondary_sidebar_border_color rgba(0, 0, 0, 0.36);
+    @define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.25);
 
     @define-color card_bg_color rgba(255, 255, 255, 0.08);
     @define-color card_fg_color ${xcolors.fg1};
     @define-color card_shade_color rgba(0, 0, 0, 0.36);
 
+    @define-color thumbnail_bg_color ${xcolors.bg1};
+    @define-color thumbnail_fg_color ${xcolors.fg1};
+
     @define-color dialog_bg_color ${xcolors.bg1};
     @define-color dialog_fg_color ${xcolors.fg1};
 
     @define-color popover_bg_color ${xcolors.bg1};
     @define-color popover_fg_color ${xcolors.fg1};
 
-    @define-color shade_color rgba(0, 0, 0, 0.36);
+    @define-color shade_color rgba(0, 0, 0, 0.25);
     @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
   '';
 in {

diff --git a/modules/home-manager/hyprland/options.nix b/modules/home-manager/hyprland/options.nix
@@ -175,5 +175,9 @@
         createDirectories = true;
       };
     };
+
+    xdg.mimeApps.defaultApplications = {
+      "inode/directory" = "pcmanfm.desktop";
+    };
   };
 }
diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix
@@ -23,10 +23,10 @@
         };
 
         font = {
-          normal = {
-            family = "FiraMono Nerd Font";
-            style = "Regular";
-          };
+          bold.family = "FiraMono Nerd Font";
+          bold_italic.family = "FiraMono Nerd Font";
+          italic.family = "FiraMono Nerd Font";
+          normal.family = "FiraMono Nerd Font";
 
           size = 10;
         };

diff --git a/modules/home-manager/programs/bash.nix b/modules/home-manager/programs/bash.nix
@@ -14,7 +14,6 @@
     programs.bash = {
       enable = true;
       historyControl = ["erasedups" "ignorespace"];
-      historyFile = "${config.xdg.dataHome}/bash/bash_history";
       shellOptions = [
         "autocd"
         "cdspell"
@@ -40,11 +39,11 @@
       '';
 
       shellAliases = {
-        cat = "${pkgs.bat}/bin/bat --color=always --style=plain";
-        fcd = "cd $(${pkgs.fd}/bin/fd --type d | ${pkgs.skim}/bin/sk)";
+        cat = "${pkgs.bat}/bin/bat";
+        fcd = "cd $(${pkgs.fd}/bin/fd --type d | ${pkgs.fzf}/bin/fzf)";
         fm = "${pkgs.yazi}/bin/yazi";
         grep = "${pkgs.ripgrep}/bin/rg";
-        ls = "${pkgs.eza}/bin/eza -alh --icons --git --group-directories-first";
+        ls = "${pkgs.eza}/bin/eza --all --git --group-directories-first --header --icons --long";
         rm = "${pkgs.trash-cli}/bin/trash-put";
         ytmp3 = ''${pkgs.yt-dlp}/bin/yt-dlp -x --continue --add-metadata --embed-thumbnail --audio-format mp3 --audio-quality 0 --metadata-from-title="%(artist)s - %(title)s" --prefer-ffmpeg -o "%(title)s.%(ext)s"'';
       };

diff --git a/modules/home-manager/programs/utils.nix b/modules/home-manager/programs/utils.nix
@@ -11,13 +11,14 @@
   config = lib.mkIf config.myHome.utils.enable {
     home.packages = with pkgs; [
       bottom
+      cbonsai
       cmatrix
       curl
       fd
       file
       jq
       killall
-      neofetch
+      macchina
       ripgrep
       trash-cli
       unrar
@@ -33,21 +34,9 @@
     programs = {
       bat.enable = true;
       eza.enable = true;
-
-      dircolors = {
-        enable = true;
-        enableBashIntegration = true;
-      };
-
-      skim = {
-        enable = true;
-        enableBashIntegration = true;
-      };
-
-      zoxide = {
-        enable = true;
-        enableBashIntegration = true;
-      };
+      dircolors.enable = true;
+      fzf.enable = true;
+      zoxide.enable = true;
     };
   };
 }
diff --git a/modules/home-manager/programs/wofi.nix b/modules/home-manager/programs/wofi.nix
@@ -25,7 +25,7 @@
       style = with config.myHome.colorscheme; ''
         *{
           all: unset;
-          font-family: "Fira Mono Nerd Font";
+          font-family: "FiraMono Nerd Font";
           font-size: 10pt;
           font-weight: normal;
         }

diff --git a/modules/nixos/config/nix.nix b/modules/nixos/config/nix.nix
@@ -9,26 +9,27 @@
   };
 
   config = lib.mkIf config.myNixos.nix.enable {
+    nixpkgs = {
+      overlays = [
+        inputs.nur.overlay
+      ];
+
+      config.allowUnfree = true;
+    };
+
     nix = let
       flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
     in {
       settings = {
         experimental-features = ["nix-command" "flakes"];
         flake-registry = "";
+        nix-path = config.nix.nixPath;
       };
       channel.enable = false;
       registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
       nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
     };
 
-    nixpkgs = {
-      config.allowUnfree = true;
-
-      overlays = [
-        inputs.nur.overlay
-      ];
-    };
-
     system.stateVersion = "23.11";
   };
 }