Merge pull request #83 from sbulav/dev

Dev
sbulav · May 8, 2024 · fd07793 · fd07793
2 parents cfbe0c4 + 89b5218
commit fd07793
Show file tree

Hide file tree

Showing 38 changed files with 576 additions and 355 deletions.
diff --git a/nix/flake.lock b/nix/flake.lock
diff --git a/nix/flake.nix b/nix/flake.nix
@@ -25,10 +25,6 @@
       url = "github:homebrew/homebrew-cask";
       flake = false;
     };
-    hypridle = {
-      url = "github:hyprwm/Hypridle";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     hyprlock = {
       url = "github:hyprwm/Hyprlock";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -37,6 +33,10 @@
       url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    hyprpaper = {
+      url = "github:hyprwm/hyprpaper";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Home manager
     home-manager = {
@@ -48,6 +48,10 @@
       url = "github:kamadorueda/alejandra/3.0.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    wallpapers-nix = {
+      url = "github:sbulav/wallpapers-nix";
+    };
   };
 
   outputs = inputs: let
@@ -76,7 +80,5 @@
       overlays = with inputs; [];
 
       systems.modules.nixos = with inputs; [];
-
-      templates = import ./templates {};
     };
 }
diff --git a/nix/homes/aarch64-darwin/sab@mbp13/default.nix b/nix/homes/aarch64-darwin/sab@mbp13/default.nix
@@ -14,8 +14,10 @@ with lib.custom; {
     };
 
     cli-apps = {
-      home-manager = enabled;
+      argocd = enabled;
       atuin = enabled;
+      bottom = enabled;
+      home-manager = enabled;
       neovim = enabled;
       yazi = enabled;
     };

diff --git a/nix/homes/x86_64-linux/sab@nz/default.nix b/nix/homes/x86_64-linux/sab@nz/default.nix
@@ -1,12 +1,13 @@
 {
   lib,
-  pkgs,
   config,
-  osConfig ? {},
-  format ? "unknown",
+  inputs,
+  pkgs,
   ...
 }:
-with lib.custom; {
+with lib.custom; let
+  wallpapers = inputs.wallpapers-nix.packages.${pkgs.system}.catppuccin;
+in {
   custom = {
     user = {
       enable = true;
@@ -26,14 +27,17 @@ with lib.custom; {
         wlogout = enabled;
         hyprlock = disabled;
         wezterm = enabled;
+        wallpaper = "${wallpapers}/share/wallpapers/catppuccin/bench.png";
       };
     };
 
     cli-apps = {
+      argocd = enabled;
       atuin = enabled;
-      yazi = enabled;
-      home-manager = enabled;
+      bottom = enabled;
       fastfetch = enabled;
+      home-manager = enabled;
+      yazi = enabled;
     };
     tools = {
       gh = enabled;
@@ -45,4 +49,5 @@ with lib.custom; {
       vault = enabled;
     };
   };
+  home.stateVersion = "23.11";
 }
diff --git a/nix/modules/darwin/nix/default.nix b/nix/modules/darwin/nix/default.nix
@@ -17,7 +17,7 @@ in {
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       deploy-rs
-      nixfmt
+      nixfmt-rfc-style
       nix-index
       nix-prefetch-git
       nvd

diff --git a/nix/modules/darwin/tools/homebrew/default.nix b/nix/modules/darwin/tools/homebrew/default.nix
@@ -36,6 +36,7 @@ in {
       casks = [
         "raycast"
         "vlc"
+        "xnviewmp"
       ];
 
       # taps = [

diff --git a/nix/modules/darwin/tools/lsp/default.nix b/nix/modules/darwin/tools/lsp/default.nix
@@ -17,7 +17,7 @@ in {
     environment.systemPackages = with pkgs; [
       lua-language-server # LSP for lua
       marksman # LSP for markdown
-      rnix-lsp # LSP for nix
+      nil # LSP for nix
       tree-sitter
       yamllint
       nodejs_21 # Note for LSP servers

diff --git a/nix/modules/home/cli-apps/argocd/default.nix b/nix/modules/home/cli-apps/argocd/default.nix
@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+
+  cfg = config.custom.cli-apps.argocd;
+in {
+  options.custom.cli-apps.argocd = {
+    enable = mkEnableOption "argocd";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      argocd
+    ];
+  };
+}
diff --git a/nix/modules/home/cli-apps/bottom/default.nix b/nix/modules/home/cli-apps/bottom/default.nix
@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+
+  cfg = config.custom.cli-apps.bottom;
+in {
+  options.custom.cli-apps.bottom = {
+    enable = mkEnableOption "bottom";
+  };
+
+  config = mkIf cfg.enable {
+    home = {
+      packages = with pkgs; [bottom];
+    };
+  };
+}
diff --git a/nix/modules/home/cli-apps/yazi/configs/keymap.toml b/nix/modules/home/cli-apps/yazi/configs/keymap.toml
diff --git a/nix/modules/home/cli-apps/yazi/configs/theme.toml b/nix/modules/home/cli-apps/yazi/configs/theme.toml
@@ -75,7 +75,7 @@ separator_style = { fg = "#5b6078" }
 
 [help]
 on = { fg = "#f5bde6" }
-exec = { fg = "#8bd5ca" }
+run = { fg = "#8bd5ca" }
 desc = { fg = "#939ab7" }
 hovered = { bg = "#5b6078", bold = true }
 footer = { fg = "#494d64", bg = "#cad3f5" }

diff --git a/nix/modules/home/desktop/addons/hypridle/default.nix b/nix/modules/home/desktop/addons/hypridle/default.nix
@@ -1,6 +1,4 @@
 {
-  inputs,
-  options,
   config,
   lib,
   pkgs,
@@ -9,39 +7,41 @@
 with lib;
 with lib.custom; let
   cfg = config.custom.desktop.addons.hypridle;
-  inherit (inputs) hypridle;
 in {
-  imports = [hypridle.homeManagerModules.default];
-
-  options.custom.desktop.addons.hypridle = with types; {
-    enable = mkBoolOpt false "Whether to enable the hypridle";
+  options.custom.desktop.addons.hypridle = {
+    enable = mkBoolOpt false "Whether to enable hypridle in the desktop environment.";
   };
 
   config = mkIf cfg.enable {
     services.hypridle = {
       enable = true;
       # package = pkgs.hypridle;
 
-      lockCmd = "${pkgs.swaylock-effects}/bin/swaylock -fF";
-      afterSleepCmd = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
+      settings = {
+        general = {
+          lock_cmd = "${pkgs.swaylock-effects}/bin/swaylock -fF";
+          ignore_dbus_inhibit = false;
+          after_sleep_cmd = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
+        };
 
-      # 5 min lock, 10min turn the screen off, 20 min suspend
-      listeners = [
-        {
-          timeout = 300;
-          onTimeout = "${pkgs.swaylock-effects}/bin/swaylock -fF";
-        }
-        {
-          timeout = 600;
-          onTimeout = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms off";
-          onResume = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
-        }
-        {
-          timeout = 1200;
-          onTimeout = "${pkgs.systemd}/bin/systemctl suspend";
-          onResume = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
-        }
-      ];
+        # 5 min lock, 10min turn the screen off, 20 min suspend
+        listener = [
+          {
+            timeout = 300;
+            on-timeout = "${pkgs.swaylock-effects}/bin/swaylock -fF";
+          }
+          {
+            timeout = 600;
+            on-timeout = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms off";
+            on-resume = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
+          }
+          {
+            timeout = 1200;
+            on-timeout = "${pkgs.systemd}/bin/systemctl suspend";
+            on-resume = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
+          }
+        ];
+      };
     };
   };
 }
diff --git a/nix/modules/home/desktop/addons/hyprlock/default.nix b/nix/modules/home/desktop/addons/hyprlock/default.nix
@@ -1,9 +1,7 @@
 {
   inputs,
-  options,
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib;
@@ -43,7 +41,7 @@ in {
 
       backgrounds = [
         {
-          path = "/home/sab/Pictures/wallpaper.png";
+          path = config.custom.desktop.addons.wallpaper;
         }
       ];
     };

diff --git a/nix/modules/home/desktop/addons/hyprpaper/default.nix b/nix/modules/home/desktop/addons/hyprpaper/default.nix
@@ -1,40 +1,27 @@
 {
-  options,
+  inputs,
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib;
 with lib.custom; let
   cfg = config.custom.desktop.addons.hyprpaper;
-  wallpaper = /home/sab/Pictures/cityscape2.jpg;
+  inherit (inputs) hyprpaper;
+  wallpaper = config.custom.desktop.addons.wallpaper;
 in {
+  imports = [hyprpaper.homeManagerModules.default];
   options.custom.desktop.addons.hyprpaper = with types; {
     enable = mkBoolOpt false "Whether to enable the hyprpaper config";
   };
 
   config = mkIf cfg.enable {
-    xdg.configFile = {
-      "hypr/hyprpaper.conf".text = ''
-        preload = ${wallpaper}
-        wallpaper = eDP-1,${wallpaper}
-        wallpaper = DP-1,${wallpaper}
-        wallpaper = DP-2,${wallpaper}
-      '';
-    };
-    systemd.user.services.hyprpaper = {
-      Install.WantedBy = ["hyprland-session.target"];
-
-      Unit = {
-        Description = "Hyprpaper Service";
-        PartOf = ["graphical-session.target"];
-      };
+    services.hyprpaper = {
+      enable = true;
 
-      Service = {
-        ExecStart = "${getExe pkgs.hyprpaper}";
-        Restart = "always";
-      };
+      preloads = [wallpaper];
+      wallpapers = [", ${wallpaper}"];
+      ipc = false;
     };
   };
 }
diff --git a/nix/modules/home/desktop/addons/rofi/default.nix b/nix/modules/home/desktop/addons/rofi/default.nix
@@ -22,12 +22,12 @@ in {
     programs.rofi = {
       enable = true;
       package = pkgs.rofi-wayland;
-      plugins = with pkgs; [
-        rofi-calc
-      ];
+      # plugins = with pkgs; [
+      #   rofi-calc
+      # ];
       extraConfig = {
         combi-hide-mode-prefix = true;
-        combi-modi = "drun,run,calc";
+        combi-modi = "drun,run";
         disable-history = false;
         display-Network = " 󰤨  Network";
         display-drun = "   Apps ";
@@ -37,7 +37,7 @@ in {
         drun-display-format = "{icon} {name}";
         icon-theme = "Fluent";
         location = 0;
-        modi = "run,drun,vpn:~/.config/rofi/rofi-vpn.sh,clip:~/.config/rofi/rofi-cliphist.sh,calc,";
+        modi = "run,drun,vpn:~/.config/rofi/rofi-vpn.sh,clip:~/.config/rofi/rofi-cliphist.sh,";
         show-icons = true;
         sidebar-mode = true;
         sorting-method = "fzf";

diff --git a/nix/modules/home/desktop/addons/swaylock/default.nix b/nix/modules/home/desktop/addons/swaylock/default.nix
@@ -18,7 +18,7 @@ in {
       enable = true;
       package = pkgs.swaylock-effects;
       settings = {
-        image = "$HOME/Pictures/wallpaper.png";
+        image = config.custom.desktop.addons.wallpaper;
         color = "000000ff";
         font-size = "24";
         indicator-idle-visible = true;

diff --git a/nix/modules/home/desktop/addons/wallpaper/default.nix b/nix/modules/home/desktop/addons/wallpaper/default.nix
@@ -0,0 +1,17 @@
+{
+  inputs,
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with lib.custom; let
+  # cfg = config.system.wallpaper;
+in {
+  options.custom.desktop.addons.wallpaper = mkOption {
+    type = types.oneOf [types.package types.path types.str];
+    default = inputs.wallpapers-nix.packages.${pkgs.system}.catppuccin;
+    description = "The wallpaper to use.";
+  };
+}
diff --git a/nix/modules/home/desktop/addons/wezterm/wezterm.lua b/nix/modules/home/desktop/addons/wezterm/wezterm.lua
@@ -7,6 +7,10 @@ if wezterm.config_builder then
   config = wezterm.config_builder()
 end
 
+-- Disable wayland until this issue is fixed
+-- https://github.com/wez/wezterm/issues/5197
+config.enable_wayland = false
+
 -- Fonts
 -- {{{
 config.adjust_window_size_when_changing_font_size = false
@@ -20,7 +24,9 @@ if wezterm.target_triple == "aarch64-apple-darwin" then
   config.font_size = 18
   -- Linux Setup
 else
-  config.font_size = 14
+  -- Until issue with wayland is fixed
+  -- config.font_size = 14
+  config.font_size = 18
 end
 -- }}}
 -- Windows