From 0d5fad12ffe462c77f5492b3f96d1d1e98d754f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20R=C3=B6ger?= Date: Sat, 3 May 2025 02:29:05 +0200 Subject: [PATCH] Home Gen508 @ 2025-05-03-02:29 by jonas@comfy-station --- home/jonas@comfy-station.nix | 4 +- home/jonas@harbor.nix | 6 +- home/jonas@monolith.nix | 3 +- home/jroeger.nix | 2 +- modules/default.nix | 2 + modules/home/wofi/config.nix | 89 ---------------------------- modules/home/wofi/default.nix | 105 ++++++++++++++++++++++++++++++++-- modules/home/wofi/wofi.nix | 3 - modules/home/zsh/default.nix | 86 ++++++++++++++++++++++++++-- modules/home/zsh/tools.nix | 23 -------- modules/home/zsh/zsh.nix | 47 --------------- 11 files changed, 188 insertions(+), 182 deletions(-) delete mode 100644 modules/home/wofi/config.nix delete mode 100644 modules/home/wofi/wofi.nix delete mode 100644 modules/home/zsh/tools.nix delete mode 100644 modules/home/zsh/zsh.nix diff --git a/home/jonas@comfy-station.nix b/home/jonas@comfy-station.nix index 26b39e0..e519063 100644 --- a/home/jonas@comfy-station.nix +++ b/home/jonas@comfy-station.nix @@ -6,9 +6,7 @@ ../modules/home/ssh.nix ../modules/home/themes/gtk ../modules/home/themes/qt - ../modules/home/wofi ../modules/home/yubikey.nix - ../modules/home/zsh ]; # Home Manager needs a bit of information about you and the paths it should @@ -28,6 +26,8 @@ hive.swaync.enable = true; hive.waybar.enable = true; hive.wlogout.enable = true; + hive.wofi.enable = true; + hive.zsh.enable = true; hive.nix-scripts.enable = true; hive.doom.enable = true; hive.doom.enableCopilot = true; diff --git a/home/jonas@harbor.nix b/home/jonas@harbor.nix index cdcf748..e880f57 100644 --- a/home/jonas@harbor.nix +++ b/home/jonas@harbor.nix @@ -1,15 +1,11 @@ {...}: { - imports = [ - ../modules/home/zsh - ]; - # Home Manager needs a bit of information about you and the paths it should # manage. home.username = "jonas"; home.homeDirectory = "/home/jonas"; # hive modules - hive.hyprland.enable = true; + hive.zsh.enable = true; hive.nix-scripts.enable = true; hive.ranger.enable = true; hive.doom.enable = true; diff --git a/home/jonas@monolith.nix b/home/jonas@monolith.nix index 3affd0b..17f0fba 100644 --- a/home/jonas@monolith.nix +++ b/home/jonas@monolith.nix @@ -3,10 +3,8 @@ ../modules/home/borg.nix ../modules/home/firefox.nix ../modules/home/kdeconnect.nix - ../modules/home/kitty ../modules/home/ssh.nix ../modules/home/yubikey.nix - ../modules/home/zsh ]; # Home Manager needs a bit of information about you and the paths it should @@ -23,6 +21,7 @@ hive.kitty.enable = true; hive.nextcloud.enable = true; hive.ranger.enable = true; + hive.zsh.enable = true; hive.doom.enable = true; hive.doom.enableCopilot = true; hive.doom.withNixPkgs = true; diff --git a/home/jroeger.nix b/home/jroeger.nix index 724f834..aa87028 100644 --- a/home/jroeger.nix +++ b/home/jroeger.nix @@ -1,7 +1,6 @@ {...}: { imports = [ ../modules/home/yubikey.nix - ../modules/home/zsh ]; # Home Manager needs a bit of information about you and the paths it should @@ -15,6 +14,7 @@ hive.kitty.enable = true; hive.ranger.enable = true; hive.nix-scripts.enable = true; + hive.zsh.enable = true; hive.doom.enable = true; hive.doom.enableCopilot = true; hive.doom.withNixPkgs = true; diff --git a/modules/default.nix b/modules/default.nix index ed1eded..5b2a809 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -36,5 +36,7 @@ ./home/swaync ./home/waybar ./home/wlogout + ./home/wofi + ./home/zsh ]; } diff --git a/modules/home/wofi/config.nix b/modules/home/wofi/config.nix deleted file mode 100644 index 4a6bddf..0000000 --- a/modules/home/wofi/config.nix +++ /dev/null @@ -1,89 +0,0 @@ -{...}: { - programs.wofi.settings = { - location = "center"; - allow_images = true; - allow_markup = true; - key_expand = "Tab"; - key_up = "Ctrl-k"; - key_down = "Ctrl-j"; - key_left = "Ctrl-h"; - key_right = "Ctrl-l"; - insensitive = true; - }; - - programs.wofi.style = '' - #window { - border-radius: 15px; - border-color: #33ccff; - border-width: 2px; - border-style: solid; - background-color: rgba(0, 0, 0, 0.6); - } - - #input { - margin: 5px; - border-radius: 15px; - border-color: #33ccff; - border-width: 2px; - border-style: solid; - background: transparent; - color: white; - } - - #input { - margin: 5px; - border-radius: 15px; - border-color: #33ccff; - border-width: 2px; - border-style: solid; - background: transparent; - color: white; - } - - #img { - background-color: transparent; - } - - #inner-box { - background-color: transparent; - } - - #outer-box { - margin: 2px; - padding: 10px; - background: transparent; - } - - #scroll { - margin: 5px; - } - - #text { - padding: 4px; - color: white; - background: transparent; - border: none; - } - - #entry { - background: transparent; - border: none; - } - - #entry:selected { - border-radius: 15px; - border-color: #33ccff; - border-width: 2px; - border-style: solid; - background: transparent; - } - - #expander { - border-radius: 15px; - border-color: #33ccff; - border-width: 2px; - border-style: solid; - background: transparent; - } - ''; -} diff --git a/modules/home/wofi/default.nix b/modules/home/wofi/default.nix index df44e14..462de94 100644 --- a/modules/home/wofi/default.nix +++ b/modules/home/wofi/default.nix @@ -1,6 +1,101 @@ -{...}: { - imports = [ - ./config.nix - ./wofi.nix - ]; +{ + config, + lib, + ... +}: let + cfg = config.hive.wofi; +in { + options.hive.wofi = { + enable = lib.mkEnableOption "Enable Wofi"; + }; + config = lib.mkIf cfg.enable { + programs.wofi.enable = true; + programs.wofi.settings = { + location = "center"; + allow_images = true; + allow_markup = true; + key_expand = "Tab"; + key_up = "Ctrl-k"; + key_down = "Ctrl-j"; + key_left = "Ctrl-h"; + key_right = "Ctrl-l"; + insensitive = true; + }; + + programs.wofi.style = '' + #window { + border-radius: 15px; + border-color: #33ccff; + border-width: 2px; + border-style: solid; + background-color: rgba(0, 0, 0, 0.6); + } + + #input { + margin: 5px; + border-radius: 15px; + border-color: #33ccff; + border-width: 2px; + border-style: solid; + background: transparent; + color: white; + } + + #input { + margin: 5px; + border-radius: 15px; + border-color: #33ccff; + border-width: 2px; + border-style: solid; + background: transparent; + color: white; + } + + #img { + background-color: transparent; + } + + #inner-box { + background-color: transparent; + } + + #outer-box { + margin: 2px; + padding: 10px; + background: transparent; + } + + #scroll { + margin: 5px; + } + + #text { + padding: 4px; + color: white; + background: transparent; + border: none; + } + + #entry { + background: transparent; + border: none; + } + + #entry:selected { + border-radius: 15px; + border-color: #33ccff; + border-width: 2px; + border-style: solid; + background: transparent; + } + + #expander { + border-radius: 15px; + border-color: #33ccff; + border-width: 2px; + border-style: solid; + background: transparent; + } + ''; + }; } diff --git a/modules/home/wofi/wofi.nix b/modules/home/wofi/wofi.nix deleted file mode 100644 index c4e2fb2..0000000 --- a/modules/home/wofi/wofi.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - programs.wofi.enable = true; -} diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 2075c9f..3f8a924 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -1,6 +1,82 @@ -{...}: { - imports = [ - ./tools.nix - ./zsh.nix - ]; +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.hive.zsh; + omz_custom = "${config.home.homeDirectory}/.config/omz_custom"; +in { + options.hive.zsh = { + enable = lib.mkEnableOption "Enable Zsh"; + }; + + config = lib.mkIf cfg.enable { + home.file."${omz_custom}" = { + source = ./static/omz_custom; + recursive = true; + }; + + # direnv + programs.direnv = { + enable = true; + enableZshIntegration = true; + nix-direnv.enable = true; + }; + + # fancy ls command + programs.lsd = { + enable = true; + enableAliases = true; + }; + + # Zsh + programs.zsh = { + enable = true; + enableCompletion = true; + syntaxHighlighting.enable = true; + + history.size = 10000; + history.path = "${config.xdg.dataHome}/zsh/history"; + oh-my-zsh = { + enable = true; + plugins = [ + "docker" + "docker-compose" + "fzf" + "git" + "pass" + "poetry" + "python" + "rust" + "thefuck" + ]; + theme = "my_bureau"; + custom = omz_custom; + }; + }; + + home.packages = with pkgs; [ + bat + fzf + git + htop + killall + neofetch + nh + nix-search-cli + nix-tree + nixpkgs-fmt + pass + ranger + thefuck + unstable.mmtui + unzip + vim + w3m + wget + yt-dlp + zip + ]; + }; } diff --git a/modules/home/zsh/tools.nix b/modules/home/zsh/tools.nix deleted file mode 100644 index 772e429..0000000 --- a/modules/home/zsh/tools.nix +++ /dev/null @@ -1,23 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - bat - fzf - git - htop - killall - neofetch - nix-search-cli - nix-tree - nixpkgs-fmt - pass - ranger - thefuck - unstable.mmtui - unzip - vim - w3m - wget - yt-dlp - zip - ]; -} diff --git a/modules/home/zsh/zsh.nix b/modules/home/zsh/zsh.nix deleted file mode 100644 index 3969743..0000000 --- a/modules/home/zsh/zsh.nix +++ /dev/null @@ -1,47 +0,0 @@ -{config, ...}: let - omz_custom = "${config.home.homeDirectory}/.config/omz_custom"; -in { - home.file."${omz_custom}" = { - source = ./static/omz_custom; - recursive = true; - }; - - # direnv - programs.direnv = { - enable = true; - enableZshIntegration = true; - nix-direnv.enable = true; - }; - - # fancy ls command - programs.lsd = { - enable = true; - enableAliases = true; - }; - - # Zsh - programs.zsh = { - enable = true; - enableCompletion = true; - syntaxHighlighting.enable = true; - - history.size = 10000; - history.path = "${config.xdg.dataHome}/zsh/history"; - oh-my-zsh = { - enable = true; - plugins = [ - "docker" - "docker-compose" - "fzf" - "git" - "pass" - "poetry" - "python" - "rust" - "thefuck" - ]; - theme = "my_bureau"; - custom = omz_custom; - }; - }; -}