From c52be4f71bd7264246638614736338090971b171 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Tue, 8 Apr 2025 19:51:19 +0200 Subject: [PATCH] Added: ZapZap (WhatsApp) --- flake.lock | 40 ++++++++++++++++++++++++--------- flake.nix | 7 ++---- home/hyprland/hyprland.nix | 19 ++++++---------- home/hyprland/kitty.nix | 6 +++++ home/hyprland/mako.nix | 22 ++++-------------- home/programs/social/zapzap.nix | 8 +++++++ users/phil/home.nix | 14 +++++++++--- users/phil/nixos.nix | 3 +-- 8 files changed, 68 insertions(+), 51 deletions(-) create mode 100644 home/programs/social/zapzap.nix diff --git a/flake.lock b/flake.lock index 8943f04..7833888 100644 --- a/flake.lock +++ b/flake.lock @@ -33,19 +33,21 @@ "type": "github" } }, - "catppuccin-bat": { - "flake": false, + "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1734996624, - "narHash": "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=", + "lastModified": 1743801669, + "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=", "owner": "catppuccin", - "repo": "bat", - "rev": "699f60fc8ec434574ca7451b444b880430319941", + "repo": "nix", + "rev": "07beb389d69a52c4dd5895da9553463c3740a26a", "type": "github" }, "original": { "owner": "catppuccin", - "repo": "bat", + "repo": "nix", "type": "github" } }, @@ -176,7 +178,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -398,6 +400,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1742669843, "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", @@ -413,7 +431,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1743576891, "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", @@ -454,11 +472,11 @@ }, "root": { "inputs": { - "catppuccin-bat": "catppuccin-bat", + "catppuccin": "catppuccin", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" } }, "systems": { diff --git a/flake.nix b/flake.nix index 6b298fd..db22878 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; hyprland.url = "github:hyprwm/Hyprland"; + catppuccin.url = "github:catppuccin/nix"; home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -31,17 +32,13 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; - - catppuccin-bat = { - url = "github:catppuccin/bat"; - flake = false; - }; }; outputs = inputs @ { self, nixpkgs, home-manager, + catppuccin, ... }: { packages.x86_64-linux.default = self.nixosConfigurations.iso.config.system.build.isoImage; diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix index 042017b..bbe6381 100644 --- a/home/hyprland/hyprland.nix +++ b/home/hyprland/hyprland.nix @@ -9,7 +9,7 @@ let in { home.packages = with pkgs; [ - hyprland + grim slurp wl-clipboard ]; @@ -94,8 +94,8 @@ in gaps_out = 16; border_size = 4; - "col.active_border" = "0xFFF887FF"; - "col.inactive_border" = "0xFFDE004E"; + "col.active_border" = "$green"; + "col.inactive_border" = "$red"; layout = "dwindle"; @@ -111,14 +111,8 @@ in range = 16; render_power = 4; ignore_window = true; - color = "0xFFF887FF"; - color_inactive = "0xFFDE004E"; - #drop_shadow = "yes"; - #shadow_range = 16; - #shadow_render_power = 4; - #shadow_ignore_window = 1; - #"col.shadow" = "0xFFF887FF"; - #"col.shadow_inactive" = "0xFFDE004E"; + color = "$green"; + color_inactive = "$red"; }; blur = { @@ -239,7 +233,8 @@ in # Screenshot ''${super}, Z, exec, grim -g "$(slurp)" $HOME/Pictures/Screenshots/$(date +'%s_grim.png')'' - ]; + ''${super}, U, exec, grim $HOME/Pictures/Screenshots/$(date +'%s_grim.png')'' + ]; bindl = [ #", XF86AudioMute, exec, amixer set Master toggle diff --git a/home/hyprland/kitty.nix b/home/hyprland/kitty.nix index 38d7717..3fe0e12 100644 --- a/home/hyprland/kitty.nix +++ b/home/hyprland/kitty.nix @@ -3,6 +3,7 @@ programs.kitty = lib.mkForce { enable = true; settings = { + themeFile = "Catppuccin-Mocha"; confirm_os_window_close = 0; dynamic_background_opacity = true; enable_audio_bell = false; @@ -10,6 +11,11 @@ window_padding_width = 10; background_opacity = "0.5"; background_blur = 5; + tab_bar_min_tabs = 1; + tab_bar_edge = "bottom"; + tab_bar_style = "powerline"; + tab_powerline_style = "slanted"; + tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}"; symbol_map = let mappings = [ "U+23FB-U+23FE" diff --git a/home/hyprland/mako.nix b/home/hyprland/mako.nix index ff3d686..9393e7d 100644 --- a/home/hyprland/mako.nix +++ b/home/hyprland/mako.nix @@ -3,27 +3,13 @@ services.mako = { enable = true; font = "FiraCodeNerdFontPropo 12"; - backgroundColor = "#120458"; - textColor = "#FFFFFF"; + borderSize = 4; + borderRadius = 8; defaultTimeout = 5000; extraConfig = '' - [urgency=low] - border-color=#65dc98 - - [urgency=normal] - border-color=#fff69f - - [urgency=high] - border-color=#ff124f - default-timeout=10000 - - [app-name=Spotify] - border-color=#1afe49 - - [category=mpd] - default-timeout=2000 - group-by=category +[app-name=Spotify] +border-color=#a6e3a1 ''; diff --git a/home/programs/social/zapzap.nix b/home/programs/social/zapzap.nix new file mode 100644 index 0000000..4450917 --- /dev/null +++ b/home/programs/social/zapzap.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + # Install Element Desktop + home.packages = with pkgs; [ + zapzap + ]; +} diff --git a/users/phil/home.nix b/users/phil/home.nix index 535c0c4..6c7031d 100644 --- a/users/phil/home.nix +++ b/users/phil/home.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, catppuccin, ...}: { ################################################################################################################## # # All Phil's Home Manager Configuration @@ -10,7 +10,7 @@ ../../home/xdg.nix # Bindings ../../home/hyprland # Window Manager - ../../home/themes/dark +# ../../home/themes/dark ../../home/hyprland/waybar/double-monitor.nix ../../home/programs/dev # Dev Tools @@ -27,6 +27,7 @@ ../../home/programs/social/element.nix ../../home/programs/social/webcord.nix + ../../home/programs/social/zapzap.nix ../../home/programs/web/firefox.nix @@ -34,9 +35,16 @@ ../../home/programs/games/itch.nix ../../home/programs/games/steam.nix ../../home/programs/games/lutris.nix - ../../home/programs/games/opensource.nix +# ../../home/programs/games/opensource.nix + + catppuccin.homeModules.catppuccin ]; + catppuccin = { + enable = true; + flavor = "mocha"; + }; + programs.git = { userName = "DerGrumpf"; userEmail = "p.keier@beyerstedt-it.de"; diff --git a/users/phil/nixos.nix b/users/phil/nixos.nix index 96ee780..5508bce 100644 --- a/users/phil/nixos.nix +++ b/users/phil/nixos.nix @@ -8,7 +8,7 @@ ################################################################################################################## users.users.phil = { -# authorizedKeys + # authorizedKeys openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCaLHfxVylghDMYR8t4QMUpeRRqXasNABQKBEy9MmhbUXCcWiPbPMSZH8FMHON34rm2OrXP1kY/8jQxqBJDA+SqpFR2AZ4Khk9iVMaq5GHxxpn2amZUjoBa+fB29WaiE1npV5JVJV3O0ylw6GtiCnpneE6fGx2MO1vOY/7zKrUX/OK7WfwkDpeEzZgV/j/md917HrzUVeZwdeTq3WCRO8Gew6R8Xs6FRjSiGuH0dq14D4Ow5Zf1cI1jx+JfD/5vGasw8HXPu1NdxsOE+6D7/22IKqGr+S74/lAoyyD5qqk0s05lw8UY/PXBLJaNLZu9Fwx0BqTHpJEvftpmvd9wUxgR3msx9VXtKNSrqivIbDgeU+3oGzzkrGZODl7FCp4XKGmbrX85Z6lKwEGgv5jez4MLZcmT86bxB7m1wIbqSbVtfhS+GI7yPTA/kLzzFa14Im/+LTj95pb8qs2ALMwTMP1j2f9A6D3RriOFihL+68qn+YbK58KuV1R0f+CQRmlfVbk= phil@web.cyperpunk.de" ]; @@ -32,7 +32,6 @@ fish_config prompt choose disco function fish_greeting fastfetch - echo (set_color yellow)(date +%T)(set_color normal) on $hostname end ''; };