Merge pull request #72 from redyf/dev

Dev
redyf · May 12, 2024 · 460774b · 460774b
2 parents 6a374fa + 4460a00
commit 460774b
Show file tree

Hide file tree

Showing 25 changed files with 506 additions and 1,082 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,9 +9,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hyprland.url = "github:hyprwm/hyprland";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     waybar-hyprland.url = "github:hyprwm/hyprland";
-    xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
     nur.url = "github:nix-community/NUR";
     Neve.url = "github:redyf/Neve";
     disko.url = "github:nix-community/disko";
@@ -22,11 +21,6 @@
       flake = false;
     };
 
-    berkeley-mono = {
-      url = "github:redyf/test";
-      flake = false;
-    };
-
     monolisa-script = {
       url = "github:redyf/test2";
       flake = false;
@@ -69,14 +63,38 @@
                 useUserPackages = true;
                 useGlobalPkgs = false;
                 extraSpecialArgs = {inherit inputs disko;};
-                users.redyf = ./home/desktop/home.nix;
+                users.redyf = ./home/redyf/home.nix;
               };
             }
             hyprland.nixosModules.default
-            {programs.hyprland.enable = true;}
             disko.nixosModules.disko
           ];
         };
+      # selene = nixpkgs.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   specialArgs = {
+      #     inherit
+      #       inputs
+      #       hyprland
+      #       disko
+      #       ;
+      #   };
+      #   modules = [
+      #     ./hosts/selene/configuration.nix
+      #     home-manager.nixosModules.home-manager
+      #     {
+      #       home-manager = {
+      #         useUserPackages = true;
+      #         useGlobalPkgs = false;
+      #         extraSpecialArgs = {inherit inputs disko;};
+      #         users.selene = ./home/selene/home.nix;
+      #       };
+      #     }
+      #     hyprland.nixosModules.default
+      #     {programs.hyprland.enable = false;}
+      #     disko.nixosModules.disko
+      #   ];
+      # };
     };
     devShells = forAllSystems (system: let
       pkgs = nixpkgsFor.${system};

diff --git a/home/redyf/cli-apps/fzf/default.nix b/home/redyf/cli-apps/fzf/default.nix
@@ -1,23 +1,49 @@
-_: {
+_: let
+  catppuccin = {
+    bg = "-1";
+    "bg+" = "-1";
+    hl = "#ed8796";
+    "hl+" = "#ed8796";
+    fg = "#cad3f5";
+    "fg+" = "#cad3f5";
+    header = "#ed8796";
+    info = "#c6a0f6";
+    pointer = "#f4dbd6";
+    marker = "#f4dbd6";
+    prompt = "#c6a0f6";
+    spinner = "#f4dbd6";
+  };
+  nord = {
+    fg = "#e5e9f0";
+    bg = "#3b4252";
+    hl = "#81a1c1";
+    "fg+" = "#e5e9f0";
+    "bg+" = "#3b4252";
+    "hl+" = "#81a1c1";
+    info = "#eacb8a";
+    prompt = "#bf6069";
+    pointer = "#b48dac";
+    marker = "#a3be8b";
+    spinner = "#b48dac";
+    header = "#a3be8b";
+  };
+in {
   programs.fzf = {
     enable = true;
     enableZshIntegration = true;
     tmux = {
       enableShellIntegration = true;
     };
-    colors = {
-      bg = "-1";
-      "bg+" = "-1";
-      hl = "#ed8796";
-      "hl+" = "#ed8796";
-      fg = "#cad3f5";
-      "fg+" = "#cad3f5";
-      header = "#ed8796";
-      info = "#c6a0f6";
-      pointer = "#f4dbd6";
-      marker = "#f4dbd6";
-      prompt = "#c6a0f6";
-      spinner = "#f4dbd6";
-    };
+    colors = catppuccin;
+    defaultOptions = [
+      "--preview='bat --color=always {}'"
+      "--multi"
+      "--height 100%"
+      "--layout=reverse-list"
+      "--border=none"
+      "--info=inline"
+      "--bind shift-up:preview-page-up,shift-down:preview-page-down"
+      "--header='CTRL-c or ESC to quit'"
+    ];
   };
 }
diff --git a/home/redyf/cli-apps/starship/default.nix b/home/redyf/cli-apps/starship/default.nix
@@ -8,7 +8,8 @@
     settings =
       # Catppuccin
       {
-        scan_timeout = 10;
+        scan_timeout = 30;
+        command_timeout = 2000;
         add_newline = false;
         line_break.disabled = false;
         right_format = ''
@@ -46,6 +47,13 @@
           style = "bold blue";
         };
 
+        direnv = {
+          format = "[$symbol$loaded/$allowed]($style) ";
+          symbol = "direnv ";
+          style = "bold orange";
+          disabled = true;
+        };
+
         docker_context = {
           disabled = true;
         };
@@ -74,6 +82,12 @@
           symbol = "[ ]($style)";
         };
 
+        haskell = {
+          format = "via [$symbol($version )]($style)";
+          symbol = "λ ";
+          style = "bold purple";
+        };
+
         kubernetes = {
           symbol = "☸ ";
           disabled = false;
@@ -101,6 +115,13 @@
           version_format = "v$raw(blue)";
         };
 
+        ocaml = {
+          format = "via [$symbol($version )(\($switch_indicator$switch_name\) )]($style)";
+          symbol = "🐫 ";
+          style = "bold yellow";
+          version_format = "v$raw";
+        };
+
         package = {
           format = "is [$symbol$version]($style) ";
           symbol = " ";

diff --git a/home/redyf/desktop/addons/alacritty/default.nix b/home/redyf/desktop/addons/alacritty/default.nix
@@ -13,21 +13,21 @@ in {
         };
       };
       font = {
-        size = 13;
+        size = 16;
         normal = {
-          family = "MonoLisa";
+          family = "Fira Mono Nerd Font";
           style = "Medium Italic";
         };
         bold = {
-          family = "MonoLisa";
+          family = "Fira Mono Nerd Font";
           style = "Bold";
         };
         italic = {
-          family = "MonoLisa";
+          family = "Fira Mono Nerd Font";
           style = "Italic";
         };
         bold_italic = {
-          family = "MonoLisa";
+          family = "Fira Mono Nerd Font";
           style = "Bold Italic";
         };
         offset = {
@@ -40,7 +40,7 @@ in {
         };
       };
       window = {
-        opacity = 1;
+        opacity = 0.95;
         decorations = "none";
         padding = {
           x = 10;

diff --git a/home/redyf/desktop/addons/kitty/default.nix b/home/redyf/desktop/addons/kitty/default.nix
@@ -5,14 +5,13 @@
       enableZshIntegration = true;
       mode = "no-cursor";
     };
-    # theme = "Catppuccin-Mocha";
+    theme = "Catppuccin-Mocha";
     font = {
-      # name = "Berkeley Mono Regular Nerd Font Complete";
-      name = "FiraMono Nerd Font";
-      # name = "LiterationMono Nerd Font";
+      name = "FiraCode Nerd Font";
+      # name = "JetBrainsMono Nerd Font";
       # name = "MonoLisa";
       # package = pkgs.monolisa-script;
-      size = 11;
+      size = 16;
     };
     # https://www.monolisa.dev/faq#how-to-enable-stylistic-sets-for-the-kitty-terminal
     extraConfig = ''
@@ -31,7 +30,7 @@
       sync_to_monitor = "yes";
 
       # Background
-      background_opacity = "0.98";
+      background_opacity = "0.95";
 
       # Cursor
       cursor_shape = "block";
@@ -62,7 +61,7 @@
       term = "xterm-256color";
 
       # Themes
-      include = "themes/custom-mocha.conf";
+      # include = "themes/custom-mocha.conf";
       # include = "themes/oxocarbon-dark.conf";
       # terminal_select_modifiers = "alt";
 
@@ -91,6 +90,8 @@
       "ctrl+shift+c" = "copy_to_clipboard";
       "ctrl+shift+v" = "paste_from_clipboard";
       "ctrl+shift+s" = "paste_from_selection";
+      "ctrl+shift+=" = "increase_font_size";
+      "ctrl+shift+-" = "decrease_font_size";
       "ctrl+shift+up" = "scroll_line_up";
       "ctrl+shift+k" = "scroll_line_up";
       "ctrl+shift+down" = "scroll_line_down";

diff --git a/home/redyf/desktop/addons/waybar/default.nix b/home/redyf/desktop/addons/waybar/default.nix
@@ -12,17 +12,14 @@
   # waybar_config = import ./nixbar/config.nix {inherit osConfig config lib pkgs;};
   # waybar_style = import ./nixbar/style.nix {inherit (config) colorscheme;};
   # Tokyonight
-  # waybar_config = import ./tokyonight/config.nix {inherit osConfig config lib pkgs;};
-  # waybar_style = import ./tokyonight/style.nix {inherit (config) colorscheme;};
+  waybar_config = import ./tokyonight/config.nix {inherit osConfig config lib pkgs;};
+  waybar_style = import ./tokyonight/style.nix {inherit (config) colorscheme;};
   # Catppuccin
   # waybar_config = import ./catppuccin/config.nix { inherit osConfig config lib pkgs; };
   # waybar_style = import ./catppuccin/style.nix { inherit (config) colorscheme; };
-  # New bar
-  # waybar_config = import ./default/config.nix { inherit osConfig config lib pkgs; };
-  # waybar_style = import ./default/style.nix { inherit (config) colorscheme; };
   # Simple bar
-  waybar_config = import ./simple/config.nix {inherit osConfig config lib pkgs;};
-  waybar_style = import ./simple/style.nix {inherit (config) colorscheme;};
+  # waybar_config = import ./simple/config.nix {inherit osConfig config lib pkgs;};
+  # waybar_style = import ./simple/style.nix {inherit (config) colorscheme;};
 in {
   programs.waybar = {
     enable = true;