From f4d08565eac9e0c589444983ff29f015a88fa280 Mon Sep 17 00:00:00 2001 From: xqtc Date: Fri, 17 Jan 2025 21:06:38 +0100 Subject: [PATCH] rice and tailscale --- flake-mods/hm.nix | 18 +- flake.lock | 102 ++++++- flake.nix | 8 +- home/config-files/ghostty-config | 2 +- home/config-files/hyprland.conf | 4 +- home/modules/home-pkgs.nix | 3 + home/modules/nixvim.nix | 8 +- home/modules/wm.nix | 372 +++++++++++++++++------- home/modules/zellij.nix | 126 ++++---- hosts/x86_64-linux/asmodeus/default.nix | 3 + justfile | 2 +- modules/home-manager.nix | 1 + 12 files changed, 457 insertions(+), 192 deletions(-) diff --git a/flake-mods/hm.nix b/flake-mods/hm.nix index d29ac9f..01f3051 100644 --- a/flake-mods/hm.nix +++ b/flake-mods/hm.nix @@ -8,8 +8,8 @@ ]; perSystem = { config, - self', - inputs', + self, + inputs, pkgs, system, ... @@ -20,14 +20,24 @@ arch = builtins.elemAt splitSystem 1; in { legacyPackages.homeConfigurations.xqtc = inputs.home-manager.lib.homeManagerConfiguration { - inherit pkgs; + pkgs = import inputs.nixpkgs { + inherit system; + # overlays = [ + # inputs.hyprpanel.overlay + # ]; + }; + nixpkgs.overlays = [inputs.hyprpanel.overlay ]; modules = [ ../home inputs.nixvim.homeManagerModules.nixvim inputs.sops-nix.homeManagerModules.sops + inputs.hyprpanel.homeManagerModules.hyprpanel {inherit os arch;} ]; - extraSpecialArgs = {inherit inputs;}; + extraSpecialArgs = { + inherit inputs; + inherit system; + }; }; # # this sounds stupid, but it's the only way to make home-manager consume a diff --git a/flake.lock b/flake.lock index 0e819e6..1f1415a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "ags": { + "inputs": { + "astal": "astal", + "nixpkgs": [ + "hyprpanel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736090999, + "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", + "owner": "aylur", + "repo": "ags", + "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "ags", + "type": "github" + } + }, "apple-silicon": { "inputs": { "flake-compat": "flake-compat", @@ -20,6 +42,28 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735172721, + "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", + "owner": "aylur", + "repo": "astal", + "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "comin": { "inputs": { "nixpkgs": [ @@ -42,7 +86,7 @@ }, "crane": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1717383740, @@ -481,6 +525,25 @@ "type": "github" } }, + "hyprpanel": { + "inputs": { + "ags": "ags", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1737011541, + "narHash": "sha256-YAT1VozLQ29V56EvEzJQswBOCLZDqn/gTU05mf+UFts=", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "rev": "88609f7e4c244326face34cb992a79053f2c7810", + "type": "github" + }, + "original": { + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -546,7 +609,7 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1736755595, @@ -585,7 +648,7 @@ }, "nixos-aarch64-widevine": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1712816564, @@ -756,6 +819,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1735563628, "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", @@ -771,7 +850,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1712122226, "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", @@ -787,7 +866,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1736701207, "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", @@ -803,7 +882,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1714656196, "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", @@ -819,7 +898,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -835,7 +914,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1734435836, "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", @@ -934,11 +1013,12 @@ "flake-utils": "flake-utils_2", "ghostty": "ghostty", "home-manager": "home-manager", + "hyprpanel": "hyprpanel", "lix-module": "lix-module", "nh": "nh", "nixos-aarch64-widevine": "nixos-aarch64-widevine", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-24-11": "nixpkgs-24-11", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim", @@ -1008,7 +1088,7 @@ "spicetify-nix": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1720901901, @@ -1197,7 +1277,7 @@ "inputs": { "crane": "crane_2", "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 1f9686d..252918d 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,10 @@ url = "github:SaumonNet/proxmox-nixos"; # inputs.nixpkgs.follows = "proxmox-nixos"; }; + hyprpanel = { + url = "github:Jas-SinghFSU/HyprPanel"; + # follows = "nixpkgs"; + }; ghostty = { url = "github:ghostty-org/ghostty"; }; @@ -56,8 +60,8 @@ systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"]; perSystem = { config, - self', - inputs', + self, + inputs, pkgs, system, ... diff --git a/home/config-files/ghostty-config b/home/config-files/ghostty-config index 68cd1ff..029f08b 100644 --- a/home/config-files/ghostty-config +++ b/home/config-files/ghostty-config @@ -1,5 +1,5 @@ theme = ayu -background-opacity = 1 +background-opacity = .8 background-blur-radius = 1 gtk-titlebar = false adw-toolbar-style = flat diff --git a/home/config-files/hyprland.conf b/home/config-files/hyprland.conf index 2d559a7..f69f8bd 100644 --- a/home/config-files/hyprland.conf +++ b/home/config-files/hyprland.conf @@ -12,7 +12,7 @@ monitor=,preferred,auto,1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch -exec-once = waybar & swww init & mako & kwalletd6 & nextcloud & trayscale +exec-once = hyprpanel & swww init & mako & kwalletd6 & nextcloud & trayscale # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf @@ -71,7 +71,7 @@ decoration { } animations { - enabled = no + enabled = yes # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index db42f72..a76a69d 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -29,6 +29,8 @@ in { # bottles # DEPENDENCY BUILD FAILURE #flameshot grim + waypaper + satty networkmanagerapplet nextcloud-client trayscale @@ -52,6 +54,7 @@ in { # ida-free # spotify simplex-chat-desktop + cosmic-icons ])) ++ (with pkgs; [ inputs.ghostty.packages.x86_64-linux.default diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index d611f0d..a624085 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -37,6 +37,10 @@ # }; # }; plugins = { + transparent = { + enable = true; + autoLoad = true; + }; colorizer.enable = true; neogit.enable = true; neorg = { @@ -482,7 +486,7 @@ type = "padding"; val = 4; } - #{ + # { # type = "text"; # val = [ # "　　　 　　/＾>》, -―‐‐＜＾}" @@ -499,7 +503,7 @@ # position = "center"; # hl = "Type"; # }; - #} + # } ]; opts = { #noautocmd = true; diff --git a/home/modules/wm.nix b/home/modules/wm.nix index e939333..00084a7 100644 --- a/home/modules/wm.nix +++ b/home/modules/wm.nix @@ -19,25 +19,179 @@ enable = true; settings = { general = { - lock_cmd = "pidof hyprlock || hyprlock"; - before_sleep_cmd = "loginctl lock-session"; - after_sleep_cmd = "hyprctl dispatch dpms on"; + lock_cmd = "pidof hyprlock || hyprlock"; + before_sleep_cmd = "loginctl lock-session"; + after_sleep_cmd = "hyprctl dispatch dpms on"; }; listener = [ - { - timeout = "30"; - on-timeout = "brightnessctl -s set 10"; - on-resume = "brightnessctl -r"; - } - { - timeout = "60"; - on-timeout = "loginctl lock-session"; - } + { + timeout = "30"; + on-timeout = "brightnessctl -s set 10"; + on-resume = "brightnessctl -r"; + } + { + timeout = "60"; + on-timeout = "loginctl lock-session"; + } ]; }; }; + imports = [inputs.hyprpanel.homeManagerModules.hyprpanel]; + programs.hyprpanel = { + enable = true; + # systemd.enable = true; + hyprland.enable = true; + overwrite.enable = true; + overlay.enable = true; + theme = "catppuccin_mocha"; + layout = { + "bar.layouts" = { + "*" = { + left = ["dashboard" "windowtitle" "systray" "cpu" "ram" "netstat"]; + middle = ["workspaces"]; + right = ["media" "clock" "hypridle" "battery" "bluetooth" "volume" "notifications"]; + }; + # "1" = { + # left = ["dashboard" "windowtitle" "systray" "ram" "netstat"]; + # middle = ["workspaces"]; + # right = ["media" "clock" "hypridle" "bluetooth" "volume" "notifications"]; + # }; + }; + }; + override = { + "theme.bar.buttons.workspaces.hover" = "#7f849c"; + "theme.bar.buttons.workspaces.active" = "#f5c2e7"; + "theme.bar.buttons.workspaces.occupied" = "#89dceb"; + "theme.bar.buttons.workspaces.available" = "#585b70"; + "theme.bar.buttons.workspaces.border" = "#f9e2af"; + "theme.bar.buttons.modules.power.spacing" = "0em"; + "theme.bar.border.color" = "#f9e2af"; + "theme.osd.orientation" = "vertical"; + "theme.osd.location" = "right"; + # "bar.windowtitle.leftClick" = "pkill rofi || /nix/store/rsb5ihbh4m3q4x046vc0y1r301i8j3is-ags-1.8.2/bin/ags -t overview"; + "bar.workspaces.spacing" = "1.5"; + "bar.customModules.cava.showIcon" = false; + "theme.font.name" = "JetBrainsMono Nerd Font"; + }; + settings = { + bar.autoHide = "fullscreen"; + notifications.position = "top right"; + #bar.windowtitle.leftClick = "'pkill rofi||/nix/store/rsb5ihbh4m3q4x046vc0y1r301i8j3is-ags-1.8.2/bin/ags -t overview'"; + menus.dashboard.powermenu.avatar.image = "${../config-files/hyprlock-pfp.jpg}"; + theme.bar.buttons.workspaces.spacing = "0.5"; + theme.bar.buttons.background_hover_opacity = 80; + theme.bar.buttons.innerRadiusMultiplier = "0.4"; + theme.bar.buttons.radius = "1.0em"; + theme.bar.buttons.y_margins = "0.5em"; + theme.bar.buttons.padding_y = "0.1rem"; + theme.bar.buttons.padding_x = "0.7rem"; + theme.bar.buttons.spacing = "0.25em"; + theme.bar.border.location = "none"; + theme.bar.buttons.workspaces.enableBorder = true; + theme.bar.buttons.modules.power.enableBorder = true; + theme.bar.buttons.dashboard.enableBorder = true; + theme.bar.border.width = "0.1em"; + theme.bar.outer_spacing = "1.0em"; + theme.bar.label_spacing = "0.5em"; + theme.bar.border_radius = "0.6em"; + theme.bar.margin_sides = "2.5em"; + theme.bar.margin_bottom = "0em"; + theme.bar.margin_top = "0.5em"; + theme.bar.layer = "overlay"; + theme.bar.opacity = 90; + theme.bar.scaling = 85; + theme.osd.scaling = 80; + theme.tooltip.scaling = 80; + theme.notification.scaling = 80; + theme.bar.menus.menu.battery.scaling = 80; + theme.bar.menus.menu.bluetooth.scaling = 80; + theme.bar.menus.menu.clock.scaling = 80; + #theme.bar.menus.menu.dashboard.confirmation_scaling = 80; + theme.bar.menus.menu.dashboard.scaling = 70; + theme.bar.menus.menu.dashboard.confirmation_scaling = 80; + theme.bar.menus.menu.media.scaling = 80; + theme.bar.menus.menu.notifications.scaling = 80; + theme.bar.menus.menu.volume.scaling = 80; + theme.bar.menus.popover.scaling = 80; + theme.bar.location = "top"; + theme.bar.buttons.workspaces.pill.radius = "0.3rem * 0.2"; + theme.bar.buttons.workspaces.pill.height = "4em"; + theme.bar.buttons.workspaces.pill.width = "5em"; + theme.bar.buttons.workspaces.pill.active_width = "12em"; + menus.dashboard.directories.enabled = false; + # menus.dashboard.directories.left.directory1.command = "bash -c \"xdg-open $HOME/Downloads/\""; + # menus.dashboard.directories.left.directory1.label = "󰉍 Downloads"; + # menus.dashboard.directories.left.directory2.command = "bash -c \"xdg-open $HOME/Videos/\""; + # menus.dashboard.directories.left.directory2.label = "󰉏 Videos"; + # menus.dashboard.directories.left.directory3.command = "bash -c \"xdg-open $HOME/Projects/\""; + # menus.dashboard.directories.left.directory3.label = "󰚝 Projects"; + # menus.dashboard.directories.right.directory1.command = "bash -c \"xdg-open $HOME/Documents/\""; + # menus.dashboard.directories.right.directory1.label = "󱧶 Documents"; + # menus.dashboard.directories.right.directory2.command = "bash -c \"xdg-open $HOME/Pictures/\""; + # menus.dashboard.directories.right.directory2.label = "󰉏 Pictures"; + # menus.dashboard.directories.right.directory3.command = "bash -c \"xdg-open $HOME/\""; + # menus.dashboard.directories.right.directory3.label = "󱂵 Home"; + menus.dashboard.shortcuts = { + enabled = true; + left = { + shortcut1 = { + command = "firefox"; + icon = "󰈹"; + tooltip = "Firefox"; + }; + shortcut2 = { + command = "slack"; + icon = "󰒱"; + tooltip = "Slack"; + }; + shortcut3 = { + command = "spotify"; + icon = "󰓇"; + tooltip = "Spotify"; + }; + shortcut4 = { + command = "teams-for-linux"; + icon = "󰊻"; + tooltip = "Microsoft Teams"; + }; + }; + }; + bar.launcher.icon = "󱄅"; + theme.bar.floating = true; + theme.bar.buttons.enableBorders = true; + bar.clock.format = "%y/%m/%d %H:%M"; + bar.media.show_active_only = false; + bar.notifications.show_total = true; + # bar.windowtitle.leftClick = " pkill rofi || /nix/store/rsb5ihbh4m3q4x046vc0y1r301i8j3is-ags-1.8.2/bin/ags -t overview"; + theme.bar.buttons.modules.ram.enableBorder = false; + bar.battery.hideLabelWhenFull = false; + menus.dashboard.controls.enabled = true; + menus.media.displayTime = true; + menus.power.lowBatteryNotification = true; + bar.volume.rightClick = "pactl set-sink-mute @DEFAULT_SINK@ toggle"; + bar.volume.middleClick = "pavucontrol"; + bar.media.format = "{title}"; + bar.launcher.autoDetectIcon = false; + bar.workspaces.show_icons = true; + bar.workspaces.ignored = "[-99]"; + theme.font.name = "Hasklug Nerd Font"; + theme.font.size = "1.1rem"; + bar.workspaces.monitorSpecific = false; + bar.workspaces.workspaces = 5; + menus.clock = { + time = { + military = true; + hideSeconds = false; + }; + weather.unit = "metric"; + }; + menus.dashboard.stats.enable_gpu = false; + theme.bar.transparent = false; + }; + }; + home.file.".config/hypr/pfp.jpg".source = ../config-files/hyprlock-pfp.jpg; home.file.".config/hypr/nixos-logo.png".source = ../config-files/nix-snowflake-trans-colours.png; @@ -56,7 +210,7 @@ # path = "screenshot"; # blur_passes = 3; # blur_size = 8; - color = "rgb(0e1419)"; + color = "rgb(0e1419)"; } ]; @@ -76,103 +230,109 @@ } ]; image = [ - { - size = "120"; - path = "/home/xqtc/.config/hypr/pfp.jpg"; - rounding = "-1"; - position = "0, 270"; - border_color = "rgb(f5a9b8)"; - } - { - size = "80"; - path = "/home/xqtc/.config/hypr/nixos-logo.png"; - rounding = "0"; - position = "0, -215"; - border_color = "rgba(0,0,0,0.0)"; - } - { - size = "80"; - path = "${ ../config-files/chaos_star_white.png }"; - rounding = "0"; - position = "110, -215"; - border_color = "rgba(0,0,0,0.0)"; - } - { - size = "80"; - path = "${ ../config-files/anarchy_symbol.png }"; - rounding = "0"; - position = "-110, -215"; - border_color = "rgba(0,0,0,0.0)"; - } + { + size = "120"; + path = "/home/xqtc/.config/hypr/pfp.jpg"; + rounding = "-1"; + position = "0, 270"; + border_color = "rgb(f5a9b8)"; + } + { + size = "80"; + path = "/home/xqtc/.config/hypr/nixos-logo.png"; + rounding = "0"; + position = "0, -215"; + border_color = "rgba(0,0,0,0.0)"; + } + { + size = "80"; + path = "${../config-files/chaos_star_white.png}"; + rounding = "0"; + position = "110, -215"; + border_color = "rgba(0,0,0,0.0)"; + } + { + size = "80"; + path = "${../config-files/anarchy_symbol.png}"; + rounding = "0"; + position = "-110, -215"; + border_color = "rgba(0,0,0,0.0)"; + } ]; label = [ - { - text = "Hi there,"; - color = "rgb(5bcefa)"; - font_size = 25; - - halign = "center"; - valign = "center"; - position = "0, 390"; - } - { - text = "cmd[update:100000] echo -n $USER"; - color = "rgb(f5a9b8)"; - font_size = 25; - - halign = "center"; - valign = "center"; - position = "0, 170"; - } - # Time - { - text = "cmd[update:200] date +'%r'"; - color = "rgb(f5a9b8)"; - font_size = 30; + { + text = "Hi there,"; + color = "rgb(5bcefa)"; + font_size = 25; - halign = "center"; - valign = "center"; - position = "0, 100"; - } - # Date - { - text = "cmd[update:1000] date +'%a, %x'"; - color = "rgb(5bcefa)"; - font_size = 20; - - halign = "center"; - valign = "center"; - position = "0, 50"; - } - { - text = "nyaa~"; - color = "rgb(f5a9b8)"; - font_size = 10; - - halign = "center"; - valign = "center"; - position = "0, 0"; - } - { - # text = "TRANS RIGHTS OR RIOT TRANSNIGHTS!"; - # text = "TRANS RIGHTS OR RIOT NIGHTS!"; - # color = "gradient(rgb(5bcefa) rgb(f5a9bb) rgb(ffffff) rgb(f5a9bb) rgb(5bcefa))"; - # text = "cmd[update:30000] echo \" $(cat /sys/class/power_supply/BAT0/capacity)\""; - text = (if config.host != "asmodeus" then "cmd[update:1000] echo \"$(for bat in /sys/class/power_supply/BAT*/capacity; do echo -n \" $(basename $(dirname \"$bat\")): $(cat \"$bat\")% \"; done)\"" else "asmodeus"); - font_size = 15; - - halign = "center"; - valign = "center"; - position = "0, -350"; - } - { - text = (if config.host != "asmodeus" then "cmd[update:1000] echo \"$(echo -n $(hostname))\"" else ""); - font_size = 15; + halign = "center"; + valign = "center"; + position = "0, 390"; + } + { + text = "cmd[update:100000] echo -n $USER"; + color = "rgb(f5a9b8)"; + font_size = 25; - halign = "center"; - valign = "center"; - position = "0, -400"; - } + halign = "center"; + valign = "center"; + position = "0, 170"; + } + # Time + { + text = "cmd[update:200] date +'%r'"; + color = "rgb(f5a9b8)"; + font_size = 30; + + halign = "center"; + valign = "center"; + position = "0, 100"; + } + # Date + { + text = "cmd[update:1000] date +'%a, %x'"; + color = "rgb(5bcefa)"; + font_size = 20; + + halign = "center"; + valign = "center"; + position = "0, 50"; + } + { + text = "nyaa~"; + color = "rgb(f5a9b8)"; + font_size = 10; + + halign = "center"; + valign = "center"; + position = "0, 0"; + } + { + # text = "TRANS RIGHTS OR RIOT TRANSNIGHTS!"; + # text = "TRANS RIGHTS OR RIOT NIGHTS!"; + # color = "gradient(rgb(5bcefa) rgb(f5a9bb) rgb(ffffff) rgb(f5a9bb) rgb(5bcefa))"; + # text = "cmd[update:30000] echo \" $(cat /sys/class/power_supply/BAT0/capacity)\""; + text = + if config.host != "asmodeus" + then "cmd[update:1000] echo \"$(for bat in /sys/class/power_supply/BAT*/capacity; do echo -n \" $(basename $(dirname \"$bat\")): $(cat \"$bat\")% \"; done)\"" + else "asmodeus"; + font_size = 15; + + halign = "center"; + valign = "center"; + position = "0, -350"; + } + { + text = + if config.host != "asmodeus" + then "cmd[update:1000] echo \"$(echo -n $(hostname))\"" + else ""; + font_size = 15; + + halign = "center"; + valign = "center"; + position = "0, -400"; + } ]; }; }; diff --git a/home/modules/zellij.nix b/home/modules/zellij.nix index b68d63f..0485300 100644 --- a/home/modules/zellij.nix +++ b/home/modules/zellij.nix @@ -9,81 +9,81 @@ url = "https://github.com/karimould/zellij-forgot/releases/download/0.4.1/zellij_forgot.wasm"; hash = "sha256-kBGZG+I9PMKhXtyAy6XRW4Sqht0/RCDcv86p0WjxvN8="; }; - xdg.configFile."zellij/layouts/default.kdl".text = '' layout { - default_tab_template { - children - pane size=1 borderless=true { - plugin location="file:${inputs.zjstatus.packages.x86_64-linux.default}/bin/zjstatus.wasm" { - color_bg "#0F1419" - color_fg "#E6E1CF" - color_fg_dim "#3E4B59" - color_red "#f07178" - color_orange "#ff8f40" - color_yellow "#ffb454" - color_pink "#d2a6ff" - color_blue "#59c2ff" - color_green "#b8cc52" + xdg.configFile."zellij/layouts/default.kdl".text = '' layout { + default_tab_template { + children + pane size=1 borderless=true { + plugin location="file:${inputs.zjstatus.packages.x86_64-linux.default}/bin/zjstatus.wasm" { + color_bg "#0F1419" + color_fg "#E6E1CF" + color_fg_dim "#3E4B59" + color_red "#f07178" + color_orange "#ff8f40" + color_yellow "#ffb454" + color_pink "#d2a6ff" + color_blue "#59c2ff" + color_green "#b8cc52" - color_trans_blue "#5bcefa" - color_trans_pink "#f5a9b8" - color_trans_white "#ffffff" + color_trans_blue "#5bcefa" + color_trans_pink "#f5a9b8" + color_trans_white "#ffffff" - format_left "#[bg=$bg] {mode} #[fg=$pink,bold] {command_hostname} #[bg=$trans_blue] #[bg=$trans_pink] #[bg=$trans_white] #[bg=$trans_pink] #[bg=$trans_blue] " - format_center "{tabs}" - format_right "{command_git_branch} {datetime}" - format_space "" + format_left "#[bg=$bg] {mode} #[fg=$pink,bold] {command_hostname} #[bg=$trans_blue] #[bg=$trans_pink] #[bg=$trans_white] #[bg=$trans_pink] #[bg=$trans_blue] " + format_center "{tabs}" + format_right "{command_git_branch} {datetime}" + format_space "" - border_enabled "true" - border_char "─" - border_format "#[fg=$pink]{char}" - border_position "top" + border_enabled "true" + border_char "─" + border_format "#[fg=$pink]{char}" + border_position "top" - hide_frame_for_single_pane "false" + hide_frame_for_single_pane "false" - mode_normal "#[bg=$green,fg=$fg_dim,bold] NORMAL " - mode_locked "#[bg=$red] LOCKED " - mode_tab "#[bg=$orange] TAB " - mode_session "#[bg=$orange] SESSION " - mode_pane "#[bg=$orange] PANE " - mode_search "#[bg=$blue] SEARCH " - mode_enter_search "#[bg=$blue] ENTER-SEARCH " - mode_move "#[bg=$orange] MOVE " - mode_rename_tab "#[bg=$blue] RENAME TAB " - mode_rename_pane "#[bg=$blue] RENAME PANE " + mode_normal "#[bg=$green,fg=$fg_dim,bold] NORMAL " + mode_locked "#[bg=$red] LOCKED " + mode_tab "#[bg=$orange] TAB " + mode_session "#[bg=$orange] SESSION " + mode_pane "#[bg=$orange] PANE " + mode_search "#[bg=$blue] SEARCH " + mode_enter_search "#[bg=$blue] ENTER-SEARCH " + mode_move "#[bg=$orange] MOVE " + mode_rename_tab "#[bg=$blue] RENAME TAB " + mode_rename_pane "#[bg=$blue] RENAME PANE " - tab_normal "#[fg=$fg_dim] {name} " - tab_normal_fullscreen "#[fg=$fg_dim] {name} [FULLSCREEN] " - tab_active "#[fg=$fg,bold,italic] {name} " - tab_active_fullscreen "#[fg=$fg,bold,italic] {name} [FULLSCREEN] " + tab_normal "#[fg=$fg_dim] {name} " + tab_normal_fullscreen "#[fg=$fg_dim] {name} [FULLSCREEN] " + tab_active "#[fg=$fg,bold,italic] {name} " + tab_active_fullscreen "#[fg=$fg,bold,italic] {name} [FULLSCREEN] " - command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=$fg_dim] {stdout} " - command_git_branch_interval "10" - command_git_branch_rendermode "static" + command_git_branch_command "git rev-parse --abbrev-ref HEAD" + command_git_branch_format "#[fg=$fg_dim] {stdout} " + command_git_branch_interval "10" + command_git_branch_rendermode "static" - command_hostname_command "bash -c 'hostname'" - command_hostname_format "#[fg=$pink] xqtc@{stdout}" - command_hostname_interval "0" - command_hostname_rendermode "static" + command_hostname_command "bash -c 'hostname'" + command_hostname_format "#[fg=$pink] xqtc@{stdout}" + command_hostname_interval "0" + command_hostname_rendermode "static" - // command_ram_usage_command "bash -c \"free -g | awk '/Mem:/ {print \\$3\\\"/\\\"\\$2 \\\" GiB\\\"}'\"" - // command_ram_usage_format "#[fg=$fg_dim]{stdout}" - // command_ram_usage_interval "5" - // command_ram_usage_rendermode "static" + // command_ram_usage_command "bash -c \"free -g | awk '/Mem:/ {print \\$3\\\"/\\\"\\$2 \\\" GiB\\\"}'\"" + // command_ram_usage_format "#[fg=$fg_dim]{stdout}" + // command_ram_usage_interval "5" + // command_ram_usage_rendermode "static" - // command_cpu_usage_command "bash -c \"top -bn1 | grep 'Cpu(s)' | awk '{print 100 - \\$8\\\"%\\\"}'\"" - // command_cpu_usage_format "#[fg=$fg_dim]{stdout}" - // command_cpu_usage_interval "5" - // command_cpu_usage_rendermode "static" + // command_cpu_usage_command "bash -c \"top -bn1 | grep 'Cpu(s)' | awk '{print 100 - \\$8\\\"%\\\"}'\"" + // command_cpu_usage_format "#[fg=$fg_dim]{stdout}" + // command_cpu_usage_interval "5" + // command_cpu_usage_rendermode "static" - datetime "#[fg=$fg_dim,bold] {format} " - datetime_format "%A, %d %b %Y %H:%M:%S" - datetime_timezone "Europe/Berlin" - } - } - } - }''; + datetime "#[fg=$fg_dim,bold] {format} " + datetime_format "%A, %d %b %Y %H:%M:%S" + datetime_timezone "Europe/Berlin" + } + } + } + }''; programs.zellij = { enable = true; enableZshIntegration = true; diff --git a/hosts/x86_64-linux/asmodeus/default.nix b/hosts/x86_64-linux/asmodeus/default.nix index 7e28bb7..d9a242e 100644 --- a/hosts/x86_64-linux/asmodeus/default.nix +++ b/hosts/x86_64-linux/asmodeus/default.nix @@ -47,6 +47,9 @@ }; nixpkgs.config.allowUnfree = true; + + services.tailscale.extraSetFlags = ["--advertise-exit-node" "--webclient=true"]; + boot.binfmt.emulatedSystems = ["aarch64-linux"]; hardware.graphics = { diff --git a/justfile b/justfile index 068d595..2e7e4f2 100644 --- a/justfile +++ b/justfile @@ -36,7 +36,7 @@ beleth-non-nixos: website: #!/usr/bin/env bash set -euxo pipefail - ssh {{beleth-user-host}} "cd && cd nixos-config && git pull && cd && cd /var/www/website/ && git pull && cd && sh build_website.sh"; + ssh {{beleth-user-host}} "cd && cd nixos-config-https && git pull && cd && cd /var/www/website/ && git pull && cd && sh build_website.sh"; exit update: diff --git a/modules/home-manager.nix b/modules/home-manager.nix index dd7e9e2..955ad7d 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -18,6 +18,7 @@ in { inherit inputs; inherit dwl-source; }; + nixpkgs.overlays = [inputs.hyprpanel.overlay ]; home-manager.users.xqtc = {...}: { imports = [ {config.host = config.networking.hostName;}