Compare commits
1
Commits
main
..
9169630b43
| Author | SHA1 | Date | |
|---|---|---|---|
 soraefir
|
9169630b43 |
@@ -15,13 +15,13 @@ jobs:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
- name: Install nix
|
||||
uses: DeterminateSystems/nix-installer-action@v23
|
||||
uses: DeterminateSystems/nix-installer-action@v22
|
||||
with:
|
||||
github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
||||
extra_nix_config: |
|
||||
experimental-features = nix-command flakes
|
||||
- name: Update flake.lock
|
||||
uses: DeterminateSystems/update-flake-lock@v29
|
||||
uses: DeterminateSystems/update-flake-lock@v28
|
||||
with:
|
||||
token: ${{ secrets.GT_TOKEN_FOR_UPDATES }}
|
||||
pr-title: "[chore] Update flake.lock"
|
||||
|
||||
Generated
+94
-48
@@ -23,11 +23,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786845137,
|
||||
"narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=",
|
||||
"lastModified": 1779036909,
|
||||
"narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48",
|
||||
"rev": "56c666e108467d87d13508936aade6d567f2a501",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -55,14 +55,17 @@
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
"nixpkgs-lib": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772408722,
|
||||
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -71,16 +74,34 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hardware": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1791373788,
|
||||
"narHash": "sha256-c3oMt0QoE+4yiRk6u1m2L9ogjaUw0uTGn9yk808KkgE=",
|
||||
"lastModified": 1780065812,
|
||||
"narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "4bc63156b109ee7b4103e3ec30565c8c92bde435",
|
||||
"rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -96,11 +117,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1790996401,
|
||||
"narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
|
||||
"lastModified": 1779726825,
|
||||
"narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
|
||||
"rev": "b179bde238977f7d4454fc770b1a727eaf55111c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -131,11 +152,11 @@
|
||||
},
|
||||
"nixUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1791487292,
|
||||
"narHash": "sha256-tqM7xDEsaeK1p6VvRygeZ9LkQRpUUkbRT02BHv6hnTM=",
|
||||
"lastModified": 1780030872,
|
||||
"narHash": "sha256-u6WU/yd/o8iYQrHX3RAwO1hYa3LkoSL+WNQD0rJfJZQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8edc0c72e3a38faf5434e40d1f19431125fe4b30",
|
||||
"rev": "e9a7635a57597d9754eccebdfc7045e6c8600e6b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -153,11 +174,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1789164534,
|
||||
"narHash": "sha256-DoYGPM6QpnYBLWj9gGw6ZwAzIX+HrAVov1BoT+8Jixo=",
|
||||
"lastModified": 1780169171,
|
||||
"narHash": "sha256-3HBYDfBgZ+ph52HS6Ks/bMMwuh2uONIT72sZ1CtLE/s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-wsl",
|
||||
"rev": "72c92b11bb8289e6651c7fef29cc0a885fd6a255",
|
||||
"rev": "998b2821c30b2938637230916904ceb8757c79e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -168,11 +189,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1789546076,
|
||||
"narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
|
||||
"rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
|
||||
"lastModified": 1767892417,
|
||||
"narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
|
||||
"rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -194,28 +215,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1772328832,
|
||||
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1791426274,
|
||||
"narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=",
|
||||
"lastModified": 1780203844,
|
||||
"narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7c8764b7c7b09b34f632464276218ef9090eaa11",
|
||||
"rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -225,6 +231,27 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780265777,
|
||||
"narHash": "sha256-t/KORFHEv8Jn2vFmVfv4Zffekv+MUogI2KgtxuCcEmQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "39917b7f68263188707925ffe26c9df6ef4e7d64",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
@@ -234,6 +261,7 @@
|
||||
"nixUnstable": "nixUnstable",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nur": "nur",
|
||||
"sops-nix": "sops-nix",
|
||||
"vscode-server": "vscode-server"
|
||||
}
|
||||
@@ -245,11 +273,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1791639265,
|
||||
"narHash": "sha256-51gxD0eLcJkxH2TYdhE+Qsf04yg3PRV7anCAqOFX70E=",
|
||||
"lastModified": 1777944972,
|
||||
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "a8be3b14935d3532604c51c8dfe3021c73d1a885",
|
||||
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -258,16 +286,34 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vscode-server": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts"
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1784312229,
|
||||
"narHash": "sha256-2uHCSUw341o3my1R0U0YCfbnMEazylxb58evWsjGL50=",
|
||||
"lastModified": 1770124655,
|
||||
"narHash": "sha256-yHmd2B13EtBUPLJ+x0EaBwNkQr9LTne1arLVxT6hSnY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-vscode-server",
|
||||
"rev": "2f984dfbe7e5271b5c413d3e734374cc1306c921",
|
||||
"rev": "92ce71c3ba5a94f854e02d57b14af4997ab54ef0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -5,6 +5,11 @@
|
||||
nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||
hardware.url = "github:nixos/nixos-hardware";
|
||||
nur = {
|
||||
url = "github:nix-community/nur";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-26.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@@ -27,20 +32,35 @@
|
||||
|
||||
vscode-server = {
|
||||
url = "github:nix-community/nixos-vscode-server";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = inputs:
|
||||
outputs =
|
||||
inputs:
|
||||
let
|
||||
lib = inputs.nixpkgs.lib;
|
||||
linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
|
||||
supportedSystems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];
|
||||
supportedSystems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
linuxSystems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
forEachSystem = lib.genAttrs;
|
||||
overlays = import ./overlays { inherit inputs; };
|
||||
mkPkgs = system:
|
||||
mkPkgs =
|
||||
system:
|
||||
import inputs.nixpkgs {
|
||||
inherit system;
|
||||
inherit overlays;
|
||||
overlays = overlays ++ [
|
||||
(final: prev: {
|
||||
custom = import ./packages { pkgs = final; };
|
||||
})
|
||||
];
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
gen = import ./generator.nix { inherit inputs mkPkgs supportedSystems; };
|
||||
@@ -54,14 +74,40 @@
|
||||
&& builtins.pathExists (systemsDir + "/${name}/cfg.nix")
|
||||
) (builtins.readDir systemsDir)
|
||||
);
|
||||
hostsByType = systemType:
|
||||
lib.filter (host: ((import (systemsDir + "/${host}/cfg.nix")).syscfg.type or "nixos") == systemType) systemNames;
|
||||
generateHosts = systemType:
|
||||
lib.genAttrs (hostsByType systemType) (host: gen.generate { inherit host; });
|
||||
in {
|
||||
hostsByType =
|
||||
systemType:
|
||||
lib.filter (host: (import (systemsDir + "/${host}/cfg.nix")).syscfg.type == systemType) systemNames;
|
||||
generateHosts =
|
||||
systemType: lib.genAttrs (hostsByType systemType) (host: gen.generate { inherit host; });
|
||||
flattenPackages =
|
||||
prefix: attrs:
|
||||
lib.concatMapAttrs (
|
||||
name: value:
|
||||
let
|
||||
packageName = lib.concatStringsSep "-" (prefix ++ [ name ]);
|
||||
defaultPackageName = lib.concatStringsSep "-" prefix;
|
||||
in
|
||||
if lib.isDerivation value then
|
||||
{
|
||||
"${if name == "default" && prefix != [ ] then defaultPackageName else packageName}" = value;
|
||||
}
|
||||
else if lib.isAttrs value then
|
||||
flattenPackages (if name == "default" then prefix else prefix ++ [ name ]) value
|
||||
else
|
||||
{ }
|
||||
) attrs;
|
||||
mkPackages =
|
||||
system:
|
||||
let
|
||||
pkgs = mkPkgs system;
|
||||
in
|
||||
lib.optionalAttrs pkgs.stdenv.isLinux (flattenPackages [ ] pkgs.custom);
|
||||
in
|
||||
{
|
||||
packages = forEachSystem linuxSystems mkPackages;
|
||||
devShells = import ./shells {
|
||||
inherit inputs mkPkgs;
|
||||
systems = linuxSystems;
|
||||
supportedSystems = linuxSystems;
|
||||
};
|
||||
|
||||
nixosConfigurations = generateHosts "nixos";
|
||||
|
||||
+67
-52
@@ -1,6 +1,12 @@
|
||||
{ inputs, mkPkgs, supportedSystems, ... }:
|
||||
{
|
||||
generate = { host }:
|
||||
inputs,
|
||||
mkPkgs,
|
||||
supportedSystems,
|
||||
...
|
||||
}:
|
||||
{
|
||||
generate =
|
||||
{ host }:
|
||||
let
|
||||
syscfg = import ./systems/${host}/cfg.nix;
|
||||
nameValuePair = name: value: { inherit name value; };
|
||||
@@ -12,16 +18,40 @@
|
||||
home = "x86_64-linux";
|
||||
}
|
||||
.${systemType} or (throw "Unsupported system type: ${systemType}");
|
||||
requestedSystem = syscfg.syscfg.system or defaultSystem;
|
||||
system =
|
||||
if builtins.elem requestedSystem supportedSystems then
|
||||
requestedSystem
|
||||
system = syscfg.syscfg.system or defaultSystem;
|
||||
checkedSystem =
|
||||
if builtins.elem system supportedSystems then
|
||||
system
|
||||
else
|
||||
throw "Unsupported system '${requestedSystem}' for host '${host}'";
|
||||
users = syscfg.syscfg.users or [ ];
|
||||
mkLinuxHomeImports =
|
||||
throw "Unsupported system '${system}' for host '${host}'";
|
||||
pkgs = mkPkgs checkedSystem;
|
||||
in
|
||||
(
|
||||
{
|
||||
"nixos" = inputs.nixpkgs.lib.nixosSystem {
|
||||
system = checkedSystem;
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./modules/shared/syscfg
|
||||
./modules/shared/sops
|
||||
./modules/nixos
|
||||
syscfg
|
||||
./systems/${host}
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
|
||||
inputs.nixos-wsl.nixosModules.wsl
|
||||
inputs.vscode-server.nixosModules.default
|
||||
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users = builtins.listToAttrs (
|
||||
map (
|
||||
userConfig:
|
||||
[
|
||||
nameValuePair userConfig.username {
|
||||
imports = [
|
||||
./modules/shared/syscfg
|
||||
./modules/shared/colors
|
||||
./modules/home
|
||||
@@ -30,58 +60,43 @@
|
||||
inputs.nix-colors.homeManagerModule
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
];
|
||||
mkDarwinHomeImports = [ inputs.nix-colors.homeManagerModule inputs.sops-nix.homeManagerModules.sops ];
|
||||
mkHomeUsers = importsForUser:
|
||||
builtins.listToAttrs (
|
||||
map (userConfig: nameValuePair userConfig.username { imports = importsForUser userConfig; }) users
|
||||
}
|
||||
) (syscfg.syscfg.users or [ ])
|
||||
);
|
||||
mkHomeManager = importsForUser: {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users = mkHomeUsers importsForUser;
|
||||
};
|
||||
sharedModules = [
|
||||
./modules/shared/syscfg
|
||||
./modules/shared/sops
|
||||
syscfg
|
||||
./systems/${host}
|
||||
];
|
||||
defaultUser =
|
||||
builtins.head (
|
||||
builtins.filter (user: user.username == syscfg.syscfg.defaultUser) users
|
||||
++ [ { username = syscfg.syscfg.defaultUser; } ]
|
||||
);
|
||||
in
|
||||
(
|
||||
{
|
||||
"nixos" = inputs.nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = sharedModules ++ [
|
||||
./modules/nixos
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
|
||||
inputs.nixos-wsl.nixosModules.wsl
|
||||
inputs.vscode-server.nixosModules.default
|
||||
|
||||
(mkHomeManager mkLinuxHomeImports)
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
"macos" = inputs.darwin.lib.darwinSystem {
|
||||
inherit system;
|
||||
modules = sharedModules ++ [
|
||||
system = checkedSystem;
|
||||
modules = [
|
||||
./modules/shared/syscfg
|
||||
./modules/shared/sops
|
||||
syscfg
|
||||
./systems/${host}
|
||||
inputs.sops-nix.darwinModules.sops
|
||||
inputs.home-manager.darwinModules.home-manager
|
||||
(mkHomeManager (_: mkDarwinHomeImports))
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users = builtins.listToAttrs (
|
||||
map (
|
||||
userConfig:
|
||||
nameValuePair userConfig.username {
|
||||
imports = [
|
||||
inputs.nix-colors.homeManagerModule
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
];
|
||||
}
|
||||
) (syscfg.syscfg.users or [ ])
|
||||
);
|
||||
}
|
||||
];
|
||||
};
|
||||
"home" = inputs.home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = mkPkgs system;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
modules = mkLinuxHomeImports defaultUser;
|
||||
inherit pkgs;
|
||||
modules = [ ./modules/home ];
|
||||
};
|
||||
_ = throw "Unsupported system";
|
||||
}
|
||||
|
||||
@@ -1,17 +1,12 @@
|
||||
{ lib, config, pkgs, ... }: {
|
||||
imports = [ ./network-watchdog.nix ];
|
||||
{ lib, config, ... }: {
|
||||
|
||||
#environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
|
||||
systemd.user.startServices = lib.mkIf pkgs.stdenv.isLinux "sd-switch";
|
||||
systemd.user.startServices = "sd-switch";
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
home = {
|
||||
username = "${config.usercfg.username}";
|
||||
homeDirectory =
|
||||
if pkgs.stdenv.isDarwin then
|
||||
"/Users/${config.usercfg.username}"
|
||||
else
|
||||
"/home/${config.usercfg.username}";
|
||||
homeDirectory = "/home/${config.usercfg.username}";
|
||||
|
||||
stateVersion = "26.05";
|
||||
};
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.network-watchdog;
|
||||
watchdog = "${pkgs.custom.network-watchdog}/bin/network-watchdog";
|
||||
units = map (name: "${name}.service") cfg.units;
|
||||
in {
|
||||
# User services that only make sense while online: GUI clients that hold a
|
||||
# socket to a server (jellyfin-mpv-shim, nextcloud-client). Their upstream
|
||||
# units have no network ordering (network-online.target is a system target,
|
||||
# out of reach for user units), so they happily start while offline —
|
||||
# silently dead — and nothing notices a connection dropped by a network
|
||||
# blip. Gate each start on the network being up, restart on failure, and let
|
||||
# a watchdog catch the "up but not connected" state that systemd can't see.
|
||||
# See pkgs.custom.network-watchdog.
|
||||
options.services.network-watchdog.units = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [ "jellyfin-mpv-shim" ];
|
||||
description = "User services (no .service suffix) to gate on the network and keep connected.";
|
||||
};
|
||||
|
||||
config = lib.mkIf (cfg.units != [ ]) {
|
||||
systemd.user.services = lib.genAttrs cfg.units (name: {
|
||||
Service = {
|
||||
ExecStartPre = "${watchdog} wait-online ${name}.service";
|
||||
TimeoutStartSec = "infinity"; # stay in start-pre until the network is back
|
||||
Restart = lib.mkDefault "on-failure";
|
||||
RestartSec = lib.mkDefault 5;
|
||||
};
|
||||
}) // {
|
||||
network-watchdog = {
|
||||
Unit = {
|
||||
Description = "Restart network services that are up but not connected";
|
||||
After = units;
|
||||
};
|
||||
Service = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${watchdog} check ${lib.concatStringsSep " " units}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.timers.network-watchdog = {
|
||||
Unit.Description = "Periodic health check for network services";
|
||||
Timer = {
|
||||
OnActiveSec = "60s";
|
||||
OnUnitActiveSec = "60s";
|
||||
};
|
||||
Install.WantedBy = [ "timers.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -28,7 +28,7 @@ let
|
||||
logoColor1 = p.base07;
|
||||
logoColor2 = p.base07;
|
||||
# ─────────────────────────────────────────────────────────────────────────
|
||||
in lib.mkIf config.syscfg.make.gui {
|
||||
in {
|
||||
home.packages = with pkgs; [ fastfetch ];
|
||||
xdg.configFile."neofetch/config.conf".source = ./config.conf;
|
||||
xdg.configFile."fastfetch/logo.txt".source = ./logo.txt;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ config, lib, ... }: {
|
||||
programs.kitty = lib.mkIf config.syscfg.make.gui {
|
||||
{ config, ... }: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
foreground = "#${config.colorScheme.palette.base07}";
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
ripgrep
|
||||
unzip
|
||||
|
||||
socat
|
||||
|
||||
appimage-run
|
||||
|
||||
cbonsai
|
||||
pipes-rs
|
||||
cmatrix
|
||||
#cava
|
||||
sl
|
||||
] ++ lib.optionals (config.syscfg.make.gui || config.syscfg.make.develop) [
|
||||
pkgs.appimage-run
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,22 +1,18 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
exts = with pkgs.vscode-extensions; [
|
||||
bbenoist.nix
|
||||
esbenp.prettier-vscode
|
||||
|
||||
anthropic.claude-code
|
||||
# openai.codex
|
||||
];
|
||||
in {
|
||||
{ lib, config, pkgs, ... }: {
|
||||
|
||||
config = lib.mkIf (config.syscfg.make.develop) {
|
||||
programs.vscodium = {
|
||||
enable = true;
|
||||
profiles.default.extensions = exts;
|
||||
};
|
||||
programs.antigravity = {
|
||||
enable = true;
|
||||
profiles.default.extensions = exts;
|
||||
#profiles.default = {
|
||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.nix
|
||||
esbenp.prettier-vscode
|
||||
golang.go
|
||||
ms-python.vscode-pylance
|
||||
ms-vscode.cpptools
|
||||
dbaeumer.vscode-eslint
|
||||
];
|
||||
#};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,9 +4,8 @@
|
||||
programs.imv.enable = true;
|
||||
|
||||
programs.obs-studio.enable = true;
|
||||
services.jellyfin-mpv-shim.enable = true;
|
||||
|
||||
home.packages = with pkgs; [ krita gimp darktable ];
|
||||
home.packages = with pkgs; [ jellyfin-mpv-shim krita gimp darktable ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -6,11 +6,13 @@ in{
|
||||
config = lib.mkIf (config.syscfg.make.gui) {
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
scripts = with pkgs.mpvScripts; [ mpris ];
|
||||
scripts = with pkgs.mpvScripts; [ mpris modernz ];
|
||||
config = {
|
||||
hwdec ="auto";
|
||||
profile ="high-quality";
|
||||
ytdl-format = "bestvideo+bestaudio";
|
||||
osc ="no";
|
||||
|
||||
};
|
||||
|
||||
bindings =
|
||||
@@ -81,7 +83,5 @@ in{
|
||||
};
|
||||
|
||||
programs.yt-dlp.enable = true;
|
||||
|
||||
services.network-watchdog.units = [ "jellyfin-mpv-shim" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
{ lib, config, ... }: {
|
||||
|
||||
config = lib.mkIf (config.syscfg.make.gui) {
|
||||
services.easyeffects.enable = true;
|
||||
|
||||
xdg.configFile."pipewire/pipewire-pulse.conf.d/desktop.conf".text = ''
|
||||
context.modules = [
|
||||
{ name = libpipewire-module-loopback
|
||||
|
||||
@@ -1,25 +1,7 @@
|
||||
{ lib, config, pkgs, ... }: {
|
||||
|
||||
config = lib.mkIf (config.syscfg.make.gui) {
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
};
|
||||
services.network-watchdog.units = [ "nextcloud-client" ];
|
||||
|
||||
systemd.user.services.keepassxc = lib.mkIf (config.usercfg.wm != "X11") {
|
||||
Unit = {
|
||||
Description = "KeePassXC";
|
||||
After = [ "graphical-session.target" ];
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${pkgs.keepassxc}/bin/keepassxc";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
services.nextcloud-client.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
thunar
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
# custom.simc
|
||||
instawow
|
||||
unstable.instawow
|
||||
];
|
||||
|
||||
# templates buggy currently
|
||||
|
||||
@@ -34,10 +34,3 @@
|
||||
.bt-device-btn:hover { @include background-active; }
|
||||
.net-toggle-on, .bt-btn-on { @include color-base; }
|
||||
.net-toggle-off, .bt-btn-off { @include color-inactive; }
|
||||
|
||||
// WireGuard
|
||||
.wg-accent { background-color: $base0E; }
|
||||
.wg-row { margin-bottom: $popup-scale * 4pt; }
|
||||
.wg-name { font-size: 0.78em; font-weight: bold; }
|
||||
.wg-up { @include color-base; }
|
||||
.wg-down { @include color-inactive; }
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
.cpubar { color: $base0C; }
|
||||
.gpubar { color: $base0E; }
|
||||
.membar { color: $base08; }
|
||||
.batbar { color: $base0A; } // overridden by .bat-<state> below
|
||||
.batbar { color: $base0B; }
|
||||
.cpubar, .gpubar, .membar, .batbar { @include background-base2; margin: $gaps-window 0; }
|
||||
|
||||
// Window chrome
|
||||
@@ -66,9 +66,7 @@
|
||||
.gpu-ring-label, .vram-usage-label, .swap-section-label { margin-top: 2pt; }
|
||||
|
||||
.cpu-core-label { font-size: 0.7em; @include color-active; }
|
||||
.bat-ring-label { font-size: 0.85em; font-weight: bold; @include color-body; }
|
||||
.bat-stat-value { font-size: 1.05em; font-weight: bold; @include color-body; }
|
||||
.bat-stat-label { font-size: 0.62em; margin-top: 2pt; @include color-active; }
|
||||
.bat-ring-label { font-size: 0.7em; @include color-body; }
|
||||
.ram-total-label { font-size: 0.72em; @include color-active; }
|
||||
|
||||
// GPU stats row
|
||||
@@ -93,19 +91,3 @@
|
||||
background-color: transparent;
|
||||
margin: $popup-scale * 4pt;
|
||||
}
|
||||
|
||||
// Battery colour by state (scripts/sys/battery → .bat-<state>):
|
||||
// light blue on mains (charging / full / idle), on battery green, orange below
|
||||
// 25 %, red at ≤15 %
|
||||
.batbar, .bat-ring { color: $base0A; }
|
||||
.bat-charging, .bat-full, .bat-idle { color: $base0B; }
|
||||
.bat-low { color: $base08; }
|
||||
.bat-critical { color: $base0F; }
|
||||
|
||||
// Battery history plot: one vertical bar per bucket, same colours as the ring
|
||||
.bat-hist { min-height: 44px; margin-top: $popup-scale * 8pt; }
|
||||
.bat-hist-bar { @include background-base2; margin: 0 2px; }
|
||||
.bat-hist-bar trough * { background-color: $base0A; }
|
||||
.hist-charging trough *, .hist-idle trough * { background-color: $base0B; }
|
||||
.hist-low trough * { background-color: $base08; }
|
||||
.hist-critical trough * { background-color: $base0F; }
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
(defvar date_rev false)
|
||||
|
||||
; EWW_TIME ticks every second inside the daemon, so no shell poll is needed.
|
||||
(defwidget clock-mod []
|
||||
(module
|
||||
(eventbox
|
||||
:onhover "${EWW_CMD} --no-daemonize update date_rev=true"
|
||||
:onhoverlost "${EWW_CMD} --no-daemonize update date_rev=false"
|
||||
:onclick "scripts/panel-toggle clock"
|
||||
:onrightclick "scripts/powermenu-toggle"
|
||||
:onhover "${EWW_CMD} update date_rev=true"
|
||||
:onhoverlost "${EWW_CMD} update date_rev=false"
|
||||
:onclick "(sleep 0.1 && scripts/panel-toggle clock)"
|
||||
:onrightclick "(sleep 0.1 && scripts/powermenu-toggle)"
|
||||
(box
|
||||
:class "datetime"
|
||||
(overlay
|
||||
@@ -15,24 +14,27 @@
|
||||
:orientation "v"
|
||||
(label :show-truncated false
|
||||
:class "hour"
|
||||
:text {formattime(EWW_TIME, "%H")})
|
||||
:text {time.hour})
|
||||
(label :show-truncated false
|
||||
:class "minute"
|
||||
:text {formattime(EWW_TIME, "%M")}))
|
||||
:text {time.minute}))
|
||||
(revealer
|
||||
:reveal date_rev
|
||||
(box
|
||||
:class "date"
|
||||
:orientation "v"
|
||||
(label :show-truncated false
|
||||
(label :show-truncated "false"
|
||||
:class "day"
|
||||
:text {formattime(EWW_TIME, "%d")})
|
||||
(label :show-truncated false
|
||||
:text {time.day})
|
||||
(label :show-truncated "false"
|
||||
:class "month"
|
||||
:text {formattime(EWW_TIME, "%m")}))
|
||||
:text {time.month}))
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
(defpoll time :interval "15s" "date '+{\"hour\":\"%H\",\"minute\":\"%M\",\"day\":\"%d\",\"month\":\"%m\"}'")
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
(deflisten net
|
||||
:initial '{"wifi":{"connected":false,"enabled":false,"icon":"","ssid":"","ip":"","freq":0,"band":"","gen":"","signal":0},"ethernet":{"connected":false,"interface":"","ip":"","speed":""},"usb":{"connected":false,"interface":"","ip":""},"wireguard":[],"vpn":{"up":false,"name":""}}'
|
||||
:initial '{"wifi":{"connected":false,"enabled":false,"icon":"","ssid":""},"ethernet":{"connected":false},"usb":{"connected":false}}'
|
||||
"scripts/net/net")
|
||||
|
||||
(deflisten bt
|
||||
:initial '{"powered":false,"connected":false,"device":"","devices":[]}'
|
||||
"scripts/net/bt")
|
||||
(deflisten bluetooth
|
||||
:initial '{"powered":false,"connected":false,"device":""}'
|
||||
"scripts/net/bluetooth")
|
||||
|
||||
(defwidget net-mod []
|
||||
(module
|
||||
(eventbox
|
||||
:onclick "scripts/panel-toggle net"
|
||||
:onclick "(sleep 0.1 && scripts/panel-toggle net)"
|
||||
(box :orientation "v"
|
||||
(label
|
||||
:class "net-icon ${net.ethernet.connected ? 'net-active' : 'net-dim'}"
|
||||
@@ -20,16 +20,11 @@
|
||||
:class "net-icon net-active"
|
||||
:tooltip "USB: Connected"
|
||||
:text "")
|
||||
(label
|
||||
:visible {net.vpn.up}
|
||||
:class "net-icon net-active"
|
||||
:tooltip "VPN: ${net.vpn.name}"
|
||||
:text "")
|
||||
(label
|
||||
:class "net-icon ${net.wifi.connected ? 'net-active' : 'net-dim'}"
|
||||
:tooltip {net.wifi.connected ? "WiFi: ${net.wifi.ssid}" : "WiFi: Disconnected"}
|
||||
:text {net.wifi.icon})
|
||||
(label
|
||||
:class "net-icon ${bt.connected ? 'blt-connected' : bt.powered ? 'blt-on' : 'net-dim'}"
|
||||
:tooltip {bt.connected ? "Bluetooth: ${bt.device}" : bt.powered ? "Bluetooth: On" : "Bluetooth: Off"}
|
||||
:text {bt.connected ? "" : bt.powered ? "" : ""})))))
|
||||
:class "net-icon ${bluetooth.connected ? 'blt-connected' : bluetooth.powered ? 'blt-on' : 'net-dim'}"
|
||||
:tooltip {bluetooth.connected ? "Bluetooth: ${bluetooth.device}" : bluetooth.powered ? "Bluetooth: On" : "Bluetooth: Off"}
|
||||
:text {bluetooth.connected ? "" : bluetooth.powered ? "" : ""})))))
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
(deflisten gpu :initial '{"gfx_pct":0,"mem_pct":0,"media_pct":0,"sclk":0,"mclk":0,"sclk_pct":0,"mclk_pct":0,"vclk":0,"vclk_pct":0,"temp":0,"power":0,"vram_used":0,"vram_total":1}' "scripts/sys/gpu")
|
||||
(deflisten memory :initial '{"total":1,"used":0,"cached":0,"human":{"total":"0G","used":"0G","cached":"0G"},"swap":{"total":0,"used":0,"human":{"total":"0G","used":"0G"}}}' "scripts/sys/memory")
|
||||
(deflisten memory :initial '{"human":{"used":"0G","total":"0G","cached":"0G"},"used":0.0,"total":1.0,"cached":0.0}' "scripts/sys/memory")
|
||||
|
||||
; state: charging | discharging | low (<25%) | critical (≤15%) | full | idle | none — styled via .bat-<state>
|
||||
; history: 6 h of {t, p, s} buckets (p = -1 when empty)
|
||||
(deflisten battery :initial '{"visible":false,"percentage":0,"wattage":"","status":"","time":"","state":"none","rate":"","history":[]}' "scripts/sys/battery")
|
||||
(deflisten battery :initial '{"visible":false,"percentage":0.0,"color":"#FFFFFF"}' "scripts/sys/battery")
|
||||
|
||||
(defwidget sys-mod []
|
||||
(module
|
||||
(eventbox
|
||||
:onclick "scripts/panel-toggle sys"
|
||||
:onclick "(sleep 0.1 && scripts/panel-toggle sys)"
|
||||
(box :orientation "v"
|
||||
(circular-progress
|
||||
:value {EWW_CPU.avg}
|
||||
@@ -27,7 +25,8 @@
|
||||
:tooltip "RAM ${memory.human.used} / ${memory.human.total}")
|
||||
(circular-progress
|
||||
:value {battery.percentage}
|
||||
:class "batbar bat-${battery.state}"
|
||||
:class "batbar"
|
||||
:visible {battery.visible}
|
||||
:style "color: ${battery.color};"
|
||||
:width 28 :height 28 :thickness 6
|
||||
:tooltip "Bat ${round(battery.percentage, 0)}% · ${battery.status} @ ${battery.wattage}")))))
|
||||
|
||||
@@ -1,99 +0,0 @@
|
||||
# ---------------------------------------------------------------------------
|
||||
# Shared helpers for the bar scripts. default.nix inlines this file at the
|
||||
# top of every wrapped script, right after setting PATH.
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
# Every eww client call goes through this wrapper. A client waits only 100 ms
|
||||
# for the daemon's reply; a slower command (opening the popup) would otherwise
|
||||
# make a plain `eww open` fork a second daemon that takes over the socket —
|
||||
# the "two bars" bug. With --no-daemonize it is just an error, and the daemon
|
||||
# still carries out the command.
|
||||
eww() { command eww --no-daemonize "$@"; }
|
||||
|
||||
# Print the payload only when it differs from the previous one.
|
||||
emit() {
|
||||
[[ $1 == "${EMIT_LAST-}" ]] && return 0
|
||||
EMIT_LAST=$1
|
||||
printf '%s\n' "$1"
|
||||
}
|
||||
|
||||
# Escape a value for use inside a JSON string literal.
|
||||
jstr() {
|
||||
local s=$1
|
||||
s=${s//\\/\\\\}
|
||||
s=${s//\"/\\\"}
|
||||
s=${s//$'\n'/\\n}
|
||||
s=${s//$'\t'/\\t}
|
||||
printf '%s' "$s"
|
||||
}
|
||||
|
||||
# Run a command outside eww's cgroup so a daemon restart cannot kill it
|
||||
# (hyprlock, wlsunset, mpv, satty…). With -u NAME the transient unit gets a
|
||||
# fixed name that `systemctl --user stop NAME` can address later.
|
||||
# detach [-u NAME] CMD ARGS...
|
||||
detach() {
|
||||
local unit=() cmd
|
||||
if [[ $1 == -u ]]; then unit=(--unit "$2"); shift 2; fi
|
||||
cmd=$(command -v "$1") || { echo "detach: $1 not found" >&2; return 1; }
|
||||
shift
|
||||
systemd-run --user --collect --quiet "${unit[@]}" -- "$cmd" "$@"
|
||||
}
|
||||
|
||||
# eww kills a click handler that has not returned within the widget's
|
||||
# :timeout (200 ms) — less than the eww client calls most handlers make
|
||||
# (~50 ms each), let alone bluetoothctl or a station list fetch. Re-run
|
||||
# this script detached and return at once. Call it with the original
|
||||
# arguments, before anything with side effects.
|
||||
# detach_self "$@"
|
||||
detach_self() {
|
||||
[[ -n ${EWW_DETACHED-} ]] && return 0
|
||||
EWW_DETACHED=1 setsid -f "$0" "$@"
|
||||
exit 0
|
||||
}
|
||||
|
||||
# Event multiplexer for listener scripts. Producers run in the background
|
||||
# and write one line per event into a fifo; the main loop re-evaluates the
|
||||
# state on every event, coalescing bursts into a single refresh.
|
||||
#
|
||||
# mux_init
|
||||
# mux_add FUNC [ARGS] run FUNC in the background, stdout → fifo
|
||||
# mux_tick SECONDS periodic wake-up
|
||||
# mux_loop HANDLER HANDLER LINE... for every burst (never returns)
|
||||
#
|
||||
# eww terminates a listener by sending SIGTERM to its whole process group, so
|
||||
# the producers die together with the script. The EXIT trap only removes the
|
||||
# fifo — it must never `kill 0`: that signals the shell itself, which
|
||||
# re-enters the trap recursively until bash overflows its stack (the
|
||||
# bash/volume coredumps in the journal of the previous version).
|
||||
mux_init() {
|
||||
MUX_DIR=$(mktemp -d "${XDG_RUNTIME_DIR:-/tmp}/eww-mux.XXXXXX")
|
||||
MUX_FIFO=$MUX_DIR/events
|
||||
MUX_PIDS=()
|
||||
mkfifo "$MUX_FIFO"
|
||||
# Open read+write once: never blocks, and readers never see EOF.
|
||||
exec {MUX_FD}<>"$MUX_FIFO"
|
||||
trap 'mux_cleanup' EXIT
|
||||
}
|
||||
|
||||
mux_cleanup() {
|
||||
trap - EXIT
|
||||
((${#MUX_PIDS[@]})) && kill "${MUX_PIDS[@]}" 2>/dev/null
|
||||
rm -rf "$MUX_DIR"
|
||||
}
|
||||
|
||||
mux_add() {
|
||||
"$@" >&"$MUX_FD" 2>/dev/null &
|
||||
MUX_PIDS+=("$!")
|
||||
}
|
||||
|
||||
_mux_ticker() { while sleep "$1"; do echo tick; done; }
|
||||
mux_tick() { mux_add _mux_ticker "$1"; }
|
||||
|
||||
mux_loop() {
|
||||
local handler=$1 line lines
|
||||
while IFS= read -r -u "$MUX_FD" line; do
|
||||
lines=("$line")
|
||||
while IFS= read -r -t 0.15 -u "$MUX_FD" line; do lines+=("$line"); done
|
||||
"$handler" "${lines[@]}"
|
||||
done
|
||||
}
|
||||
@@ -1,19 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
# rfkill everything (wifi + bluetooth); "active" means the wifi is soft-blocked.
|
||||
active() { rfkill list wifi 2>/dev/null | grep -q "Soft blocked: yes"; }
|
||||
is_active() {
|
||||
rfkill list wifi 2>/dev/null | grep -q "Soft blocked: yes"
|
||||
}
|
||||
|
||||
case ${1:-} in
|
||||
status) active && echo true || echo false ;;
|
||||
case "$1" in
|
||||
status)
|
||||
is_active && echo true || echo false
|
||||
;;
|
||||
*)
|
||||
detach_self "$@"
|
||||
if active; then
|
||||
if is_active; then
|
||||
rfkill unblock all
|
||||
state=false
|
||||
echo false
|
||||
else
|
||||
rfkill block all
|
||||
state=true
|
||||
echo true
|
||||
fi
|
||||
eww update airplane-mode="$state" 2>/dev/null
|
||||
echo "$state"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,34 +1,29 @@
|
||||
#!/usr/bin/env bash
|
||||
# Backlight brightness (first device under /sys/class/backlight). Refreshes
|
||||
# on backlight udev events, which also fire for the hardware keys.
|
||||
#
|
||||
# brightness status loop (deflisten)
|
||||
# brightness set PERCENT
|
||||
|
||||
dev=""
|
||||
for d in /sys/class/backlight/*; do
|
||||
[[ -e $d ]] && { dev=${d##*/}; break; }
|
||||
done
|
||||
BACKLIGHT="/sys/class/backlight"
|
||||
DEV=$(ls "$BACKLIGHT" 2>/dev/null | head -n1)
|
||||
|
||||
state() {
|
||||
[[ -n $dev ]] || { printf '{"percent":0,"available":false}'; return; }
|
||||
local max cur
|
||||
max=$(<"/sys/class/backlight/$dev/max_brightness")
|
||||
cur=$(cat "/sys/class/backlight/$dev/actual_brightness" 2>/dev/null \
|
||||
|| cat "/sys/class/backlight/$dev/brightness")
|
||||
printf '{"percent":%d,"available":true}' "$(((cur * 100 + max / 2) / max))"
|
||||
gen_output() {
|
||||
if [ -z "$DEV" ]; then
|
||||
echo '{"percent":0,"available":false}'
|
||||
return
|
||||
fi
|
||||
max=$(cat "$BACKLIGHT/$DEV/max_brightness")
|
||||
cur=$(cat "$BACKLIGHT/$DEV/actual_brightness" 2>/dev/null || cat "$BACKLIGHT/$DEV/brightness")
|
||||
percent=$(awk -v c="$cur" -v m="$max" 'BEGIN{print int(c/m*100+0.5)}')
|
||||
printf '{"percent":%d,"available":true}\n' "$percent"
|
||||
}
|
||||
|
||||
refresh() { emit "$(state)"; }
|
||||
_bl_events() { exec udevadm monitor --udev --subsystem-match=backlight; }
|
||||
|
||||
case ${1:-} in
|
||||
set) [[ -n $dev ]] && brightnessctl -q -d "$dev" set "${2%.*}%" ;;
|
||||
case "$1" in
|
||||
set)
|
||||
[ -z "$DEV" ] && exit 0
|
||||
brightnessctl -d "$DEV" set "${2}%" -q 2>/dev/null
|
||||
;;
|
||||
*)
|
||||
refresh
|
||||
[[ -n $dev ]] || exit 0
|
||||
mux_init
|
||||
mux_add _bl_events
|
||||
mux_loop refresh
|
||||
gen_output
|
||||
[ -z "$DEV" ] && exit 0
|
||||
udevadm monitor --udev --subsystem-match=backlight 2>/dev/null | while read -r _; do
|
||||
gen_output
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
# Pick a colour from the screen into the clipboard, detached from eww.
|
||||
eww close popup 2>/dev/null
|
||||
eww update active-panel= 2>/dev/null
|
||||
detach hyprpicker -a
|
||||
hyprpicker -a
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
# Pause / resume dunst notifications.
|
||||
case ${1:-} in
|
||||
status) dunstctl is-paused ;;
|
||||
case "$1" in
|
||||
status)
|
||||
dunstctl is-paused
|
||||
;;
|
||||
*)
|
||||
detach_self "$@"
|
||||
dunstctl set-paused toggle
|
||||
state=$(dunstctl is-paused)
|
||||
eww update do-not-disturb="$state" 2>/dev/null
|
||||
echo "$state"
|
||||
if dunstctl is-paused | grep -q true; then
|
||||
dunstctl set-paused false
|
||||
echo false
|
||||
else
|
||||
dunstctl set-paused true
|
||||
echo true
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
# Lock the session. hyprlock runs as its own transient unit so that an eww
|
||||
# restart can never take the lock screen down with it.
|
||||
unit=eww-lock
|
||||
eww close popup 2>/dev/null
|
||||
eww close powermenu 2>/dev/null
|
||||
eww update active-panel= 2>/dev/null
|
||||
systemctl --user is-active --quiet "$unit" && exit 0
|
||||
detach -u "$unit" hyprlock
|
||||
# swaylock #swaylock-effects
|
||||
hyprlock
|
||||
# gtklock
|
||||
@@ -1,3 +1,2 @@
|
||||
#!/usr/bin/env bash
|
||||
# playerctl pass-through for the media panel buttons.
|
||||
exec playerctl "$@"
|
||||
playerctl "$@"
|
||||
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
emit() {
|
||||
local powered=false connected=false device=""
|
||||
|
||||
if bluetoothctl show 2>/dev/null | grep -q "Powered: yes"; then
|
||||
powered=true
|
||||
while IFS= read -r line; do
|
||||
local mac info
|
||||
mac=$(echo "$line" | awk '{ print $2 }')
|
||||
info=$(bluetoothctl info "$mac" 2>/dev/null)
|
||||
if echo "$info" | grep -q "Connected: yes"; then
|
||||
device=$(echo "$info" | awk -F': ' '/^\tName:/ { print $2; exit }')
|
||||
connected=true
|
||||
break
|
||||
fi
|
||||
done < <(bluetoothctl devices 2>/dev/null)
|
||||
fi
|
||||
|
||||
printf '{"powered":%s,"connected":%s,"device":"%s"}\n' "$powered" "$connected" "$device"
|
||||
}
|
||||
|
||||
emit
|
||||
|
||||
tmp=$(mktemp -d)
|
||||
pipe="$tmp/bt-events"
|
||||
mkfifo "$pipe"
|
||||
trap 'rm -rf "$tmp"; kill 0 2>/dev/null' EXIT INT TERM
|
||||
|
||||
# Poll every 10s as reliable fallback for missed events
|
||||
(while true; do sleep 10; echo poll; done) > "$pipe" &
|
||||
|
||||
# bluetoothctl monitor for reactive device connect/disconnect events
|
||||
(bluetoothctl monitor 2>/dev/null | grep --line-buffered -E "Powered|Connected|Device") > "$pipe" &
|
||||
|
||||
while IFS= read -r _ < "$pipe"; do
|
||||
emit
|
||||
done
|
||||
@@ -1,40 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Bluetooth state — adapter power, connected device and the paired/trusted
|
||||
# device list — from one ObjectManager call on the system bus. Refreshes on
|
||||
# every org.bluez signal (property changes, devices added/removed) and every
|
||||
# 60 s.
|
||||
|
||||
fallback='{"powered":false,"connected":false,"device":"","devices":[]}'
|
||||
|
||||
query() {
|
||||
busctl --system --json=short call org.bluez / org.freedesktop.DBus.ObjectManager GetManagedObjects 2>/dev/null \
|
||||
| jq -c '
|
||||
.data[0] as $o
|
||||
| ($o | to_entries | map(.value["org.bluez.Adapter1"] | select(.) | .Powered.data) | any) as $powered
|
||||
| ($o | to_entries
|
||||
| map(.value["org.bluez.Device1"] | select(.))
|
||||
| map(select(.Paired.data or .Trusted.data or .Connected.data))
|
||||
| map({ mac: .Address.data,
|
||||
name: (.Alias.data // .Name.data // .Address.data),
|
||||
connected: (.Connected.data // false),
|
||||
paired: (.Paired.data // false) })
|
||||
| sort_by((.connected | not), (.paired | not), .name)) as $devices
|
||||
| { powered: $powered,
|
||||
connected: ($devices | any(.connected)),
|
||||
device: ($devices | map(select(.connected)) | .[0].name // ""),
|
||||
devices: $devices }' 2>/dev/null
|
||||
}
|
||||
|
||||
refresh() {
|
||||
local out
|
||||
out=$(query)
|
||||
emit "${out:-$fallback}"
|
||||
}
|
||||
|
||||
_bt_events() { exec gdbus monitor --system --dest org.bluez; }
|
||||
|
||||
refresh
|
||||
mux_init
|
||||
mux_add _bt_events
|
||||
mux_tick 60
|
||||
mux_loop refresh
|
||||
@@ -0,0 +1,33 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
emit() {
|
||||
local first=true arr=""
|
||||
while IFS= read -r line; do
|
||||
local mac name connected
|
||||
mac=$(echo "$line" | awk '{ print $2 }')
|
||||
name=$(echo "$line" | awk '{ $1=$2=""; sub(/^ +/, ""); print }')
|
||||
info=$(bluetoothctl info "$mac" 2>/dev/null)
|
||||
connected=$(echo "$info" | grep -q "Connected: yes" && echo true || echo false)
|
||||
$first || arr="${arr},"
|
||||
arr="${arr}{\"mac\":\"${mac}\",\"name\":\"${name}\",\"connected\":${connected}}"
|
||||
first=false
|
||||
done < <(bluetoothctl devices 2>/dev/null)
|
||||
echo "[${arr}]"
|
||||
}
|
||||
|
||||
emit
|
||||
|
||||
tmp=$(mktemp -d)
|
||||
pipe="$tmp/bt-dev-events"
|
||||
mkfifo "$pipe"
|
||||
trap 'rm -rf "$tmp"; kill 0 2>/dev/null' EXIT INT TERM
|
||||
|
||||
# Poll every 10s as fallback for missed events
|
||||
(while true; do sleep 10; echo poll; done) > "$pipe" &
|
||||
|
||||
# Reactive updates from D-Bus
|
||||
(bluetoothctl monitor 2>/dev/null | grep --line-buffered -E "Connected|Device|Powered") > "$pipe" &
|
||||
|
||||
while IFS= read -r _ < "$pipe"; do
|
||||
emit
|
||||
done
|
||||
@@ -1,8 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# Connect or disconnect the bluetooth device with MAC $1.
|
||||
mac=$1
|
||||
[[ -n $mac ]] || exit 64
|
||||
detach_self "$@"
|
||||
mac="$1"
|
||||
if bluetoothctl info "$mac" 2>/dev/null | grep -q "Connected: yes"; then
|
||||
bluetoothctl disconnect "$mac"
|
||||
else
|
||||
|
||||
@@ -1,136 +1,64 @@
|
||||
#!/usr/bin/env bash
|
||||
# Network state for the bar icons and the net panel: wifi, ethernet and USB
|
||||
# tethering. Refreshes on link/address changes and every 30 s (signal level).
|
||||
|
||||
wifi_iface() { awk 'NR > 2 { sub(":", "", $1); print $1; exit }' /proc/net/wireless; }
|
||||
eth_iface() { ip -o link 2>/dev/null | awk '$2 ~ /^en[op]/ { sub(":", "", $2); print $2; exit }'; }
|
||||
usb_iface() { ip -o link 2>/dev/null | awk '$2 ~ /^(usb[0-9]|enx)/ { sub(":", "", $2); print $2; exit }'; }
|
||||
ipv4() { ip -4 -o addr show "$1" 2>/dev/null | awk '{ print $4; exit }'; }
|
||||
get_wifi_iface() {
|
||||
awk 'NR > 2 { gsub(":", "", $1); print $1; exit }' /proc/net/wireless
|
||||
}
|
||||
|
||||
get_usb_iface() {
|
||||
ip link 2>/dev/null | awk '
|
||||
/^[0-9]+: usb[0-9]/ { gsub(":", "", $2); print $2; exit }
|
||||
/^[0-9]+: enx/ { gsub(":", "", $2); print $2; exit }
|
||||
'
|
||||
}
|
||||
|
||||
signal_icon() {
|
||||
local dbm=${1:-}
|
||||
[[ -z $dbm ]] && { echo ""; return; }
|
||||
if ((dbm >= -50)); then echo ""
|
||||
elif ((dbm >= -60)); then echo ""
|
||||
elif ((dbm >= -70)); then echo ""
|
||||
elif ((dbm >= -80)); then echo ""
|
||||
local dbm="$1"
|
||||
if [ -z "$dbm" ]; then echo ""; return; fi
|
||||
if [ "$dbm" -ge -50 ]; then echo ""
|
||||
elif [ "$dbm" -ge -60 ]; then echo ""
|
||||
elif [ "$dbm" -ge -70 ]; then echo ""
|
||||
elif [ "$dbm" -ge -80 ]; then echo ""
|
||||
else echo ""; fi
|
||||
}
|
||||
|
||||
band() {
|
||||
local f=${1:-0}
|
||||
if ((f >= 5925)); then echo "6 GHz"
|
||||
elif ((f >= 4900)); then echo "5 GHz"
|
||||
elif ((f >= 2400)); then echo "2.4 GHz"
|
||||
else echo ""; fi
|
||||
}
|
||||
make_content() {
|
||||
local wifi_iface eth_iface
|
||||
|
||||
generation() {
|
||||
case ${1:-} in
|
||||
7) echo "Wi-Fi 7" ;; 6) echo "Wi-Fi 6" ;; 5) echo "Wi-Fi 5" ;; 4) echo "Wi-Fi 4" ;; *) echo "" ;;
|
||||
esac
|
||||
}
|
||||
wifi_iface=$(get_wifi_iface)
|
||||
eth_iface=$(ip link | awk '/^[0-9]+: en[po]/ { gsub(":",""); print $2; exit }')
|
||||
|
||||
state() {
|
||||
local wifi eth usb
|
||||
wifi=$(wifi_iface)
|
||||
eth=$(eth_iface)
|
||||
usb=$(usb_iface)
|
||||
|
||||
local w_enabled=false w_connected=false w_icon="" w_ssid="" w_ip="" w_freq=0 w_gen="" w_signal=0 wpa
|
||||
rfkill list wlan 2>/dev/null | grep -q "Soft blocked: yes" || w_enabled=true
|
||||
if [[ -n $wifi ]]; then
|
||||
w_ip=$(ipv4 "$wifi")
|
||||
if [[ -n $w_ip ]]; then
|
||||
w_connected=true
|
||||
wpa=$(wpa_cli -g "/run/wpa_supplicant/$wifi" status 2>/dev/null)
|
||||
w_ssid=$(awk -F= '/^ssid=/ { print $2; exit }' <<<"$wpa")
|
||||
w_freq=$(awk -F= '/^freq=/ { print $2; exit }' <<<"$wpa")
|
||||
w_gen=$(generation "$(awk -F= '/^wifi_generation=/ { print $2; exit }' <<<"$wpa")")
|
||||
w_signal=$(awk -v i="$wifi:" '$1 == i { sub(/\./, "", $4); print $4; exit }' /proc/net/wireless)
|
||||
w_icon=$(signal_icon "$w_signal")
|
||||
fi
|
||||
# Ethernet
|
||||
local eth_connected=false
|
||||
if [ -n "$eth_iface" ]; then
|
||||
eth_state=$(ip link show "$eth_iface" 2>/dev/null | awk '/state/ { print $9 }')
|
||||
[ "$eth_state" = "UP" ] && eth_connected=true
|
||||
fi
|
||||
|
||||
local e_connected=false e_ip="" e_speed="" spd
|
||||
if [[ -n $eth ]] && ip -o link show "$eth" 2>/dev/null | grep -q "state UP"; then
|
||||
e_connected=true
|
||||
e_ip=$(ipv4 "$eth")
|
||||
spd=$(cat "/sys/class/net/$eth/speed" 2>/dev/null)
|
||||
[[ ${spd:-0} -gt 0 ]] 2>/dev/null && e_speed="${spd} Mbps"
|
||||
# USB tethering
|
||||
local usb_iface usb_connected=false
|
||||
usb_iface=$(get_usb_iface)
|
||||
if [ -n "$usb_iface" ] && ip -4 addr show "$usb_iface" 2>/dev/null | grep -q "inet "; then
|
||||
usb_connected=true
|
||||
fi
|
||||
|
||||
local u_connected=false u_ip=""
|
||||
if [[ -n $usb ]]; then
|
||||
u_ip=$(ipv4 "$usb")
|
||||
[[ -n $u_ip ]] && u_connected=true
|
||||
# WiFi - use IP presence as connection indicator (more reliable than wpa_cli)
|
||||
local wifi_connected=false wifi_enabled=false wifi_icon="" wifi_ssid=""
|
||||
if ! rfkill list wlan 2>/dev/null | grep -q "Soft blocked: yes"; then
|
||||
wifi_enabled=true
|
||||
fi
|
||||
if [ -n "$wifi_iface" ] && ip -4 addr show "$wifi_iface" 2>/dev/null | grep -q "inet "; then
|
||||
wifi_connected=true
|
||||
wifi_ssid=$(wpa_cli -g "/run/wpa_supplicant/$wifi_iface" status 2>/dev/null \
|
||||
| awk -F= '/^ssid=/ { print $2 }')
|
||||
signal=$(awk -v iface="$wifi_iface" '$1 == iface ":" { gsub(/\./, "", $4); print $4; exit }' /proc/net/wireless)
|
||||
wifi_icon=$(signal_icon "$signal")
|
||||
fi
|
||||
|
||||
printf '{"wifi":{"connected":%s,"enabled":%s,"icon":"%s","ssid":"%s","ip":"%s","freq":%s,"band":"%s","gen":"%s","signal":%s},' \
|
||||
"$w_connected" "$w_enabled" "$w_icon" "$(jstr "$w_ssid")" "$w_ip" "${w_freq:-0}" "$(band "$w_freq")" "$w_gen" "${w_signal:-0}"
|
||||
printf '"ethernet":{"connected":%s,"interface":"%s","ip":"%s","speed":"%s"},' \
|
||||
"$e_connected" "$eth" "$e_ip" "$e_speed"
|
||||
printf '"usb":{"connected":%s,"interface":"%s","ip":"%s"},' \
|
||||
"$u_connected" "$usb" "$u_ip"
|
||||
wg_json
|
||||
printf '}'
|
||||
printf '{"wifi":{"connected":%s,"enabled":%s,"icon":"%s","ssid":"%s"},"ethernet":{"connected":%s},"usb":{"connected":%s}}\n' \
|
||||
"$wifi_connected" "$wifi_enabled" "$wifi_icon" "$wifi_ssid" "$eth_connected" "$usb_connected"
|
||||
}
|
||||
|
||||
# --- WireGuard: interfaces from the wireguard-<name>.service units (so a
|
||||
# tunnel that is down still shows up) plus any live wireguard-type link.
|
||||
# `wg show` needs root, so peer names and the endpoint come from the peer
|
||||
# units instead.
|
||||
|
||||
wg_ifaces() {
|
||||
{
|
||||
systemctl list-units --all --plain --no-legend 'wireguard-*.service' 2>/dev/null \
|
||||
| awk '$1 !~ /-peer-/ { sub(/^wireguard-/, "", $1); sub(/\.service$/, "", $1); print $1 }'
|
||||
ip -d -o link 2>/dev/null | awk '/ wireguard / { sub(":", "", $2); print $2 }'
|
||||
} | sort -u
|
||||
}
|
||||
|
||||
human_bytes() {
|
||||
awk -v b="${1:-0}" 'BEGIN {
|
||||
split("B KiB MiB GiB TiB", u, " "); i = 1
|
||||
while (b >= 1024 && i < 5) { b /= 1024; i++ }
|
||||
printf (i == 1 ? "%d %s" : "%.1f %s"), b, u[i] }'
|
||||
}
|
||||
|
||||
wg_json() { # prints the "wireguard" array and the "vpn" summary
|
||||
local name up ip rx tx peers endpoint peer_unit peer_script sep="" out="[" vpn_up=false vpn_name=""
|
||||
while read -r name; do
|
||||
[[ -n $name ]] || continue
|
||||
up=false ip="" rx=0 tx=0 endpoint=""
|
||||
if [[ -d /sys/class/net/$name ]]; then
|
||||
ip -o link show "$name" 2>/dev/null | grep -q '<[^>]*UP' && up=true
|
||||
ip=$(ipv4 "$name")
|
||||
rx=$(<"/sys/class/net/$name/statistics/rx_bytes")
|
||||
tx=$(<"/sys/class/net/$name/statistics/tx_bytes")
|
||||
fi
|
||||
peers=$(systemctl list-units --all --plain --no-legend "wireguard-$name-peer-*.service" 2>/dev/null \
|
||||
| awk '{ print $1 }' | sed "s/^wireguard-$name-peer-//; s/\.service\$//" | paste -sd, -)
|
||||
peer_unit=$(systemctl list-units --all --plain --no-legend "wireguard-$name-peer-*.service" 2>/dev/null \
|
||||
| awk 'NR == 1 { print $1 }')
|
||||
# NixOS puts `wg set … endpoint "host:port"` in the peer unit's start script
|
||||
if [[ -n $peer_unit ]]; then
|
||||
peer_script=$(systemctl show -p ExecStart --value "$peer_unit" 2>/dev/null \
|
||||
| sed -n 's/.*path=\([^ ;]*\).*/\1/p' | awk 'NR == 1')
|
||||
[[ -r $peer_script ]] && endpoint=$(grep -o 'endpoint "[^"]*"' "$peer_script" 2>/dev/null \
|
||||
| awk -F'"' 'NR == 1 { print $2 }')
|
||||
fi
|
||||
if [[ $up == true && $vpn_up == false ]]; then vpn_up=true vpn_name=$name; fi
|
||||
[[ -z $vpn_name ]] && vpn_name=$name
|
||||
out+="$sep{\"name\":\"$(jstr "$name")\",\"up\":$up,\"ip\":\"$ip\",\"rx\":\"$(human_bytes "$rx")\",\"tx\":\"$(human_bytes "$tx")\",\"peers\":\"$(jstr "$peers")\",\"endpoint\":\"$(jstr "$endpoint")\"}"
|
||||
sep=,
|
||||
done < <(wg_ifaces)
|
||||
printf '"wireguard":%s],"vpn":{"up":%s,"name":"%s"}' "$out" "$vpn_up" "$(jstr "$vpn_name")"
|
||||
}
|
||||
|
||||
refresh() { emit "$(state)"; }
|
||||
_link_events() { exec ip monitor link address; }
|
||||
|
||||
refresh
|
||||
mux_init
|
||||
mux_add _link_events
|
||||
mux_tick 30
|
||||
mux_loop refresh
|
||||
make_content
|
||||
ip monitor | while read -r _; do
|
||||
make_content
|
||||
done
|
||||
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
get_wifi_iface() {
|
||||
awk 'NR > 2 { gsub(":", "", $1); print $1; exit }' /proc/net/wireless
|
||||
}
|
||||
|
||||
get_usb_iface() {
|
||||
ip link 2>/dev/null | awk '
|
||||
/^[0-9]+: usb[0-9]/ { gsub(":", "", $2); print $2; exit }
|
||||
/^[0-9]+: enx/ { gsub(":", "", $2); print $2; exit }
|
||||
'
|
||||
}
|
||||
|
||||
freq_band() {
|
||||
local f="$1"
|
||||
if [ "$f" -ge 6000 ] 2>/dev/null; then echo "6 GHz"
|
||||
elif [ "$f" -ge 5000 ] 2>/dev/null; then echo "5 GHz"
|
||||
elif [ "$f" -ge 2400 ] 2>/dev/null; then echo "2.4 GHz"
|
||||
else echo ""; fi
|
||||
}
|
||||
|
||||
wifi_gen_label() {
|
||||
case "$1" in
|
||||
7) echo "Wi-Fi 7" ;; 6) echo "Wi-Fi 6" ;;
|
||||
5) echo "Wi-Fi 5" ;; 4) echo "Wi-Fi 4" ;;
|
||||
*) echo "" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
make_content() {
|
||||
local wifi_iface eth_iface
|
||||
wifi_iface=$(get_wifi_iface)
|
||||
eth_iface=$(ip link | awk '/^[0-9]+: en[po]/ { gsub(":",""); print $2; exit }')
|
||||
|
||||
local wifi_ssid="" wifi_ip="" wifi_freq=0 wifi_band="" wifi_gen="" wifi_signal=0
|
||||
if [ -n "$wifi_iface" ] && ip -4 addr show "$wifi_iface" 2>/dev/null | grep -q "inet "; then
|
||||
local wpa
|
||||
wpa=$(wpa_cli -g "/run/wpa_supplicant/$wifi_iface" status 2>/dev/null)
|
||||
wifi_ssid=$(echo "$wpa" | awk -F= '/^ssid=/ { print $2 }')
|
||||
wifi_ip=$(ip -4 addr show "$wifi_iface" | awk '/inet / { print $2 }')
|
||||
wifi_freq=$(echo "$wpa" | awk -F= '/^freq=/ { print $2 }')
|
||||
local gen
|
||||
gen=$(echo "$wpa" | awk -F= '/^wifi_generation=/ { print $2 }')
|
||||
wifi_band=$(freq_band "$wifi_freq")
|
||||
wifi_gen=$(wifi_gen_label "$gen")
|
||||
wifi_signal=$(awk -v iface="$wifi_iface" \
|
||||
'$1 == iface ":" { gsub(/\./, "", $4); print $4; exit }' /proc/net/wireless)
|
||||
fi
|
||||
|
||||
local eth_ip="" eth_speed="" eth_state="down"
|
||||
if [ -n "$eth_iface" ]; then
|
||||
eth_state=$(ip link show "$eth_iface" 2>/dev/null | awk '/state/ { print tolower($9) }')
|
||||
if [ "$eth_state" = "up" ]; then
|
||||
eth_ip=$(ip -4 addr show "$eth_iface" | awk '/inet / { print $2 }')
|
||||
local spd
|
||||
spd=$(cat /sys/class/net/"$eth_iface"/speed 2>/dev/null)
|
||||
[ "${spd:-0}" -gt 0 ] 2>/dev/null && eth_speed="${spd} Mbps"
|
||||
fi
|
||||
fi
|
||||
|
||||
local usb_iface usb_ip=""
|
||||
usb_iface=$(get_usb_iface)
|
||||
if [ -n "$usb_iface" ] && ip -4 addr show "$usb_iface" 2>/dev/null | grep -q "inet "; then
|
||||
usb_ip=$(ip -4 addr show "$usb_iface" | awk '/inet / { print $2 }')
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2059
|
||||
printf '{"wifi":{"ssid":"%s","ip":"%s","freq":%s,"band":"%s","gen":"%s","signal":%s},' \
|
||||
"$wifi_ssid" "$wifi_ip" "${wifi_freq:-0}" "$wifi_band" "$wifi_gen" "${wifi_signal:-0}"
|
||||
printf '"ethernet":{"state":"%s","ip":"%s","speed":"%s","interface":"%s"},' \
|
||||
"$eth_state" "$eth_ip" "$eth_speed" "${eth_iface:-}"
|
||||
printf '"usb":{"interface":"%s","ip":"%s"}}\n' \
|
||||
"${usb_iface:-}" "$usb_ip"
|
||||
}
|
||||
|
||||
make_content
|
||||
ip monitor | while read -r _; do
|
||||
make_content
|
||||
done
|
||||
@@ -1,12 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Bring the WireGuard tunnel $1 down (stop its service, which takes the peer
|
||||
# units with it) or up (start its target, which pulls service and peers).
|
||||
# Needs the polkit rule from modules/nixos/system/network/wireguard.
|
||||
name=$1
|
||||
[[ -n $name ]] || exit 64
|
||||
detach_self "$@"
|
||||
if [[ -d /sys/class/net/$name ]]; then
|
||||
systemctl stop "wireguard-$name.service"
|
||||
else
|
||||
systemctl start "wireguard-$name.target"
|
||||
fi
|
||||
@@ -1,23 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
# Toggle wlsunset. It runs as the transient user unit eww-nightlight, so it
|
||||
# survives eww restarts and can be stopped by name.
|
||||
unit=eww-nightlight
|
||||
|
||||
active() { systemctl --user is-active --quiet "$unit" || pgrep -x wlsunset >/dev/null; }
|
||||
|
||||
case ${1:-} in
|
||||
status) active && echo true || echo false ;;
|
||||
case "$1" in
|
||||
status)
|
||||
pgrep -x wlsunset >/dev/null 2>&1 && echo true || echo false
|
||||
;;
|
||||
*)
|
||||
detach_self "$@"
|
||||
if active; then
|
||||
systemctl --user stop "$unit" 2>/dev/null
|
||||
pkill -x wlsunset
|
||||
state=false
|
||||
if pgrep -x wlsunset >/dev/null 2>&1; then
|
||||
pkill -x wlsunset && echo false
|
||||
else
|
||||
detach -u "$unit" wlsunset -T 4500 -t 3200
|
||||
state=true
|
||||
wlsunset -T 4500 -t 3200 & echo true
|
||||
fi
|
||||
eww update night-light="$state" 2>/dev/null
|
||||
echo "$state"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,42 +1,18 @@
|
||||
#!/usr/bin/env bash
|
||||
# Toggle a panel of the popup window on the focused monitor.
|
||||
#
|
||||
# The popup hosts every panel behind revealers, so switching panels while it
|
||||
# is open is just a variable update (animated, no scripts restarted). It is
|
||||
# only closed and re-opened when it has to move to another monitor.
|
||||
#
|
||||
# `eww open popup` takes longer than the client's 100 ms reply deadline, so
|
||||
# its exit status and error output are meaningless and ignored (the daemon
|
||||
# carries the command out anyway; the lib's eww wrapper makes sure a slow
|
||||
# reply can never spawn a second daemon).
|
||||
panel=$1
|
||||
[[ -n $panel ]] || exit 64
|
||||
detach_self "$@"
|
||||
PANEL="$1"
|
||||
|
||||
# One toggle at a time; the lock dies with this process. fd 9 is closed for
|
||||
# every eww call so nothing can inherit it.
|
||||
exec 9>"${XDG_RUNTIME_DIR:-/tmp}/eww-panel-toggle.lock"
|
||||
# Atomic lock: flock acquires exclusively or exits immediately.
|
||||
# Released automatically when the process exits (no trap needed).
|
||||
exec 9>"/tmp/eww_panel_toggle.lock"
|
||||
flock -n 9 || exit 0
|
||||
|
||||
ew() { eww "$@" 9>&-; }
|
||||
CURRENT=$(eww get active-panel 2>/dev/null | tr -d '"')
|
||||
|
||||
current=$(ew get active-panel 2>/dev/null | tr -d '"')
|
||||
popup_screen=$(ew get popup-screen 2>/dev/null | tr -d '"')
|
||||
screen=$(eww-bar focused)
|
||||
if ew active-windows 2>/dev/null | grep -qx 'popup: popup'; then open=1; else open=0; fi
|
||||
|
||||
if ((open)) && [[ $current == "$panel" ]]; then
|
||||
ew update active-panel=
|
||||
ew close popup 2>/dev/null
|
||||
elif ((open)) && [[ -n $screen && $popup_screen == "$screen" ]]; then
|
||||
ew update active-panel="$panel"
|
||||
if [ "$CURRENT" = "$PANEL" ]; then
|
||||
eww update active-panel=""
|
||||
eww close popup 2>/dev/null
|
||||
else
|
||||
((open)) && ew close popup 2>/dev/null
|
||||
ew update active-panel="$panel" popup-screen="$screen"
|
||||
if [[ -n $screen ]]; then
|
||||
ew open popup --screen "$screen" >/dev/null 2>&1
|
||||
else
|
||||
ew open popup >/dev/null 2>&1
|
||||
fi
|
||||
eww update active-panel="$PANEL"
|
||||
eww close popup 2>/dev/null
|
||||
eww-open-on-current-screen popup
|
||||
fi
|
||||
exit 0
|
||||
|
||||
@@ -1,19 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
# Toggle the power-saver profile (power-profiles-daemon).
|
||||
active() { [[ $(powerprofilesctl get 2>/dev/null) == power-saver ]]; }
|
||||
|
||||
case ${1:-} in
|
||||
status) active && echo true || echo false ;;
|
||||
case "$1" in
|
||||
status)
|
||||
powerprofilesctl get | grep -q power-saver && echo true || echo false
|
||||
;;
|
||||
*)
|
||||
detach_self "$@"
|
||||
if active; then
|
||||
powerprofilesctl set balanced 2>/dev/null
|
||||
state=false
|
||||
if powerprofilesctl get | grep -q power-saver; then
|
||||
powerprofilesctl set balanced 2>/dev/null || true
|
||||
echo false
|
||||
else
|
||||
powerprofilesctl set power-saver 2>/dev/null
|
||||
state=true
|
||||
powerprofilesctl set power-saver 2>/dev/null || true
|
||||
echo true
|
||||
fi
|
||||
eww update power-save="$state" 2>/dev/null
|
||||
echo "$state"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
# Toggle the full-screen power menu on the focused monitor. The open's exit
|
||||
# status is ignored: it exceeds the client's 100 ms reply deadline.
|
||||
detach_self "$@"
|
||||
eww close popup 2>/dev/null
|
||||
eww update active-panel= 2>/dev/null
|
||||
screen=$(eww-bar focused)
|
||||
if [[ -n $screen ]]; then
|
||||
eww open powermenu --toggle --screen "$screen" >/dev/null 2>&1
|
||||
else
|
||||
eww open powermenu --toggle >/dev/null 2>&1
|
||||
fi
|
||||
exit 0
|
||||
eww update active-panel=""
|
||||
eww-open-on-current-screen powermenu --toggle
|
||||
|
||||
@@ -1,225 +1,229 @@
|
||||
#!/usr/bin/env bash
|
||||
# Internet radio (radiorecord.ru) and MPRIS "now playing" for the media panel.
|
||||
#
|
||||
# radio status loop (deflisten)
|
||||
# radio start ID tune to station ID
|
||||
# radio toggle play / stop the last station
|
||||
# radio stop
|
||||
# radio vol PERCENT volume of the radio stream, else of the external player
|
||||
# radio mute mute toggle, same target as vol
|
||||
#
|
||||
# mpv runs as the transient user unit eww-radio: independent of the eww
|
||||
# daemon, and `systemctl --user stop eww-radio` always works.
|
||||
|
||||
api="https://www.radiorecord.ru/api"
|
||||
unit=eww-radio
|
||||
state_dir=${XDG_STATE_HOME:-$HOME/.local/state}/eww
|
||||
cache_dir=${XDG_CACHE_HOME:-$HOME/.cache}/eww
|
||||
id_file=$state_dir/radio-station
|
||||
mkdir -p "$state_dir" "$cache_dir"
|
||||
URL_BASE="https://www.radiorecord.ru/api"
|
||||
MPV_PID_FILE="/tmp/mpv_radio_pid"
|
||||
RADIO_ID_FILE="/tmp/radio_id"
|
||||
|
||||
station_ids='[507,522,523,536,537,42532,42602]'
|
||||
# Extra stations: {id (unique integer >= 1000000), title, stream_hls, icon_fill_white ("" for none)}
|
||||
custom_stations='[]'
|
||||
STATION_IDS='[507,522,523,536,537,42532,42602]'
|
||||
|
||||
default_song='{"artist":"","song":"","image600":""}'
|
||||
default_media='{"player":"","status":"Stopped","artist":"","title":"","art":""}'
|
||||
stations_cache="$cache_dir/radio-stations-$(cksum <<<"$station_ids$custom_stations" | cut -d' ' -f1).json"
|
||||
# Custom (non-radiorecord) stations
|
||||
# id must be a unique integer >= 1000000 to avoid collision with radiorecord IDs.
|
||||
# icon_fill_white: URL to station icon image, or "" for none.
|
||||
CUSTOM_STATIONS='[
|
||||
]'
|
||||
|
||||
# --- stations --------------------------------------------------------------
|
||||
STATIONS="[]"
|
||||
DEFAULT_INFO='{"artist":"","song":"","image600":""}'
|
||||
DEFAULT_MEDIA='{"player":"","status":"Stopped","artist":"","title":"","art":""}'
|
||||
|
||||
# Station list, cached for a day (it only changes with station_ids).
|
||||
stations() {
|
||||
if [[ -s $stations_cache && -n $(find "$stations_cache" -mmin -1440 2>/dev/null) ]]; then
|
||||
cat "$stations_cache"
|
||||
PID=$([ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0)
|
||||
RADIO_ID=$([ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0)
|
||||
PAUSED=$(( PID == 0 ? 1 : 0 ))
|
||||
INFO="$DEFAULT_INFO"
|
||||
MEDIA="$DEFAULT_MEDIA"
|
||||
STATUS="{}"
|
||||
|
||||
get_stations() {
|
||||
local rr
|
||||
rr=$(curl -s --compressed "$URL_BASE/stations/" 2>/dev/null \
|
||||
| jq --argjson ids "$STATION_IDS" \
|
||||
'.result.stations | map(select(.id | IN($ids[]))) | map({id, title, stream_hls, icon_fill_white, "radiorecord": true})' 2>/dev/null)
|
||||
jq -n \
|
||||
--argjson rr "${rr:-[]}" \
|
||||
--argjson custom "$CUSTOM_STATIONS" \
|
||||
'$rr + ($custom | map(. + {"radiorecord": false}))'
|
||||
}
|
||||
|
||||
get_song() {
|
||||
curl -s --compressed "$URL_BASE/station/history/?id=$RADIO_ID" \
|
||||
| jq '.result.history[0] | {artist, song, image600}'
|
||||
}
|
||||
|
||||
get_stream_url() {
|
||||
echo "$STATIONS" | jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].stream_hls // empty'
|
||||
}
|
||||
|
||||
get_player_info() {
|
||||
local player status artist title art
|
||||
# exclude mpv (radio) so it never appears as "external player"
|
||||
player=$(playerctl -l 2>/dev/null | grep -Ev '^mpv' | head -1)
|
||||
if [ -z "$player" ]; then
|
||||
echo '{"player":"","status":"Stopped","artist":"","title":"","art":""}'
|
||||
return
|
||||
fi
|
||||
local rr out
|
||||
rr=$(curl -sf --compressed --max-time 8 "$api/stations/" 2>/dev/null \
|
||||
| jq -c --argjson ids "$station_ids" \
|
||||
'.result.stations | map(select(.id | IN($ids[]))) | map({id, title, stream_hls, icon_fill_white, radiorecord: true})' 2>/dev/null)
|
||||
if [[ -z $rr || $rr == null ]]; then
|
||||
[[ -s $stations_cache ]] && { cat "$stations_cache"; return; }
|
||||
rr='[]'
|
||||
status=$(playerctl -p "$player" status 2>/dev/null || echo "Stopped")
|
||||
artist=$(playerctl -p "$player" metadata artist 2>/dev/null || echo "")
|
||||
title=$(playerctl -p "$player" metadata title 2>/dev/null || echo "")
|
||||
art=$(playerctl -p "$player" metadata mpris:artUrl 2>/dev/null || echo "")
|
||||
jq -cnr --arg player "$player" --arg status "$status" \
|
||||
--arg artist "$artist" --arg title "$title" --arg art "$art" \
|
||||
'{player:$player, status:$status, artist:$artist, title:$title, art:$art}'
|
||||
}
|
||||
|
||||
update_state() {
|
||||
PID=$([ -e "$MPV_PID_FILE" ] && cat "$MPV_PID_FILE" || echo 0)
|
||||
RADIO_ID=$([ -e "$RADIO_ID_FILE" ] && cat "$RADIO_ID_FILE" || echo 0)
|
||||
if [ "$PID" -gt 0 ] && ! kill -0 "$PID" 2>/dev/null; then
|
||||
PID=0
|
||||
rm -f "$MPV_PID_FILE"
|
||||
fi
|
||||
out=$(jq -cn --argjson rr "$rr" --argjson custom "$custom_stations" '$rr + ($custom | map(. + {radiorecord: false}))')
|
||||
[[ $rr != '[]' ]] && printf '%s\n' "$out" >"$stations_cache"
|
||||
printf '%s\n' "$out"
|
||||
PAUSED=$(( PID == 0 ? 1 : 0 ))
|
||||
}
|
||||
|
||||
station() { # ID FIELD
|
||||
jq -r --argjson id "${1:-0}" --arg f "$2" 'first(.[] | select(.id == $id) | .[$f]) // empty' <<<"$STATIONS"
|
||||
emit_status() {
|
||||
jq -cnr \
|
||||
--argjson stations "${STATIONS:-[]}" \
|
||||
--argjson radio_id "${RADIO_ID:-0}" \
|
||||
--argjson is_paused "${PAUSED:-1}" \
|
||||
--argjson info "${INFO:-$DEFAULT_INFO}" \
|
||||
--argjson media "${MEDIA:-$DEFAULT_MEDIA}" \
|
||||
'{"is_paused": $is_paused, "song": $info, "radio": $radio_id, "stations": $stations, "media": $media}'
|
||||
}
|
||||
|
||||
current_id() {
|
||||
local id
|
||||
id=$(cat "$id_file" 2>/dev/null)
|
||||
[[ $id =~ ^[0-9]+$ ]] && echo "$id" || echo 0
|
||||
get_stream_node() {
|
||||
local name="$1"
|
||||
wpctl status 2>/dev/null | awk -v pat="$name" '
|
||||
/Streams:/ { in_s = 1 }
|
||||
/Sinks:|Sources:|Clients:/ { in_s = 0 }
|
||||
in_s && /[0-9]+\./ && tolower($0) ~ tolower(pat) {
|
||||
match($0, /[0-9]+/); print substr($0, RSTART, RLENGTH); exit
|
||||
}
|
||||
'
|
||||
}
|
||||
|
||||
playing() { systemctl --user is-active --quiet "$unit"; }
|
||||
|
||||
# --- playback --------------------------------------------------------------
|
||||
|
||||
start() {
|
||||
local id=${1:-0} url
|
||||
((id > 0)) || return 1
|
||||
STATIONS=$(stations)
|
||||
url=$(station "$id" stream_hls)
|
||||
[[ -n $url && $url != null ]] || return 1
|
||||
systemctl --user stop "$unit" 2>/dev/null
|
||||
detach -u "$unit" mpv --no-video --really-quiet --audio-client-name="$unit" "$url" || return 1
|
||||
printf '%s\n' "$id" >"$id_file"
|
||||
}
|
||||
|
||||
stop() { systemctl --user stop "$unit" 2>/dev/null; }
|
||||
|
||||
# --- volume ----------------------------------------------------------------
|
||||
|
||||
# PipeWire node id of the first stream whose line matches $1 (case-insensitive).
|
||||
stream_node() {
|
||||
wpctl status 2>/dev/null | awk -v pat="$1" '
|
||||
/Streams:/ { s = 1; next }
|
||||
/Sinks:|Sources:|Filters:|Clients:/ { s = 0 }
|
||||
s && tolower($0) ~ tolower(pat) && match($0, /[0-9]+\./) { print substr($0, RSTART, RLENGTH - 1); exit }'
|
||||
}
|
||||
|
||||
external_player() { playerctl -l 2>/dev/null | grep -v '^mpv' | head -n1; }
|
||||
|
||||
# "pw NODE" while the radio plays, else "mpris PLAYER" for an external player.
|
||||
volume_target() {
|
||||
local n p
|
||||
if playing; then
|
||||
n=$(stream_node "$unit")
|
||||
[[ -n $n ]] && { echo "pw $n"; return; }
|
||||
fi
|
||||
p=$(external_player)
|
||||
[[ -n $p ]] && echo "mpris $p"
|
||||
get_mpv_node() {
|
||||
get_stream_node "mpv"
|
||||
}
|
||||
|
||||
get_volume() {
|
||||
local kind target
|
||||
read -r kind target < <(volume_target)
|
||||
case $kind in
|
||||
pw) wpctl get-volume "$target" 2>/dev/null | awk '{ printf "%d", $2 * 100 + 0.5 }' ;;
|
||||
mpris) playerctl -p "$target" volume 2>/dev/null | awk '{ printf "%d", $1 * 100 + 0.5 }' ;;
|
||||
esac
|
||||
}
|
||||
|
||||
set_volume() {
|
||||
local vol=${1%.*} kind target
|
||||
read -r kind target < <(volume_target)
|
||||
case $kind in
|
||||
pw) wpctl set-volume -l 1.0 "$target" "${vol}%" ;;
|
||||
mpris) playerctl -p "$target" volume "$(awk -v v="$vol" 'BEGIN { printf "%.2f", v / 100 }')" 2>/dev/null ;;
|
||||
esac
|
||||
eww update radio-vol="$vol" 2>/dev/null
|
||||
}
|
||||
|
||||
toggle_mute() {
|
||||
local kind target n=""
|
||||
read -r kind target < <(volume_target)
|
||||
case $kind in
|
||||
pw) n=$target ;;
|
||||
mpris) n=$(stream_node "${target%%.*}") ;;
|
||||
esac
|
||||
[[ -n $n ]] || return
|
||||
wpctl set-mute "$n" toggle
|
||||
if wpctl get-volume "$n" 2>/dev/null | grep -q MUTED; then muted=true; else muted=false; fi
|
||||
eww update radio-muted="$muted" 2>/dev/null
|
||||
}
|
||||
|
||||
# --- status loop -----------------------------------------------------------
|
||||
|
||||
media_json() { # PLAYER STATUS ARTIST TITLE ART
|
||||
jq -cn --arg player "$1" --arg status "${2:-Stopped}" --arg artist "$3" --arg title "$4" --arg art "$5" \
|
||||
'{player: $player, status: $status, artist: $artist, title: $title, art: $art}'
|
||||
}
|
||||
|
||||
song_playing() { # ID → SONG from the station history (radiorecord) or the title
|
||||
local id=$1 fetched
|
||||
if [[ $(station "$id" radiorecord) == true ]]; then
|
||||
fetched=$(curl -sf --compressed --max-time 8 "$api/station/history/?id=$id" 2>/dev/null \
|
||||
| jq -c '.result.history[0] | {artist: (.artist // ""), song: (.song // ""), image600: (.image600 // "")}' 2>/dev/null)
|
||||
[[ -n $fetched && $fetched != null ]] && SONG=$fetched
|
||||
if [ "$PID" -gt 0 ] && kill -0 "$PID" 2>/dev/null; then
|
||||
local node_id; node_id=$(get_mpv_node)
|
||||
[ -n "$node_id" ] && wpctl get-volume "$node_id" 2>/dev/null \
|
||||
| awk '{printf "%d", $2 * 100}'
|
||||
else
|
||||
SONG=$(jq -cn --arg t "$(station "$id" title)" '{artist: "", song: $t, image600: ""}')
|
||||
local player; player=$(playerctl -l 2>/dev/null | grep -Ev '^mpv' | head -1)
|
||||
[ -n "$player" ] && playerctl -p "$player" volume 2>/dev/null \
|
||||
| awk '{printf "%d", $1 * 100}'
|
||||
fi
|
||||
}
|
||||
|
||||
song_idle() { # ID → placeholder with the station's name and logo
|
||||
SONG=$(jq -cn --arg t "$(station "$1" title)" --arg i "$(station "$1" icon_fill_white)" \
|
||||
'{artist: "", song: $t, image600: $i}')
|
||||
do_vol() {
|
||||
local vol="${1%.*}"
|
||||
if [ "$PID" -gt 0 ] && kill -0 "$PID" 2>/dev/null; then
|
||||
local node_id; node_id=$(get_mpv_node)
|
||||
[ -n "$node_id" ] && wpctl set-volume "$node_id" "${vol}%"
|
||||
else
|
||||
playerctl volume "$(awk -v v="$vol" 'BEGIN{printf "%.2f", v/100}')" 2>/dev/null
|
||||
fi
|
||||
eww update radio-vol="$vol"
|
||||
}
|
||||
|
||||
# playerctl --follow line: media\tPLAYER\tSTATUS\tARTIST\tTITLE\tART
|
||||
media_event() {
|
||||
local player status artist title art
|
||||
IFS=$'\t' read -r player status artist title art <<<"$1"
|
||||
if [[ -z $player ]]; then
|
||||
MEDIA=$default_media MEDIA_PLAYER=""
|
||||
elif [[ $player != mpv* ]]; then # the radio and jellyfin are mpv, not "external"
|
||||
MEDIA=$(media_json "$player" "$status" "$artist" "$title" "$art")
|
||||
MEDIA_PLAYER=$player
|
||||
do_mute() {
|
||||
local node_id
|
||||
if [ "$PID" -gt 0 ] && kill -0 "$PID" 2>/dev/null; then
|
||||
node_id=$(get_mpv_node)
|
||||
else
|
||||
local player; player=$(playerctl -l 2>/dev/null | grep -Ev '^mpv' | head -1)
|
||||
[ -n "$player" ] && node_id=$(get_stream_node "${player%%.*}")
|
||||
fi
|
||||
[ -z "$node_id" ] && return
|
||||
wpctl set-mute "$node_id" toggle
|
||||
if wpctl get-volume "$node_id" 2>/dev/null | grep -q MUTED; then
|
||||
eww update radio-muted=true
|
||||
else
|
||||
eww update radio-muted=false
|
||||
fi
|
||||
}
|
||||
|
||||
_media_events() {
|
||||
exec playerctl -a --follow metadata \
|
||||
--format $'media\t{{playerName}}\t{{status}}\t{{artist}}\t{{title}}\t{{mpris:artUrl}}'
|
||||
}
|
||||
|
||||
refresh() {
|
||||
local line id now
|
||||
for line in "$@"; do
|
||||
[[ $line == media$'\t'* ]] && media_event "${line#media$'\t'}"
|
||||
done
|
||||
# a player that quit without a final metadata line
|
||||
if [[ -n $MEDIA_PLAYER ]] && ! playerctl -l 2>/dev/null | grep -qx "$MEDIA_PLAYER"; then
|
||||
MEDIA=$default_media MEDIA_PLAYER=""
|
||||
fi
|
||||
|
||||
id=$(current_id)
|
||||
now=$SECONDS
|
||||
if playing; then
|
||||
if [[ $PLAYING != true ]] || ((now - LAST_SONG >= 15)); then
|
||||
PLAYING=true
|
||||
song_playing "$id"
|
||||
LAST_SONG=$now
|
||||
fi
|
||||
elif [[ $PLAYING != false ]]; then
|
||||
PLAYING=false
|
||||
song_idle "$id"
|
||||
fi
|
||||
|
||||
emit "$(jq -cn --argjson stations "$STATIONS" --argjson radio "$id" \
|
||||
--argjson paused "$([[ $PLAYING == true ]] && echo 0 || echo 1)" \
|
||||
--argjson song "$SONG" --argjson media "$MEDIA" \
|
||||
'{is_paused: $paused, song: $song, radio: $radio, stations: $stations, media: $media}')"
|
||||
|
||||
local v
|
||||
v=$(get_volume)
|
||||
if [[ -n $v && $v != "$LAST_VOL" ]]; then
|
||||
LAST_VOL=$v
|
||||
eww update radio-vol="$v" 2>/dev/null
|
||||
fi
|
||||
do_start() {
|
||||
[ "$RADIO_ID" -le 0 ] && return
|
||||
STATIONS=$(get_stations)
|
||||
RADIO_URL=$(get_stream_url)
|
||||
[ -z "$RADIO_URL" ] || [ "$RADIO_URL" = "null" ] && return
|
||||
[ "$PID" -gt 0 ] && kill "$PID" 2>/dev/null
|
||||
nohup mpv --no-video --quiet "$RADIO_URL" >/dev/null 2>&1 &
|
||||
echo $! > "$MPV_PID_FILE"
|
||||
echo "$RADIO_ID" > "$RADIO_ID_FILE"
|
||||
}
|
||||
|
||||
status_loop() {
|
||||
STATIONS=$(stations)
|
||||
SONG=$default_song MEDIA=$default_media MEDIA_PLAYER="" PLAYING="" LAST_SONG=0 LAST_VOL=""
|
||||
refresh
|
||||
mux_init
|
||||
mux_add _media_events
|
||||
mux_tick 2
|
||||
mux_loop refresh
|
||||
STATIONS=$(get_stations)
|
||||
echo "$(emit_status)"
|
||||
|
||||
last_pid_check=0
|
||||
last_song_fetch=0
|
||||
last_media_fetch=0
|
||||
|
||||
while true; do
|
||||
now=$(date -u +%s%3N)
|
||||
|
||||
if (( now - last_pid_check > 1000 )); then
|
||||
update_state
|
||||
NEW_STATUS=$(emit_status)
|
||||
if [ "$NEW_STATUS" != "$STATUS" ]; then STATUS=$NEW_STATUS; echo "$STATUS"; fi
|
||||
last_pid_check=$now
|
||||
fi
|
||||
|
||||
if (( now - last_song_fetch > 15000 )); then
|
||||
if [ "$PAUSED" = 0 ]; then
|
||||
IS_RR=$(echo "$STATIONS" | jq --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].radiorecord // true')
|
||||
if [ "$IS_RR" = "true" ]; then
|
||||
FETCHED=$(get_song)
|
||||
INFO=$(echo "$INFO" "$FETCHED" | jq -s '
|
||||
reduce .[] as $x ({}; . + ($x | with_entries(select(.value != null))))')
|
||||
else
|
||||
STATION_TITLE=$(echo "$STATIONS" | jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].title // ""')
|
||||
INFO=$(jq -cnr --arg title "$STATION_TITLE" '{artist:"",song:$title,image600:""}')
|
||||
fi
|
||||
else
|
||||
STATION_IMG=$(echo "$STATIONS" \
|
||||
| jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].icon_fill_white // ""')
|
||||
STATION_TITLE=$(echo "$STATIONS" \
|
||||
| jq -r --argjson id "$RADIO_ID" 'map(select(.id == $id))[0].title // ""')
|
||||
INFO=$(jq -cnr --arg img "$STATION_IMG" --arg title "$STATION_TITLE" \
|
||||
'{artist:"",song:$title,image600:$img}')
|
||||
fi
|
||||
NEW_STATUS=$(emit_status)
|
||||
if [ "$NEW_STATUS" != "$STATUS" ]; then STATUS=$NEW_STATUS; echo "$STATUS"; fi
|
||||
last_song_fetch=$now
|
||||
fi
|
||||
|
||||
if (( now - last_media_fetch > 3000 )); then
|
||||
MEDIA=$(get_player_info)
|
||||
NEW_STATUS=$(emit_status)
|
||||
if [ "$NEW_STATUS" != "$STATUS" ]; then STATUS=$NEW_STATUS; echo "$STATUS"; fi
|
||||
VOL=$(get_volume)
|
||||
[ -n "$VOL" ] && eww update radio-vol="$VOL" 2>/dev/null
|
||||
last_media_fetch=$now
|
||||
fi
|
||||
|
||||
sleep 0.5
|
||||
done
|
||||
}
|
||||
|
||||
case ${1:-} in
|
||||
start) detach_self "$@"; start "$2" ;;
|
||||
stop) detach_self "$@"; stop ;;
|
||||
toggle) detach_self "$@"; if playing; then stop; else start "$(current_id)"; fi ;;
|
||||
vol) detach_self "$@"; set_volume "$2" ;;
|
||||
mute) detach_self "$@"; toggle_mute ;;
|
||||
*) status_loop ;;
|
||||
case "$1" in
|
||||
start)
|
||||
RADIO_ID="$2"
|
||||
echo "$RADIO_ID" > "$RADIO_ID_FILE"
|
||||
do_start
|
||||
;;
|
||||
vol)
|
||||
do_vol "$2"
|
||||
;;
|
||||
mute)
|
||||
update_state
|
||||
do_mute
|
||||
;;
|
||||
toggle)
|
||||
update_state
|
||||
if [ "$PAUSED" = 1 ]; then
|
||||
[ "$RADIO_ID" -gt 0 ] && do_start
|
||||
else
|
||||
[ "$PID" -gt 0 ] && kill "$PID" 2>/dev/null
|
||||
rm -f "$MPV_PID_FILE"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
status_loop
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,24 +1,23 @@
|
||||
#!/usr/bin/env bash
|
||||
# Toggle the warm/low-contrast screen shader. fp16 rendering is switched off
|
||||
# with it: the shader is written for 8-bit output.
|
||||
shader="$HOME/.config/eww/shaders/read-mode.glsl"
|
||||
SHADER="$HOME/.config/eww/shaders/read-mode.glsl"
|
||||
|
||||
active() { hyprctl getoption decoration:screen_shader 2>/dev/null | grep -qF "$shader"; }
|
||||
is_active() {
|
||||
hyprctl getoption decoration:screen_shader | grep -qF "$SHADER"
|
||||
}
|
||||
|
||||
case ${1:-} in
|
||||
status) active && echo true || echo false ;;
|
||||
case "$1" in
|
||||
status)
|
||||
is_active && echo true || echo false
|
||||
;;
|
||||
*)
|
||||
detach_self "$@"
|
||||
if active; then
|
||||
hyprctl eval 'hl.config({ decoration = { screen_shader = "" } })' >/dev/null
|
||||
hyprctl eval 'hl.config({ render = { use_fp16 = 2 } })' >/dev/null
|
||||
state=false
|
||||
if is_active; then
|
||||
hyprctl eval 'hl.config({ decoration = { screen_shader = "" } })'
|
||||
hyprctl eval 'hl.config({ render = { use_fp16 = 2 } })'
|
||||
echo false
|
||||
else
|
||||
hyprctl eval 'hl.config({ render = { use_fp16 = 0 } })' >/dev/null
|
||||
hyprctl eval "hl.config({ decoration = { screen_shader = \"$shader\" } })" >/dev/null
|
||||
state=true
|
||||
hyprctl eval 'hl.config({ render = { use_fp16 = 0 } })'
|
||||
hyprctl eval "hl.config({ decoration = { screen_shader = \"$SHADER\" } })"
|
||||
echo true
|
||||
fi
|
||||
eww update read-mode="$state" 2>/dev/null
|
||||
echo "$state"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
# Region screenshot → satty (annotate, copy to clipboard), detached from eww.
|
||||
eww close popup 2>/dev/null
|
||||
eww update active-panel= 2>/dev/null
|
||||
hyprshot=$(command -v hyprshot)
|
||||
satty=$(command -v satty)
|
||||
wl_copy=$(command -v wl-copy)
|
||||
detach "$BASH" -c 'sleep 0.15; "$1" -m region --raw | "$2" --filename - --early-exit --action-on-enter save-to-clipboard --copy-command "$3"' \
|
||||
screenshot "$hyprshot" "$satty" "$wl_copy"
|
||||
sleep 0.15
|
||||
hyprshot -m region --raw | satty --filename - --early-exit --action-on-enter save-to-clipboard --copy-command wl-copy
|
||||
|
||||
@@ -1,118 +1,61 @@
|
||||
#!/usr/bin/env bash
|
||||
# Battery state from sysfs; refreshes on power_supply udev events and every
|
||||
# 30 s. Emits a `state` (charging / discharging / low / critical / full /
|
||||
# idle) that the CSS maps to a colour, instead of hard-coding one here.
|
||||
#
|
||||
# Every refresh also appends a sample to $XDG_STATE_HOME/eww/battery.log,
|
||||
# which feeds the drain rate (%/h) and the history plot.
|
||||
#!/usr/bin/env zsh
|
||||
|
||||
bat=""
|
||||
for d in /sys/class/power_supply/*; do
|
||||
[[ -r $d/type && $(<"$d/type") == Battery ]] && { bat=$d; break; }
|
||||
done
|
||||
if [[ -z $bat ]]; then
|
||||
echo '{"visible":false,"percentage":0,"wattage":"","status":"","time":"","state":"none","rate":"","history":[]}'
|
||||
exit 0
|
||||
fi
|
||||
icons=("" "" "" "" "" "" "" "" "" "" "")
|
||||
num_icons=$(awk -v n="${#icons[@]}" 'BEGIN{print 100 / n}')
|
||||
BATTERY="/sys/class/power_supply/BAT0"
|
||||
|
||||
log=${XDG_STATE_HOME:-$HOME/.local/state}/eww/battery.log
|
||||
hist_hours=6 buckets=24
|
||||
mkdir -p "${log%/*}" && touch "$log"
|
||||
|
||||
attr() { # first readable, non-empty attribute of the list, else 0
|
||||
local a v
|
||||
for a in "$@"; do
|
||||
v=$(cat "$bat/$a" 2>/dev/null) && [[ -n $v ]] && { echo "$v"; return; }
|
||||
done
|
||||
echo 0
|
||||
geticon() {
|
||||
level=$(awk -v n="$CAPACITY" -v c="$num_icons" 'BEGIN{print int(n/c-1)}')
|
||||
echo "${icons[$level]}"
|
||||
}
|
||||
|
||||
hours_to_clock() { awk -v h="$1" 'BEGIN { printf "%d:%02d", int(h), int((h - int(h)) * 60 + 0.5) }'; }
|
||||
status() {
|
||||
if [ "$STATE" = "Charging" ]; then
|
||||
echo -n "Charging"
|
||||
|
||||
# Append "epoch pct state" and, once the head is an hour past the plot window,
|
||||
# drop everything older than the window.
|
||||
log_sample() {
|
||||
local now=$1 first
|
||||
printf '%s %s %s\n' "$now" "$2" "$3" >> "$log"
|
||||
read -r first _ < "$log"
|
||||
((first < now - (hist_hours + 1) * 3600)) || return 0
|
||||
awk -v min=$((now - hist_hours * 3600)) '$1 >= min' "$log" > "$log.tmp" && mv "$log.tmp" "$log"
|
||||
}
|
||||
|
||||
# %/h over the last 30 min of samples in the current state, signed; empty
|
||||
# until there are 5 min of them.
|
||||
drain_rate() {
|
||||
awk -v now="$1" -v st="$2" '
|
||||
$1 >= now - 1800 && $3 == st { if (!n++) { t0 = $1; p0 = $2 } t1 = $1; p1 = $2 }
|
||||
END { if (n > 1 && t1 - t0 >= 300) printf "%.1f", (p1 - p0) * 3600 / (t1 - t0) }' "$log"
|
||||
}
|
||||
|
||||
# The plot window split into buckets: mean % of the bucket's samples (-1 when
|
||||
# it has none), the state of its last sample, and its start time as label.
|
||||
plot() {
|
||||
awk -v now="$1" -v hours="$hist_hours" -v n="$buckets" '
|
||||
BEGIN { w = hours * 3600 / n; t0 = now - hours * 3600 }
|
||||
$1 >= t0 { b = int(($1 - t0) / w); if (b >= n) b = n - 1; sum[b] += $2; cnt[b]++; st[b] = $3 }
|
||||
END {
|
||||
printf "["
|
||||
for (b = 0; b < n; b++) {
|
||||
p = -1; s = "none"
|
||||
if (cnt[b]) {
|
||||
p = sprintf("%.1f", sum[b] / cnt[b])
|
||||
s = st[b] == "c" ? "charging" : st[b] == "d" ? "discharging" : "idle"
|
||||
if (st[b] == "d" && p < 25) s = "low"
|
||||
if (st[b] == "d" && p <= 15) s = "critical"
|
||||
}
|
||||
printf "%s{\"t\":\"%s\",\"p\":%s,\"s\":\"%s\"}", (b ? "," : ""), strftime("%H:%M", t0 + b * w), p, s
|
||||
}
|
||||
printf "]"
|
||||
}' "$log"
|
||||
}
|
||||
|
||||
state() {
|
||||
local now cap status rate now_e full power pct st time="" wattage state
|
||||
now=$(printf '%(%s)T' -1)
|
||||
cap=$(attr capacity)
|
||||
status=$(attr status)
|
||||
rate=$(attr power_now current_now) # µW or µA
|
||||
now_e=$(attr energy_now charge_now) # µWh or µAh — same unit as rate, so now_e/rate = hours
|
||||
full=$(attr energy_full charge_full)
|
||||
if [[ -r $bat/power_now ]]; then power=$rate; else power=$((rate * $(attr voltage_now) / 1000000)); fi
|
||||
wattage=$(awk -v p="$power" 'BEGIN { printf "%.1f W", p / 1000000 }')
|
||||
pct=$(awk -v n="$now_e" -v f="$full" -v c="$cap" 'BEGIN { printf "%.1f", (f > 0 ? 100 * n / f : c) }')
|
||||
if ((rate > 0)); then
|
||||
case $status in
|
||||
Discharging) time=$(hours_to_clock "$(awk -v n="$now_e" -v r="$rate" 'BEGIN { print n / r }')") ;;
|
||||
Charging) time=$(hours_to_clock "$(awk -v n="$now_e" -v f="$full" -v r="$rate" 'BEGIN { print (f - n) / r }')") ;;
|
||||
esac
|
||||
if [ "$RATE" -gt 0 ]; then
|
||||
echo ", $(gettime) left"
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
elif [ "$STATE" = "Discharging" ]; then
|
||||
echo "$(gettime)h left"
|
||||
else
|
||||
echo "Fully Charged"
|
||||
fi
|
||||
case $status in
|
||||
Charging)
|
||||
state=charging st=c
|
||||
status="Charging${time:+, $time left}"
|
||||
;;
|
||||
Discharging)
|
||||
state=discharging st=d
|
||||
((cap < 25)) && state=low
|
||||
((cap <= 15)) && state=critical
|
||||
status=${time:+$time left}
|
||||
;;
|
||||
Full)
|
||||
state=full st=i
|
||||
status="Fully charged"
|
||||
;;
|
||||
*) state=idle st=i ;;
|
||||
esac
|
||||
log_sample "$now" "$pct" "$st"
|
||||
printf '{"visible":true,"percentage":%s,"wattage":"%s","status":"%s","time":"%s","state":"%s","rate":"%s","history":%s}' \
|
||||
"$cap" "$wattage" "$(jstr "$status")" "$time" "$state" "$(drain_rate "$now" "$st")" "$(plot "$now")"
|
||||
}
|
||||
|
||||
refresh() { emit "$(state)"; }
|
||||
_ps_events() { exec udevadm monitor --udev --subsystem-match=power_supply; }
|
||||
color() {
|
||||
[ "$CAPACITY" -le 20 ] && echo '#f38ba8' || echo '#a6e3a1'
|
||||
}
|
||||
|
||||
refresh
|
||||
mux_init
|
||||
mux_add _ps_events
|
||||
mux_tick 30
|
||||
mux_loop refresh
|
||||
wattage() {
|
||||
awk -v rate="$RATE" -v uw="1000000" 'BEGIN{print sprintf("%.1f W", rate/uw)}'
|
||||
}
|
||||
|
||||
gettime() {
|
||||
FULL=$(cat $BATTERY/energy_full)
|
||||
NOW=$(cat $BATTERY/energy_now)
|
||||
|
||||
if [ "$RATE" -gt 0 ]; then
|
||||
if [ "$STATE" = "Discharging" ]; then
|
||||
EX=$(( ($NOW*1.0) / $RATE))
|
||||
else
|
||||
EX=$(( (($FULL - $NOW)*1.0) / $RATE))
|
||||
fi
|
||||
date -u -d@"$(awk -v ex="$EX" 'BEGIN{print ex * 3600}')" +%H:%M
|
||||
fi
|
||||
}
|
||||
|
||||
if [ -d "$BATTERY" ]; then
|
||||
while true; do
|
||||
RATE=$(cat $BATTERY/power_now)
|
||||
CAPACITY=$(cat $BATTERY/capacity)
|
||||
STATE=$(cat $BATTERY/status)
|
||||
|
||||
echo '{ "visible": true, "icon": "'$(geticon)'", "percentage": '$CAPACITY', "wattage": "'$(wattage)'", "status": "'$(status)'", "color": "'$(color)'" }'
|
||||
sleep 15
|
||||
done
|
||||
else
|
||||
echo '{ "visible": false, "icon": "", "percentage": 0, "wattage": "", "status": "", "color": "#a6e3a1" }'
|
||||
fi
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
#!/usr/bin/env bash
|
||||
COLS=4
|
||||
declare -A prev_idle prev_total
|
||||
|
||||
emit_grid() {
|
||||
local rows=() row_items=()
|
||||
while IFS= read -r line; do
|
||||
[[ $line =~ ^cpu([0-9]+) ]] || continue
|
||||
local core="${BASH_REMATCH[1]}"
|
||||
read -ra f <<< "$line"
|
||||
local idle=$(( f[4] + f[5] ))
|
||||
local total=0
|
||||
for x in "${f[@]:1}"; do (( total += x )); done
|
||||
|
||||
local usage="0.0"
|
||||
if [[ -n "${prev_total[$core]+x}" ]]; then
|
||||
local dt=$(( total - prev_total[$core] ))
|
||||
local di=$(( idle - prev_idle[$core] ))
|
||||
(( dt > 0 )) && usage=$(awk "BEGIN{printf \"%.1f\", 100*(1-$di/$dt)}")
|
||||
fi
|
||||
prev_idle[$core]=$idle
|
||||
prev_total[$core]=$total
|
||||
|
||||
local freq=0
|
||||
local fpath="/sys/devices/system/cpu/cpu${core}/cpufreq/scaling_cur_freq"
|
||||
[[ -r $fpath ]] && freq=$(( $(< "$fpath") / 1000 ))
|
||||
|
||||
row_items+=("{\"core\":$core,\"usage\":$usage,\"freq\":$freq}")
|
||||
|
||||
if (( ${#row_items[@]} == COLS )); then
|
||||
local row; printf -v row '%s,' "${row_items[@]}"; row="${row%,}"
|
||||
rows+=("[$row]")
|
||||
row_items=()
|
||||
fi
|
||||
done < /proc/stat
|
||||
|
||||
if (( ${#row_items[@]} > 0 )); then
|
||||
local row; printf -v row '%s,' "${row_items[@]}"; row="${row%,}"
|
||||
rows+=("[$row]")
|
||||
fi
|
||||
|
||||
local out; printf -v out '%s,' "${rows[@]}"; out="${out%,}"
|
||||
echo "[$out]"
|
||||
}
|
||||
|
||||
while true; do
|
||||
emit_grid
|
||||
sleep 2
|
||||
done
|
||||
@@ -1,10 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
# CPU package temperature in °C from the first known hwmon driver.
|
||||
for name in k10temp zenpower coretemp cpu_thermal acpitz; do
|
||||
for d in /sys/class/hwmon/hwmon*; do
|
||||
[[ -r $d/name && $(<"$d/name") == "$name" && -r $d/temp1_input ]] || continue
|
||||
awk '{ printf "%d\n", $1 / 1000 }' "$d/temp1_input"
|
||||
exit 0
|
||||
done
|
||||
done
|
||||
echo 0
|
||||
dir=$(grep -rl k10temp /sys/class/hwmon/*/name 2>/dev/null | head -1 | xargs dirname)
|
||||
awk '{printf "%.0f\n", $1/1000}' "$dir/temp1_input"
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# AMD GPU activity, clocks, temperature, power and VRAM via amdgpu_top's JSON
|
||||
# stream, flattened to what the widgets need.
|
||||
exec amdgpu_top -J -s 5000 | jq -c --unbuffered '.devices[0] | {
|
||||
amdgpu_top -J -s 5000 | jq -c --unbuffered '.devices[0] | {
|
||||
gfx_pct: (.gpu_activity.GFX.value // 0),
|
||||
mem_pct: (.gpu_activity.Memory.value // 0),
|
||||
media_pct: (.gpu_activity.MediaEngine.value // 0),
|
||||
|
||||
@@ -1,18 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
# RAM and swap from /proc/meminfo every 3 s. "used" follows `free`
|
||||
# (total - available); "cached" is buffers + page cache + reclaimable slab.
|
||||
# Human values use SI units like the previous `free --si`.
|
||||
while :; do
|
||||
awk '
|
||||
/^MemTotal:/ { t = $2 } /^MemAvailable:/ { a = $2 }
|
||||
/^Buffers:/ { b = $2 } /^Cached:/ { c = $2 }
|
||||
/^SReclaimable:/ { s = $2 } /^SwapTotal:/ { st = $2 }
|
||||
/^SwapFree:/ { sf = $2 }
|
||||
function h(kb) { return kb >= 1000000 ? sprintf("%.1fG", kb / 1000000) : sprintf("%.0fM", kb / 1000) }
|
||||
END {
|
||||
used = t - a; cached = b + c + s; su = st - sf
|
||||
printf "{\"total\":%d,\"used\":%d,\"cached\":%d,\"human\":{\"total\":\"%s\",\"used\":\"%s\",\"cached\":\"%s\"},", t, used, cached, h(t), h(used), h(cached)
|
||||
printf "\"swap\":{\"total\":%d,\"used\":%d,\"human\":{\"total\":\"%s\",\"used\":\"%s\"}}}\n", st, su, h(st), h(su)
|
||||
}' /proc/meminfo
|
||||
sleep 3
|
||||
#!/usr/bin/env zsh
|
||||
|
||||
total="$(free --si | rg Mem | awk '{print $2}')"
|
||||
|
||||
human() {
|
||||
awk -v mem="$1" 'BEGIN{print sprintf("%.1f%s", mem/1000/(mem > 1000000 ? 1000 : 1), mem > 1000000 ? "G" : "M")}'
|
||||
}
|
||||
|
||||
free --si -s 3 | rg --line-buffered Mem | while read -r line; do
|
||||
used=$(echo "$line" | awk '{print $3}')
|
||||
cached=$(echo "$line" | awk '{print $6}')
|
||||
echo '{"human": {"total": "'$(human "$total")'", "used": "'$(human "$used")'", "cached": "'$(human "$cached")'"}, "total": "'$total'", "used": "'$used'", "cached": "'$cached'"}'
|
||||
done
|
||||
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
free --si | awk '/Swap/ {
|
||||
used=$3; total=$2
|
||||
u = sprintf("%.1fG", used/1000000)
|
||||
t = sprintf("%.1fG", total/1000000)
|
||||
printf "{\"used\":%d,\"total\":%d,\"human\":{\"used\":\"%s\",\"total\":\"%s\"}}\n", used, total, u, t
|
||||
}'
|
||||
@@ -1,46 +1,45 @@
|
||||
#!/usr/bin/env bash
|
||||
# Default sink / source volume for the popup. Refreshes on PipeWire events
|
||||
# (pactl subscribe on the pipewire-pulse socket) and every 30 s.
|
||||
#
|
||||
# volume status loop (deflisten)
|
||||
# volume setvol SINK|SOURCE PERCENT
|
||||
# volume mute SINK|SOURCE
|
||||
|
||||
icons=("" "" "")
|
||||
volicons=("" "" "")
|
||||
|
||||
level() { # prints "<percent> <muted>"
|
||||
wpctl get-volume "@DEFAULT_AUDIO_$1@" 2>/dev/null \
|
||||
| awk '{ printf "%d %s\n", $2 * 100 + 0.5, ($0 ~ /MUTED/) ? "true" : "false" }'
|
||||
vol() { wpctl get-volume @DEFAULT_AUDIO_"$1"@ | awk '{print int($2*100)}'; }
|
||||
ismuted() { wpctl get-volume @DEFAULT_AUDIO_"$1"@ | rg -qi muted; echo -n $?; }
|
||||
setvol() { wpctl set-volume @DEFAULT_AUDIO_"$1"@ "$(awk -v n="$2" 'BEGIN{print n/100}')"; }
|
||||
setmute() { wpctl set-mute @DEFAULT_AUDIO_"$1"@ toggle; }
|
||||
|
||||
gen_output() {
|
||||
percent=$(vol "SINK")
|
||||
lvl=$(awk -v n="$percent" 'BEGIN{print int(n/34)}')
|
||||
sink_muted=$(ismuted "SINK")
|
||||
source_muted=$(ismuted "SOURCE")
|
||||
sink=$(wpctl inspect @DEFAULT_AUDIO_SINK@ 2>/dev/null | grep -m1 'node\.nick' | sed 's/.*= "\(.*\)"/\1/')
|
||||
|
||||
[ "$sink_muted" = 0 ] && icon="" || icon="${volicons[$lvl]}"
|
||||
[ "$source_muted" = 0 ] && mic_icon="" || mic_icon=""
|
||||
|
||||
printf '{"icon":"%s","percent":%s,"sink_muted":%s,"mic_icon":"%s","microphone":%s,"source_muted":%s,"sink":"%s"}\n' \
|
||||
"$icon" "$percent" "$([ "$sink_muted" = 0 ] && echo true || echo false)" \
|
||||
"$mic_icon" "$(vol SOURCE)" "$([ "$source_muted" = 0 ] && echo true || echo false)" "$sink"
|
||||
}
|
||||
|
||||
sink_name() {
|
||||
wpctl inspect @DEFAULT_AUDIO_SINK@ 2>/dev/null \
|
||||
| awk -F'"' '/node\.nick/ { n = $2 } /node\.description/ { d = $2 } END { print (n != "" ? n : d) }'
|
||||
}
|
||||
|
||||
state() {
|
||||
local vol muted mic mic_muted icon mic_icon lvl
|
||||
read -r vol muted < <(level SINK)
|
||||
read -r mic mic_muted < <(level SOURCE)
|
||||
vol=${vol:-0} muted=${muted:-false} mic=${mic:-0} mic_muted=${mic_muted:-false}
|
||||
lvl=$((vol >= 67 ? 2 : vol >= 34 ? 1 : 0))
|
||||
if [[ $muted == true ]]; then icon=""; else icon=${icons[$lvl]}; fi
|
||||
if [[ $mic_muted == true ]]; then mic_icon=""; else mic_icon=""; fi
|
||||
printf '{"icon":"%s","percent":%d,"sink_muted":%s,"mic_icon":"%s","microphone":%d,"source_muted":%s,"sink":"%s"}' \
|
||||
"$icon" "$vol" "$muted" "$mic_icon" "$mic" "$mic_muted" "$(jstr "$(sink_name)")"
|
||||
}
|
||||
|
||||
refresh() { emit "$(state)"; }
|
||||
_pw_events() { pactl subscribe 2>/dev/null | grep --line-buffered -E "on (sink|source|server) "; }
|
||||
|
||||
case ${1:-} in
|
||||
mute) wpctl set-mute "@DEFAULT_AUDIO_$2@" toggle ;;
|
||||
setvol) wpctl set-volume -l 1.0 "@DEFAULT_AUDIO_$2@" "${3%.*}%" ;;
|
||||
case "$1" in
|
||||
mute) setmute "$2" ;;
|
||||
setvol) setvol "$2" "$3" ;;
|
||||
*)
|
||||
refresh
|
||||
mux_init
|
||||
mux_add _pw_events
|
||||
mux_tick 30
|
||||
mux_loop refresh
|
||||
gen_output
|
||||
|
||||
tmp=$(mktemp -d)
|
||||
pipe="$tmp/vol-events"
|
||||
mkfifo "$pipe"
|
||||
trap 'rm -rf "$tmp"; kill 0 2>/dev/null' EXIT INT TERM
|
||||
|
||||
# 2s polling fallback
|
||||
(while true; do sleep 2; echo poll; done) > "$pipe" &
|
||||
# PipeWire property-change events (fires on mute/volume change)
|
||||
(pw-cli -m 2>/dev/null | grep --line-buffered "changed") > "$pipe" &
|
||||
|
||||
while IFS= read -r _ < "$pipe"; do
|
||||
gen_output
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
#!/usr/bin/env bash
|
||||
# Wallpaper chooser (wofi + awww), detached from eww.
|
||||
eww close popup 2>/dev/null
|
||||
eww update active-panel= 2>/dev/null
|
||||
detach "$BASH" "$HOME/.config/script/wallpaper.sh"
|
||||
nohup bash "$HOME/.config/script/wallpaper.sh" >/dev/null 2>&1 &
|
||||
|
||||
@@ -1,48 +1,38 @@
|
||||
#!/usr/bin/env bash
|
||||
# Weather from met.no for the IP-geolocated position. The last result is
|
||||
# cached on disk, so re-opening the panel is instant and offline-safe; the
|
||||
# network is hit at most every 10 minutes.
|
||||
|
||||
fallback='{"temp":0,"feelslike":0,"humidity":0,"wind":0,"desc":"Unavailable","icon":"","city":""}'
|
||||
cache_dir=${XDG_CACHE_HOME:-$HOME/.cache}/eww
|
||||
loc_cache=$cache_dir/weather-location.json
|
||||
wx_cache=$cache_dir/weather.json
|
||||
interval=600
|
||||
ua="eww-bar/1.0 cedric.hoelzl@gmail.com"
|
||||
mkdir -p "$cache_dir"
|
||||
FALLBACK='{"temp":0,"feelslike":0,"humidity":0,"wind":0,"desc":"Unavailable","icon":"","city":""}'
|
||||
CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/eww"
|
||||
LOC_CACHE="$CACHE_DIR/weather-location"
|
||||
UA="eww-bar/1.0 cedric.hoelzl@gmail.com"
|
||||
|
||||
fresh() { [[ -s $1 ]] && [[ -n $(find "$1" -mmin "-$2" 2>/dev/null) ]]; } # FILE MINUTES
|
||||
mkdir -p "$CACHE_DIR"
|
||||
|
||||
location() {
|
||||
fresh "$loc_cache" 60 && { cat "$loc_cache"; return; }
|
||||
local data
|
||||
if data=$(curl -sf --max-time 5 "http://ip-api.com/json?fields=lat,lon,city"); then
|
||||
printf '%s' "$data" | tee "$loc_cache"
|
||||
elif [[ -s $loc_cache ]]; then
|
||||
cat "$loc_cache"
|
||||
else
|
||||
return 1
|
||||
get_location() {
|
||||
# Cache location for 1 hour; IP rarely changes
|
||||
if [ -f "$LOC_CACHE" ] && [ -n "$(find "$LOC_CACHE" -mmin -60 2>/dev/null)" ]; then
|
||||
cat "$LOC_CACHE"
|
||||
return 0
|
||||
fi
|
||||
data=$(curl -sf --max-time 5 "http://ip-api.com/json?fields=lat,lon,city") || return 1
|
||||
echo "$data" | tee "$LOC_CACHE"
|
||||
}
|
||||
|
||||
icon_for() {
|
||||
case $1 in
|
||||
case "$1" in
|
||||
*thunder*) echo "" ;;
|
||||
*snow* | *sleet*) echo "" ;;
|
||||
heavyrain*) echo "" ;;
|
||||
*rain* | *shower*) echo "" ;;
|
||||
*snow*|*sleet*) echo "" ;;
|
||||
heavyrain*|*heavyrainshowers*) echo "" ;;
|
||||
*rain*|*shower*) echo "" ;;
|
||||
fog*) echo "" ;;
|
||||
cloudy*) echo "" ;;
|
||||
partlycloudy*) echo "" ;;
|
||||
fair* | clearsky*) echo "" ;;
|
||||
fair*|clearsky*) echo "" ;;
|
||||
*) echo "" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
desc_for() {
|
||||
local c=$1
|
||||
c=${c%_day}; c=${c%_night}; c=${c%_polartwilight}
|
||||
case $c in
|
||||
case "$(echo "$1" | sed 's/_day//;s/_night//;s/_polartwilight//')" in
|
||||
clearsky) echo "Clear sky" ;;
|
||||
fair) echo "Fair" ;;
|
||||
partlycloudy) echo "Partly cloudy" ;;
|
||||
@@ -58,49 +48,53 @@ desc_for() {
|
||||
rainandthunder) echo "Rain & thunder" ;;
|
||||
heavyrainandthunder) echo "Heavy rain & thunder" ;;
|
||||
*showersandthunder) echo "Showers & thunder" ;;
|
||||
lightsleet | lightsleetshowers) echo "Light sleet" ;;
|
||||
sleet | sleetshowers) echo "Sleet" ;;
|
||||
heavysleet | heavysleetshowers) echo "Heavy sleet" ;;
|
||||
lightsleet|lightsleetshowers) echo "Light sleet" ;;
|
||||
sleet|sleetshowers) echo "Sleet" ;;
|
||||
heavysleet|heavysleetshowers) echo "Heavy sleet" ;;
|
||||
*sleetandthunder) echo "Sleet & thunder" ;;
|
||||
lightsnow | lightsnowshowers) echo "Light snow" ;;
|
||||
snow | snowshowers) echo "Snow" ;;
|
||||
heavysnow | heavysnowshowers) echo "Heavy snow" ;;
|
||||
lightsnow|lightsnowshowers) echo "Light snow" ;;
|
||||
snow|snowshowers) echo "Snow" ;;
|
||||
heavysnow|heavysnowshowers) echo "Heavy snow" ;;
|
||||
*snowandthunder) echo "Snow & thunder" ;;
|
||||
*) echo "$c" ;;
|
||||
*) echo "$1" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
fetch() {
|
||||
local loc lat lon city data temp humidity wind code feelslike
|
||||
loc=$(location) || return 1
|
||||
read -r lat lon city < <(jq -r '"\(.lat) \(.lon) \(.city)"' <<<"$loc")
|
||||
data=$(curl -sf --max-time 8 -H "User-Agent: $ua" -H "Accept: application/json" \
|
||||
"https://api.met.no/weatherapi/locationforecast/2.0/compact?lat=$lat&lon=$lon") || return 1
|
||||
read -r temp humidity wind code < <(jq -r '
|
||||
.properties.timeseries[0].data
|
||||
| "\(.instant.details.air_temperature | round) \(.instant.details.relative_humidity | round) \(.instant.details.wind_speed * 3.6 | floor) \(.next_1_hours.summary.symbol_code // .next_6_hours.summary.symbol_code // "cloudy")"' <<<"$data")
|
||||
[[ -n $temp ]] || return 1
|
||||
# Apparent temperature: wind chill below 10 °C, otherwise the air temperature.
|
||||
feelslike=$(awk -v t="$temp" -v v="$wind" 'BEGIN {
|
||||
if (v > 4.8 && t < 10) printf "%d", 13.12 + 0.6215 * t - 11.37 * (v ^ 0.16) + 0.3965 * t * (v ^ 0.16)
|
||||
else printf "%d", t }')
|
||||
printf '{"temp":%s,"feelslike":%s,"humidity":%s,"wind":%s,"desc":"%s","icon":"%s","city":"%s"}' \
|
||||
"$temp" "$feelslike" "$humidity" "$wind" "$(desc_for "$code")" "$(icon_for "$code")" "$(jstr "$city")"
|
||||
}
|
||||
loc=$(get_location) || { echo "$FALLBACK"; return; }
|
||||
lat=$(echo "$loc" | jq -r '.lat')
|
||||
lon=$(echo "$loc" | jq -r '.lon')
|
||||
city=$(echo "$loc" | jq -r '.city')
|
||||
|
||||
refresh() {
|
||||
local out
|
||||
if fresh "$wx_cache" $((interval / 60)); then
|
||||
emit "$(cat "$wx_cache")"
|
||||
elif out=$(fetch); then
|
||||
printf '%s\n' "$out" >"$wx_cache"
|
||||
emit "$out"
|
||||
elif [[ -s $wx_cache ]]; then
|
||||
emit "$(cat "$wx_cache")"
|
||||
data=$(curl -sf --max-time 8 \
|
||||
-H "User-Agent: $UA" \
|
||||
-H "Accept: application/json" \
|
||||
"https://api.met.no/weatherapi/locationforecast/2.0/compact?lat=$lat&lon=$lon") \
|
||||
|| { echo "$FALLBACK"; return; }
|
||||
|
||||
d='.properties.timeseries[0].data'
|
||||
temp=$( echo "$data" | jq -r "${d}.instant.details.air_temperature | round")
|
||||
humidity=$(echo "$data" | jq -r "${d}.instant.details.relative_humidity | round")
|
||||
wind_ms=$( echo "$data" | jq -r "${d}.instant.details.wind_speed")
|
||||
wind=$( echo "$wind_ms" | awk '{printf "%d", $1 * 3.6}')
|
||||
code=$( echo "$data" | jq -r \
|
||||
"(${d}.next_1_hours.summary.symbol_code) // (${d}.next_6_hours.summary.symbol_code) // \"cloudy\"")
|
||||
|
||||
# Simplified apparent temperature: wind chill below 10°C, else = temp
|
||||
feelslike=$(echo "$temp $wind" | awk '{
|
||||
t=$1; v=$2
|
||||
if (v > 4.8 && t < 10)
|
||||
printf "%d", 13.12 + 0.6215*t - 11.37*(v^0.16) + 0.3965*t*(v^0.16)
|
||||
else
|
||||
emit "$fallback"
|
||||
fi
|
||||
printf "%d", t
|
||||
}')
|
||||
|
||||
icon=$(icon_for "$code")
|
||||
desc=$(desc_for "$code")
|
||||
|
||||
printf '{"temp":%s,"feelslike":%s,"humidity":%s,"wind":%s,"desc":"%s","icon":"%s","city":"%s"}\n' \
|
||||
"$temp" "$feelslike" "$humidity" "$wind" "$desc" "$icon" "$city"
|
||||
}
|
||||
|
||||
refresh
|
||||
while sleep "$interval"; do refresh; done
|
||||
fetch
|
||||
while true; do sleep 600; fetch; done
|
||||
|
||||
@@ -1,97 +1,120 @@
|
||||
#!/usr/bin/env bash
|
||||
# Workspace indicator: numbered workspaces 1-9, preceded by named (special)
|
||||
# workspaces except the scratchpad. Keeps a local model of Hyprland's state
|
||||
# from socket2 events and only calls hyprctl on structural changes.
|
||||
#
|
||||
# Entry: {id, name, target, state: focused|active|running|empty,
|
||||
# color: blue|red|grey, sep}
|
||||
|
||||
declare -A ws_windows=() ws_name=() ws_urgent=() mon_active=()
|
||||
focused_ws="" focused_monitor=""
|
||||
|
||||
hypr_json() { hyprctl -j "$1" 2>/dev/null; }
|
||||
declare -A ws_windows=()
|
||||
declare -A ws_name=()
|
||||
declare -A ws_urgent=()
|
||||
declare -A mon_active=()
|
||||
focused_ws=""
|
||||
focused_monitor=""
|
||||
_state=""
|
||||
_color=""
|
||||
|
||||
load_workspaces() {
|
||||
local raw id windows name
|
||||
raw=$(hypr_json workspaces) || return
|
||||
local raw
|
||||
raw=$(hyprctl -j workspaces 2>/dev/null) || return
|
||||
ws_windows=()
|
||||
ws_name=()
|
||||
while read -r id windows name; do
|
||||
ws_windows[$id]=$windows
|
||||
ws_name[$id]=$name
|
||||
done < <(jaq -r '.[] | "\(.id) \(.windows) \(.name)"' <<<"$raw")
|
||||
done < <(printf '%s' "$raw" | jaq -jr '.[] | (.id | tostring), " ", (.windows | tostring), " ", .name, "\n"' 2>/dev/null)
|
||||
}
|
||||
|
||||
load_monitors() {
|
||||
local raw name active focused
|
||||
raw=$(hypr_json monitors) || return
|
||||
local raw
|
||||
raw=$(hyprctl -j monitors 2>/dev/null) || return
|
||||
mon_active=()
|
||||
while read -r name active focused; do
|
||||
mon_active[$name]=$active
|
||||
if [[ $focused == true ]]; then
|
||||
focused_ws=$active
|
||||
focused_ws=""
|
||||
focused_monitor=""
|
||||
while read -r name active_id is_focused; do
|
||||
mon_active[$name]=$active_id
|
||||
if [ "$is_focused" = "true" ]; then
|
||||
focused_ws=$active_id
|
||||
focused_monitor=$name
|
||||
fi
|
||||
done < <(jaq -r '.[] | "\(.name) \(.activeWorkspace.id) \(.focused)"' <<<"$raw")
|
||||
done < <(printf '%s' "$raw" | jaq -jr '.[] | .name, " ", (.activeWorkspace.id | tostring), " ", (.focused | tostring), "\n"' 2>/dev/null)
|
||||
}
|
||||
|
||||
load_urgent() {
|
||||
local raw id
|
||||
raw=$(hypr_json clients) || return
|
||||
local raw
|
||||
raw=$(hyprctl -j clients 2>/dev/null) || return
|
||||
ws_urgent=()
|
||||
while read -r id; do ws_urgent[$id]=1; done \
|
||||
< <(jaq -r '.[] | select(.urgent) | .workspace.id' <<<"$raw")
|
||||
while read -r wsid; do
|
||||
ws_urgent[$wsid]=1
|
||||
done < <(printf '%s' "$raw" | jaq -r '.[] | select(.urgent == true) | (.workspace.id | tostring)' 2>/dev/null)
|
||||
}
|
||||
|
||||
# Window address → workspace id. Events carry the address without the 0x
|
||||
# prefix that hyprctl uses, which is why urgency never showed up before.
|
||||
window_workspace() {
|
||||
hypr_json clients | jaq -r --arg a "0x$1" 'first(.[] | select(.address == $a) | .workspace.id) // empty'
|
||||
}
|
||||
ws_state_color() {
|
||||
local id=$1
|
||||
_state="empty"
|
||||
_color="grey"
|
||||
|
||||
ws_state() { # sets _state / _color for workspace $1
|
||||
local id=$1 mon
|
||||
_state=empty
|
||||
_color=grey
|
||||
if [[ $id == "$focused_ws" ]]; then
|
||||
_state=focused
|
||||
if [ "$id" = "$focused_ws" ]; then
|
||||
_state="focused"
|
||||
else
|
||||
local mon
|
||||
for mon in "${!mon_active[@]}"; do
|
||||
[[ ${mon_active[$mon]} == "$id" ]] && { _state=active; break; }
|
||||
if [ "${mon_active[$mon]}" = "$id" ]; then
|
||||
_state="active"
|
||||
break
|
||||
fi
|
||||
done
|
||||
[[ $_state == empty && ${ws_windows[$id]:-0} -gt 0 ]] && _state=running
|
||||
if [ "$_state" = "empty" ] && [ "${ws_windows[$id]:-0}" -gt 0 ]; then
|
||||
_state="running"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$_state" != "empty" ]; then
|
||||
if [ "${ws_urgent[$id]:-0}" -eq 1 ]; then
|
||||
_color="red"
|
||||
else
|
||||
_color="blue"
|
||||
fi
|
||||
if [[ $_state != empty ]]; then
|
||||
if [[ ${ws_urgent[$id]:-0} == 1 ]]; then _color=red; else _color=blue; fi
|
||||
fi
|
||||
}
|
||||
|
||||
entry() { # id name target [sep]
|
||||
ws_state "$1"
|
||||
ws_entry() {
|
||||
local id=$1 name=$2 target=$3 sep=${4:-false}
|
||||
ws_state_color "$id"
|
||||
printf '{"id":%s,"name":"%s","target":"%s","state":"%s","color":"%s","sep":%s}' \
|
||||
"$1" "$(jstr "$2")" "$(jstr "$3")" "$_state" "$_color" "${4:-false}"
|
||||
"$id" "$name" "$target" "$_state" "$_color" "$sep"
|
||||
}
|
||||
|
||||
generate() {
|
||||
local out='[' sep='' id i named=()
|
||||
printf '['
|
||||
local first=true
|
||||
|
||||
local neg_ids=() id
|
||||
for id in "${!ws_name[@]}"; do
|
||||
[[ $id == -* && ${ws_name[$id]} != "special:magic" ]] && named+=("$id")
|
||||
done
|
||||
if ((${#named[@]})); then
|
||||
while read -r id; do
|
||||
out+="$sep$(entry "$id" "${ws_name[$id]}" "name:${ws_name[$id]}")"
|
||||
sep=,
|
||||
done < <(printf '%s\n' "${named[@]}" | sort -n)
|
||||
if [[ "$id" == -* ]] && [ "${ws_name[$id]}" != "special:magic" ]; then
|
||||
neg_ids+=("$id")
|
||||
fi
|
||||
done
|
||||
|
||||
local has_neg=false
|
||||
if [ ${#neg_ids[@]} -gt 0 ]; then
|
||||
has_neg=true
|
||||
IFS=$'\n' sorted_neg=($(printf '%s\n' "${neg_ids[@]}" | sort -n)); unset IFS
|
||||
for id in "${sorted_neg[@]}"; do
|
||||
$first || printf ','
|
||||
first=false
|
||||
ws_entry "$id" "${ws_name[$id]}" "name:${ws_name[$id]}"
|
||||
done
|
||||
fi
|
||||
|
||||
local first_pos=true
|
||||
for i in {1..9}; do
|
||||
if ((i == 1 && ${#named[@]})); then
|
||||
out+="$sep$(entry "$i" "$i" "$i" true)"
|
||||
$first || printf ','
|
||||
first=false
|
||||
if $first_pos && $has_neg; then
|
||||
ws_entry "$i" "$i" "$i" true
|
||||
else
|
||||
out+="$sep$(entry "$i" "$i" "$i")"
|
||||
ws_entry "$i" "$i" "$i"
|
||||
fi
|
||||
sep=,
|
||||
first_pos=false
|
||||
done
|
||||
emit "$out]"
|
||||
|
||||
printf ']\n'
|
||||
}
|
||||
|
||||
load_workspaces
|
||||
@@ -99,37 +122,53 @@ load_monitors
|
||||
load_urgent
|
||||
generate
|
||||
|
||||
hypr_socket="$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock"
|
||||
events='^(workspacev2|focusedmonv2|urgent|openwindow|closewindow|movewindowv2|createworkspacev2|destroyworkspacev2|moveworkspacev2|renameworkspace|monitoraddedv2|monitorremovedv2)>>'
|
||||
|
||||
while IFS= read -r line; do
|
||||
event=${line%%>>*}
|
||||
data=${line#*>>}
|
||||
case $event in
|
||||
workspacev2) # WORKSPACEID,WORKSPACENAME
|
||||
focused_ws=${data%%,*}
|
||||
while read -r line; do
|
||||
event="${line%>>*}"
|
||||
data="${line#*>>}"
|
||||
case "$event" in
|
||||
"workspace")
|
||||
# data is the workspace name, not id — resolve to id for named workspaces
|
||||
focused_ws="$data"
|
||||
for _k in "${!ws_name[@]}"; do
|
||||
[ "${ws_name[$_k]}" = "$data" ] && { focused_ws="$_k"; break; }
|
||||
done
|
||||
unset "ws_urgent[$focused_ws]"
|
||||
[[ -n $focused_monitor ]] && mon_active[$focused_monitor]=$focused_ws
|
||||
[ -n "$focused_monitor" ] && mon_active[$focused_monitor]="$focused_ws"
|
||||
;;
|
||||
focusedmonv2) # MONNAME,WORKSPACEID
|
||||
focused_monitor=${data%%,*}
|
||||
focused_ws=${data#*,}
|
||||
"workspacev2")
|
||||
focused_ws="${data%%,*}"
|
||||
unset "ws_urgent[$focused_ws]"
|
||||
mon_active[$focused_monitor]=$focused_ws
|
||||
[ -n "$focused_monitor" ] && mon_active[$focused_monitor]="$focused_ws"
|
||||
;;
|
||||
urgent) # WINDOWADDRESS
|
||||
id=$(window_workspace "$data")
|
||||
[[ -n $id && $id != "$focused_ws" ]] && ws_urgent[$id]=1
|
||||
"focusedmon")
|
||||
focused_monitor="${data%%,*}"
|
||||
_wsname="${data#*,}"
|
||||
focused_ws="$_wsname"
|
||||
for _k in "${!ws_name[@]}"; do
|
||||
[ "${ws_name[$_k]}" = "$_wsname" ] && { focused_ws="$_k"; break; }
|
||||
done
|
||||
unset "ws_urgent[$focused_ws]"
|
||||
mon_active[$focused_monitor]="$focused_ws"
|
||||
;;
|
||||
openwindow | movewindowv2) load_workspaces ;;
|
||||
closewindow)
|
||||
"urgent")
|
||||
wsid=$(hyprctl -j clients 2>/dev/null | jaq -r --arg addr "$data" '.[] | select(.address == $addr) | (.workspace.id | tostring)' 2>/dev/null)
|
||||
[ -n "$wsid" ] && ws_urgent[$wsid]=1
|
||||
;;
|
||||
"createworkspace"*|"destroyworkspace"*|"moveworkspace"*)
|
||||
load_workspaces
|
||||
load_monitors
|
||||
;;
|
||||
"openwindow"|"movewindow"*)
|
||||
load_workspaces
|
||||
;;
|
||||
"closewindow")
|
||||
load_workspaces
|
||||
load_urgent
|
||||
;;
|
||||
*)
|
||||
load_workspaces
|
||||
"monitor"*)
|
||||
load_monitors
|
||||
;;
|
||||
esac
|
||||
generate
|
||||
done < <(socat -u UNIX-CONNECT:"$hypr_socket" - | rg --line-buffered "$events")
|
||||
done < <(socat -u UNIX-CONNECT:"$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock" - | \
|
||||
rg --line-buffered "^(workspace|focusedmon|createworkspace|destroyworkspace|openwindow|closewindow|movewindow|moveworkspace|monitor|urgent)")
|
||||
|
||||
@@ -1,4 +1,12 @@
|
||||
|
||||
(deflisten netinfo
|
||||
:initial '{"wifi":{"ssid":"","ip":"","freq":0,"band":"","gen":"","signal":0},"ethernet":{"state":"down","ip":"","speed":"","interface":""},"usb":{"interface":"","ip":""}}'
|
||||
"scripts/net/netinfo")
|
||||
|
||||
(deflisten bt-devices
|
||||
:initial "[]"
|
||||
"scripts/net/bt-devices")
|
||||
|
||||
; --- Shared widgets ---
|
||||
|
||||
(defwidget netinfo-row [label value]
|
||||
@@ -26,10 +34,10 @@
|
||||
:icon-on "" :icon-off "")
|
||||
(box :orientation "v" :space-evenly false
|
||||
:visible {net.wifi.connected}
|
||||
(netinfo-row :label "SSID" :value {net.wifi.ssid})
|
||||
(netinfo-row :label "IP" :value {net.wifi.ip})
|
||||
(netinfo-row :label "Signal" :value "${net.wifi.icon} ${net.wifi.signal} dBm")
|
||||
(netinfo-row :label "Freq" :value "${net.wifi.freq} MHz · ${net.wifi.band} · ${net.wifi.gen}"))
|
||||
(netinfo-row :label "SSID" :value {netinfo.wifi.ssid})
|
||||
(netinfo-row :label "IP" :value {netinfo.wifi.ip})
|
||||
(netinfo-row :label "Signal" :value "${net.wifi.icon} ${netinfo.wifi.signal} dBm")
|
||||
(netinfo-row :label "Freq" :value "${netinfo.wifi.freq} MHz · ${netinfo.wifi.band} · ${netinfo.wifi.gen}"))
|
||||
(label :class "netinfo-dim" :halign "start"
|
||||
:visible {!net.wifi.connected}
|
||||
:text {net.wifi.enabled ? "Not connected" : "Disabled"})))
|
||||
@@ -39,8 +47,8 @@
|
||||
(defwidget usb-net-section []
|
||||
(box :orientation "v" :space-evenly false :class "sys-section"
|
||||
(section-header :title "USB" :accent "usb-accent")
|
||||
(netinfo-row :label "Interface" :value {net.usb.interface})
|
||||
(netinfo-row :label "IP" :value {net.usb.ip})))
|
||||
(netinfo-row :label "Interface" :value {netinfo.usb.interface})
|
||||
(netinfo-row :label "IP" :value {netinfo.usb.ip})))
|
||||
|
||||
; --- Ethernet ---
|
||||
|
||||
@@ -49,9 +57,9 @@
|
||||
(section-header :title "Ethernet" :accent "eth-accent")
|
||||
(box :orientation "v" :space-evenly false
|
||||
:visible {net.ethernet.connected}
|
||||
(netinfo-row :label "Interface" :value {net.ethernet.interface})
|
||||
(netinfo-row :label "IP" :value {net.ethernet.ip})
|
||||
(netinfo-row :label "Speed" :value {net.ethernet.speed}))
|
||||
(netinfo-row :label "Interface" :value {netinfo.ethernet.interface})
|
||||
(netinfo-row :label "IP" :value {netinfo.ethernet.ip})
|
||||
(netinfo-row :label "Speed" :value {netinfo.ethernet.speed}))
|
||||
(label :class "netinfo-dim" :halign "start"
|
||||
:visible {!net.ethernet.connected}
|
||||
:text "No carrier")))
|
||||
@@ -71,41 +79,18 @@
|
||||
(box :orientation "v" :space-evenly false :class "sys-section"
|
||||
(section-header-toggle
|
||||
:title "Bluetooth" :accent "blt-accent"
|
||||
:enabled {bt.powered}
|
||||
:onclick {bt.powered ? "bluetoothctl power off" : "bluetoothctl power on"}
|
||||
:enabled {bluetooth.powered}
|
||||
:onclick {bluetooth.powered ? "bluetoothctl power off" : "bluetoothctl power on"}
|
||||
:icon-on "" :icon-off "")
|
||||
(scroll :vscroll true :hscroll false :height 90
|
||||
:visible {bt.powered}
|
||||
:visible {bluetooth.powered}
|
||||
(box :orientation "v" :space-evenly false
|
||||
(for device in {bt.devices}
|
||||
(for device in {bt-devices}
|
||||
(bt-device-row :device {device}))))
|
||||
(label :class "netinfo-dim" :halign "start"
|
||||
:visible {!bt.powered}
|
||||
:visible {!bluetooth.powered}
|
||||
:text "Disabled")))
|
||||
|
||||
; --- WireGuard ---
|
||||
|
||||
(defwidget wg-row [wg]
|
||||
(box :orientation "v" :space-evenly false :class "wg-row"
|
||||
(box :orientation "h" :space-evenly false :valign "center"
|
||||
(label :class "wg-name ${wg.up ? 'wg-up' : 'wg-down'}" :halign "start" :hexpand true :text {wg.name})
|
||||
(button
|
||||
:class "net-toggle-btn ${wg.up ? 'net-toggle-on' : 'net-toggle-off'}"
|
||||
:onclick "scripts/net/wg-toggle ${wg.name}"
|
||||
:tooltip {wg.up ? "Disconnect" : "Connect"}
|
||||
(label :text {wg.up ? "" : ""})))
|
||||
(box :orientation "v" :space-evenly false :visible {wg.up}
|
||||
(netinfo-row :label "IP" :value {wg.ip})
|
||||
(netinfo-row :label "Peer" :value {wg.endpoint != "" ? "${wg.peers} · ${wg.endpoint}" : wg.peers})
|
||||
(netinfo-row :label "Traffic" :value " ${wg.rx} ${wg.tx}"))
|
||||
(label :class "netinfo-dim" :halign "start" :visible {!wg.up} :text "Down")))
|
||||
|
||||
(defwidget wireguard-net-section []
|
||||
(box :orientation "v" :space-evenly false :class "sys-section"
|
||||
(section-header :title "WireGuard" :accent "wg-accent")
|
||||
(for wg in {net.wireguard}
|
||||
(wg-row :wg {wg}))))
|
||||
|
||||
; --- Root ---
|
||||
|
||||
(defwidget net-win []
|
||||
@@ -117,7 +102,4 @@
|
||||
(box :class "section-sep")
|
||||
(wifi-net-section)
|
||||
(box :class "section-sep")
|
||||
(box :visible {arraylength(net.wireguard) > 0} :space-evenly false :orientation "v"
|
||||
(wireguard-net-section)
|
||||
(box :class "section-sep"))
|
||||
(bluetooth-net-section)))
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
|
||||
; Monitor the popup is currently open on (set by scripts/panel-toggle), so a
|
||||
; panel switch on the same monitor is an in-place revealer transition.
|
||||
(defvar popup-screen "")
|
||||
|
||||
(defwidget popup-win []
|
||||
(box :space-evenly false :orientation "v"
|
||||
(revealer :reveal {active-panel == "sys"} :transition "slidedown" :duration 120
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
(pm-btn :icon "" :label "Lock"
|
||||
:onclick "scripts/lock")
|
||||
(pm-btn :icon "" :label "Suspend"
|
||||
:onclick "scripts/lock; systemctl suspend")
|
||||
:onclick "scripts/lock & systemctl suspend")
|
||||
(pm-btn :icon "" :label "Sign out"
|
||||
:onclick "hyprctl eval \"hl.dispatch(hl.dsp.exit())\"")
|
||||
(pm-btn :icon "" :label "Cancel"
|
||||
:onclick "${EWW_CMD} --no-daemonize close powermenu")))))))
|
||||
:onclick "eww close powermenu")))))))
|
||||
|
||||
(defwindow powermenu
|
||||
:monitor 0
|
||||
|
||||
@@ -77,6 +77,6 @@
|
||||
(defwidget radio-mod []
|
||||
(module
|
||||
(eventbox
|
||||
:onclick "scripts/panel-toggle radio"
|
||||
:onclick "(sleep 0.1 && scripts/panel-toggle radio)"
|
||||
(box :orientation "v"
|
||||
(label :show-truncated false :class "icon-text" :text "")))))
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
|
||||
(defpoll cpu-freq-min :interval "60s" :initial "0"
|
||||
(defpoll swap :interval "30s" "scripts/sys/swap")
|
||||
|
||||
(defpoll cpu-freq-min :interval "60s"
|
||||
"awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq")
|
||||
(defpoll cpu-freq-max :interval "60s" :initial "1"
|
||||
(defpoll cpu-freq-max :interval "60s"
|
||||
"awk '{print $1/1000}' /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq")
|
||||
(defpoll cpu-temp :interval "4s" :initial "0"
|
||||
(defpoll cpu-temp :interval "4s"
|
||||
"scripts/sys/cputemp")
|
||||
(defpoll cpu-freq-avg :interval "2s" :initial "0"
|
||||
(defpoll cpu-freq-avg :interval "2s"
|
||||
"awk '{sum+=$1; count++} END {printf \"%.1f\", sum/count/1000000}' /sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq")
|
||||
|
||||
; The CPU grid is fed by the EWW_CPU magic variable (2 s); jq() reshapes the
|
||||
; core list into rows of four.
|
||||
(deflisten cpu-grid :initial '[[{"core":0,"usage":0,"freq":0}]]'
|
||||
"bash scripts/sys/cpugrid")
|
||||
|
||||
; --- Shared ---
|
||||
|
||||
@@ -44,7 +46,7 @@
|
||||
(box :orientation "v" :space-evenly false :class "sys-section"
|
||||
(section-header :title "CPU" :accent "cpu-accent")
|
||||
(box :orientation "v" :space-evenly false :halign "center"
|
||||
(for row in {jq(EWW_CPU.cores, '[.[] | .core |= ltrimstr("cpu")] | [range(0; length; 4) as $i | .[$i:$i + 4]]')}
|
||||
(for row in {cpu-grid}
|
||||
(box :orientation "h" :space-evenly false
|
||||
(for core in {row}
|
||||
(cpu-core-cell :core {core})))))
|
||||
@@ -160,59 +162,34 @@
|
||||
(overlay
|
||||
(circular-progress
|
||||
:width 72 :height 72
|
||||
:value {memory.swap.total > 0 ? 100 * memory.swap.used / memory.swap.total : 0}
|
||||
:value {100*swap.used/swap.total}
|
||||
:start-at 0 :clockwise true :thickness 7
|
||||
:class "swap-ring"
|
||||
:tooltip "Swap\n${memory.swap.human.used} / ${memory.swap.human.total}")
|
||||
:tooltip "Swap\n${swap.human.used} / ${swap.human.total}")
|
||||
(box :orientation "v" :valign "center" :halign "center" :space-evenly false
|
||||
(label :class "ram-used-label" :text "${memory.swap.human.used}")
|
||||
(label :class "ram-total-label" :text "${memory.swap.human.total}"))))
|
||||
(label :class "ram-used-label" :text "${swap.human.used}")
|
||||
(label :class "ram-total-label" :text "${swap.human.total}"))))
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
; --- Battery ---
|
||||
|
||||
(defwidget bat-stat [value label]
|
||||
(box :orientation "v" :halign "center" :valign "center" :space-evenly false
|
||||
(label :class "bat-stat-value" :text value)
|
||||
(label :class "bat-stat-label" :text label)))
|
||||
|
||||
; left: draw while on battery, charge rate while charging; right: time left / to full
|
||||
(defwidget bat-sys-win []
|
||||
(box :orientation "v" :space-evenly false :class "sys-section" :visible {battery.visible}
|
||||
(section-header :title "Battery" :accent "bat-accent")
|
||||
(box :orientation "h" :space-evenly true :valign "center"
|
||||
(bat-stat
|
||||
:value {battery.state == "charging"
|
||||
? (battery.rate == "" ? "—" : "${battery.rate} %/h")
|
||||
: (battery.state == "discharging" || battery.state == "low" || battery.state == "critical"
|
||||
? battery.wattage : "—")}
|
||||
:label {battery.state == "charging" ? "charging" : "draw"})
|
||||
(overlay
|
||||
(circular-progress
|
||||
:width 72 :height 72
|
||||
:width 60 :height 60
|
||||
:value {battery.percentage}
|
||||
:start-at 0
|
||||
:clockwise true
|
||||
:thickness 7
|
||||
:class "bat-ring bat-${battery.state}"
|
||||
:thickness 6
|
||||
:class "bat-ring"
|
||||
:style "color: ${battery.color};"
|
||||
:tooltip "Battery ${round(battery.percentage, 0)}%\n${battery.status} @ ${battery.wattage}")
|
||||
(label :class "bat-ring-label"
|
||||
:text "${round(battery.percentage, 0)}%"))
|
||||
(bat-stat
|
||||
:value {battery.time == "" ? "—" : battery.time}
|
||||
:label {battery.state == "charging" ? "to full" : "left"}))
|
||||
; 6 h history, one bar per 15 min bucket, coloured like the ring
|
||||
(box :orientation "h" :space-evenly true :class "bat-hist"
|
||||
(for b in {battery.history}
|
||||
(progress :orientation "v" :flipped true
|
||||
:value {b.p < 0 ? 0 : b.p}
|
||||
:class "bat-hist-bar hist-${b.s}"
|
||||
:tooltip {b.p < 0 ? b.t : "${b.t} ${round(b.p, 0)}%"})))
|
||||
(box :orientation "h" :space-evenly false
|
||||
(label :class "gpu-stat-label" :halign "start" :hexpand true :text "-6h")
|
||||
(label :class "gpu-stat-label" :halign "end" :text "now"))
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@@ -1,121 +1,61 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
ewwBar = "${pkgs.custom.eww-bar}/bin/eww-bar";
|
||||
openOnCurrentScreen = pkgs.writeShellScriptBin "eww-open-on-current-screen" ''
|
||||
window="$1"
|
||||
shift
|
||||
|
||||
# Every script ships as a bash wrapper that pins PATH to its dependencies
|
||||
# and inlines the shared helpers, so the sources under bar/scripts stay
|
||||
# plain shell files.
|
||||
baseInputs = with pkgs; [ coreutils findutils gawk gnugrep gnused systemd util-linux ];
|
||||
screen="$(hyprctl monitors -j | ${lib.getExe pkgs.jq} -r '.[] | select(.focused == true) | .name' | head -n1)"
|
||||
|
||||
if [ -n "$screen" ]; then
|
||||
exec ${lib.getExe pkgs.eww} open "$window" --screen "$screen" "$@"
|
||||
fi
|
||||
|
||||
exec ${lib.getExe pkgs.eww} open "$window" "$@"
|
||||
'';
|
||||
|
||||
# Wraps a static script file with a bash launcher that prepends Nix store
|
||||
# bin dirs to PATH — keeps the source files unchanged.
|
||||
mkScript = name: src: inputs: pkgs.writeShellScriptBin name ''
|
||||
export PATH="${lib.makeBinPath (baseInputs ++ inputs)}:$PATH"
|
||||
${builtins.readFile ./bar/scripts/_lib.sh}
|
||||
export PATH="${lib.makeBinPath inputs}:$PATH"
|
||||
${builtins.readFile src}
|
||||
'';
|
||||
|
||||
scripts = with pkgs; {
|
||||
# bar
|
||||
"scripts/workspaces" = mkScript "workspaces" ./bar/scripts/workspaces [ hyprland jaq socat ripgrep ];
|
||||
"scripts/panel-toggle" = mkScript "panel-toggle" ./bar/scripts/panel-toggle [ eww custom.eww-bar ];
|
||||
"scripts/powermenu-toggle" = mkScript "powermenu-toggle" ./bar/scripts/powermenu-toggle [ eww custom.eww-bar ];
|
||||
"scripts/net/net" = mkScript "net" ./bar/scripts/net/net [ iproute2 wpa_supplicant ];
|
||||
"scripts/net/bt" = mkScript "bt" ./bar/scripts/net/bt [ jq glib ];
|
||||
"scripts/net/bt-toggle" = mkScript "bt-toggle" ./bar/scripts/net/bt-toggle [ bluez ];
|
||||
"scripts/net/wg-toggle" = mkScript "wg-toggle" ./bar/scripts/net/wg-toggle [ ];
|
||||
"scripts/sys/gpu" = mkScript "gpu" ./bar/scripts/sys/gpu [ custom.amdgpu_top jq ];
|
||||
"scripts/sys/memory" = mkScript "memory" ./bar/scripts/sys/memory [ ];
|
||||
"scripts/sys/battery" = mkScript "battery" ./bar/scripts/sys/battery [ ];
|
||||
"scripts/sys/cputemp" = mkScript "cputemp" ./bar/scripts/sys/cputemp [ ];
|
||||
# popup panels
|
||||
"scripts/volume" = mkScript "volume" ./bar/scripts/volume [ wireplumber pulseaudio ];
|
||||
"scripts/brightness" = mkScript "brightness" ./bar/scripts/brightness [ brightnessctl ];
|
||||
"scripts/weather" = mkScript "weather" ./bar/scripts/weather [ jq curl ];
|
||||
"scripts/radio" = mkScript "radio" ./bar/scripts/radio [ eww jq curl mpv playerctl wireplumber ];
|
||||
"scripts/media" = mkScript "media" ./bar/scripts/media [ playerctl ];
|
||||
# quick actions (long-running ones are detached via systemd-run)
|
||||
"scripts/nightlight" = mkScript "nightlight" ./bar/scripts/nightlight [ eww wlsunset procps ];
|
||||
"scripts/read-mode" = mkScript "read-mode" ./bar/scripts/read-mode [ eww hyprland ];
|
||||
"scripts/airplane-mode" = mkScript "airplane-mode" ./bar/scripts/airplane-mode [ eww ];
|
||||
"scripts/do-not-disturb" = mkScript "do-not-disturb" ./bar/scripts/do-not-disturb [ eww dunst ];
|
||||
"scripts/power-save" = mkScript "power-save" ./bar/scripts/power-save [ eww power-profiles-daemon ];
|
||||
"scripts/lock" = mkScript "lock" ./bar/scripts/lock [ eww hyprlock ];
|
||||
"scripts/screenshot" = mkScript "screenshot" ./bar/scripts/screenshot [ eww hyprshot satty wl-clipboard ];
|
||||
"scripts/color-pick" = mkScript "color-pick" ./bar/scripts/color-pick [ eww hyprpicker ];
|
||||
"scripts/wallpaper" = mkScript "wallpaper" ./bar/scripts/wallpaper [ eww ];
|
||||
scripts = {
|
||||
"scripts/brightness" = mkScript "brightness" ./bar/scripts/brightness [ pkgs.brightnessctl ];
|
||||
"scripts/nightlight" = mkScript "nightlight" ./bar/scripts/nightlight [ pkgs.wlsunset ];
|
||||
"scripts/read-mode" = mkScript "read-mode" ./bar/scripts/read-mode [ pkgs.hyprland ];
|
||||
"scripts/airplane-mode" = mkScript "airplane-mode" ./bar/scripts/airplane-mode [ pkgs.util-linux ];
|
||||
"scripts/do-not-disturb" = mkScript "do-not-disturb" ./bar/scripts/do-not-disturb [ pkgs.dunst ];
|
||||
"scripts/panel-toggle" = mkScript "panel-toggle" ./bar/scripts/panel-toggle [ pkgs.eww pkgs.util-linux openOnCurrentScreen ];
|
||||
"scripts/powermenu-toggle" = mkScript "powermenu-toggle" ./bar/scripts/powermenu-toggle [ pkgs.eww openOnCurrentScreen ];
|
||||
"scripts/power-save" = mkScript "power-save" ./bar/scripts/power-save [ pkgs.eww ];
|
||||
"scripts/radio" = mkScript "radio" ./bar/scripts/radio [ pkgs.eww pkgs.jq pkgs.curl pkgs.mpv pkgs.playerctl ];
|
||||
"scripts/color-pick" = mkScript "color-pick" ./bar/scripts/color-pick [ pkgs.eww pkgs.hyprpicker ];
|
||||
"scripts/media" = mkScript "media" ./bar/scripts/media [ pkgs.playerctl ];
|
||||
"scripts/lock" = mkScript "lock" ./bar/scripts/lock [ pkgs.eww pkgs.hyprlock ];
|
||||
"scripts/screenshot" = mkScript "screenshot" ./bar/scripts/screenshot [ pkgs.eww pkgs.hyprshot pkgs.satty pkgs.wl-clipboard ];
|
||||
"scripts/sys/gpu" = mkScript "gpu" ./bar/scripts/sys/gpu [ pkgs.custom.amdgpu_top pkgs.jq ];
|
||||
"scripts/sys/memory" = mkScript "memory" ./bar/scripts/sys/memory [ pkgs.ripgrep ];
|
||||
"scripts/volume" = mkScript "volume" ./bar/scripts/volume [ pkgs.ripgrep ];
|
||||
"scripts/weather" = mkScript "weather" ./bar/scripts/weather [ pkgs.jq pkgs.curl ];
|
||||
"scripts/workspaces" = mkScript "workspaces" ./bar/scripts/workspaces [ pkgs.jaq pkgs.socat pkgs.ripgrep ];
|
||||
};
|
||||
in {
|
||||
|
||||
config = lib.mkIf (config.usercfg.wm == "Wayland") {
|
||||
home.packages = [ pkgs.eww pkgs.custom.eww-bar ];
|
||||
|
||||
# The daemon and the bar are one unit: it starts and stops with the
|
||||
# graphical session, opens the bar once the daemon answers, and is
|
||||
# restarted on crash. `eww-bar` (packages/eww-bar) does the heavy
|
||||
# lifting; kanshi calls `eww-bar place` to move the bar between outputs.
|
||||
systemd.user.services.eww = {
|
||||
Unit = {
|
||||
Description = "eww daemon and bar";
|
||||
Documentation = "https://elkowar.github.io/eww/";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
ConditionEnvironment = "WAYLAND_DISPLAY";
|
||||
# Cap crash loops (e.g. a broken config) without giving up for good:
|
||||
# the watchdog resets the counter and tries again later.
|
||||
StartLimitIntervalSec = 60;
|
||||
StartLimitBurst = 5;
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStartPre = "${ewwBar} clean";
|
||||
ExecStart = "${lib.getExe pkgs.eww} daemon --no-daemonize";
|
||||
ExecStartPost = "${ewwBar} open";
|
||||
ExecReload = "${ewwBar} reload";
|
||||
Restart = "always";
|
||||
RestartSec = 2;
|
||||
TimeoutStartSec = 30;
|
||||
TimeoutStopSec = 5;
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
|
||||
# Liveness check: `eww ping` only proves the socket is up, so the check
|
||||
# also lists the windows through the GTK main loop. Two consecutive
|
||||
# failures (≈40 s) restart the daemon; a missing bar is simply reopened.
|
||||
systemd.user.services.eww-watchdog = {
|
||||
Unit = {
|
||||
Description = "eww health check";
|
||||
After = [ "eww.service" ];
|
||||
};
|
||||
Service = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${ewwBar} check";
|
||||
};
|
||||
};
|
||||
systemd.user.timers.eww-watchdog = {
|
||||
Unit = {
|
||||
Description = "Periodic eww health check";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
};
|
||||
Timer = {
|
||||
OnActiveSec = "30s";
|
||||
OnUnitActiveSec = "20s";
|
||||
AccuracySec = "5s";
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
home.packages = [ pkgs.eww openOnCurrentScreen ];
|
||||
|
||||
xdg.configFile = lib.mkMerge [
|
||||
{
|
||||
"eww" = {
|
||||
source = lib.cleanSourceWith {
|
||||
# scripts/ is shipped through the wrappers below, never verbatim
|
||||
filter = name: _type:
|
||||
let
|
||||
baseName = baseNameOf (toString name);
|
||||
relPath = lib.removePrefix (toString ./bar + "/") (toString name);
|
||||
in !(lib.hasSuffix ".nix" baseName)
|
||||
&& (baseName != "_colors.scss")
|
||||
&& !(lib.hasPrefix "scripts/" relPath);
|
||||
&& !(builtins.elem relPath (builtins.attrNames scripts));
|
||||
src = lib.cleanSource ./bar/.;
|
||||
};
|
||||
recursive = true;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
# Re-place the bar on the profile's main output. eww-bar waits for the
|
||||
# daemon (kanshi and eww.service start together at login), and resolves the
|
||||
# monitor by description on every hotplug, so the bar follows the profile
|
||||
# instead of a GDK monitor index that changes as outputs come and go.
|
||||
placeBar = screen: "${pkgs.custom.eww-bar}/bin/eww-bar place '${screen}'";
|
||||
# Close the bar if it's already open (wrong screen), then open on the target screen.
|
||||
moveOrOpenBar = screen: "${pkgs.writeShellScript "kanshi-eww-bar-${toString screen}" ''
|
||||
if ${pkgs.eww}/bin/eww active-windows 2>/dev/null | grep -qx "bar"; then
|
||||
${pkgs.eww}/bin/eww close bar
|
||||
fi
|
||||
${pkgs.eww}/bin/eww open bar --screen ${toString screen}
|
||||
''}";
|
||||
|
||||
baseOutput = {
|
||||
position = "0,0";
|
||||
@@ -16,12 +18,10 @@ let
|
||||
aocT = "AOC 24E1W1 GNSKCHA086899";
|
||||
aocB = "AOC 24E1W1 GNSKBHA080346";
|
||||
lgM = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
|
||||
valinorM = "Lenovo Group Limited *";
|
||||
|
||||
in {
|
||||
|
||||
config = lib.mkIf (config.usercfg.wm == "Wayland") {
|
||||
systemd.user.services.kanshi.Unit.After = lib.mkForce [ config.services.kanshi.systemdTarget "awww.service" ];
|
||||
|
||||
services.kanshi = {
|
||||
enable = true;
|
||||
systemdTarget = "graphical-session.target";
|
||||
@@ -31,7 +31,6 @@ in {
|
||||
# mode = "2560x1440@480.168";
|
||||
mode = "2560x1440@240.083";
|
||||
# mode = "1920x1080x240.084";
|
||||
adaptiveSync = false;
|
||||
};}
|
||||
{output = baseOutput//{
|
||||
criteria = "AOC 24E1W1 GNSKCHA086899";
|
||||
@@ -43,9 +42,17 @@ in {
|
||||
mode = "1920x1080@60.000";
|
||||
};}
|
||||
{output = baseOutput//{
|
||||
criteria = "Lenovo Group Limited *";
|
||||
criteria = "LG UNKNOWN_TBD";
|
||||
mode = "1920x1080@144.000";
|
||||
};}
|
||||
{output = baseOutput//{
|
||||
criteria = "LG Display 0x060A Unknown";
|
||||
mode = "1920x1080@60.020";
|
||||
};}
|
||||
{output = baseOutput//{
|
||||
criteria = "CEX CX133 0x00000001";
|
||||
mode = "2560x1600@59.972";
|
||||
};}
|
||||
{output = baseOutput//{
|
||||
criteria = "AOC 16G3 1DDP7HA000348";
|
||||
mode = "1920x1080@144.000";
|
||||
@@ -67,7 +74,7 @@ in {
|
||||
}
|
||||
];
|
||||
exec = [
|
||||
(placeBar "desc:${aocB}")
|
||||
(moveOrOpenBar 0)
|
||||
"${pkgs.writeShellScript "kanshi-hyprland-init" ''
|
||||
#!/usr/bin/env bash
|
||||
${pkgs.hyprland}/bin/hyprctl eval '
|
||||
@@ -92,7 +99,7 @@ in {
|
||||
];
|
||||
};}
|
||||
{profile = {
|
||||
name = "tower_01";
|
||||
name = "tower_0";
|
||||
outputs = [
|
||||
{
|
||||
criteria = "AOC 24E1W1 GNSKCHA086899";
|
||||
@@ -123,36 +130,57 @@ in {
|
||||
|
||||
''}"
|
||||
"${pkgs.awww}/bin/awww restore"
|
||||
(placeBar "desc:${aocB}")
|
||||
(moveOrOpenBar 0)
|
||||
];
|
||||
};}
|
||||
{profile = {
|
||||
name = "valinor00";
|
||||
name = "tower_1";
|
||||
outputs = [
|
||||
{
|
||||
criteria = "Lenovo Group Limited *";
|
||||
criteria = "AOC 24E1W1 GNSKCHA086899";
|
||||
position = "0,0";
|
||||
}
|
||||
{
|
||||
criteria = "AOC 24E1W1 GNSKBHA080346";
|
||||
position = "0,0";
|
||||
}
|
||||
{
|
||||
criteria = "LG UNKNOWN_TBD";
|
||||
position = "0,0";
|
||||
}
|
||||
];
|
||||
exec = [
|
||||
"${pkgs.writeShellScript "kanshi-hyprland-init" ''
|
||||
#!/usr/bin/env bash
|
||||
${pkgs.hyprland}/bin/hyprctl eval '
|
||||
hl.workspace_rule({ workspace = "1", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "2", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "3", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "4", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "5", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "6", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "7", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "8", monitor = "eDP-1", default = true })
|
||||
hl.workspace_rule({ workspace = "9", monitor = "eDP-1", default = true })
|
||||
'
|
||||
${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "eDP-1" })); hl.dispatch(hl.dsp.focus({ workspace = "1" }));'
|
||||
|
||||
''}"
|
||||
"${pkgs.awww}/bin/awww restore"
|
||||
(placeBar "desc:Lenovo Group Limited")
|
||||
};}
|
||||
{profile = {
|
||||
name = "laptop_0";
|
||||
outputs = [{
|
||||
criteria = "LG Display 0x060A Unknown";
|
||||
position = "0,0";
|
||||
}];
|
||||
};}
|
||||
{profile = {
|
||||
name = "laptop_1";
|
||||
outputs = [
|
||||
{
|
||||
criteria = "CEX CX133 0x00000001";
|
||||
position = "0,0";
|
||||
}
|
||||
{
|
||||
criteria = "LG Display 0x060A Unknown";
|
||||
position = "2560,0";
|
||||
}
|
||||
];
|
||||
};}
|
||||
{profile = {
|
||||
name = "laptop_2";
|
||||
outputs = [
|
||||
{
|
||||
criteria = "AOC 16G3 1DDP7HA000348";
|
||||
position = "0,0";
|
||||
}
|
||||
{
|
||||
criteria = "LG Display 0x060A Unknown";
|
||||
position = "1920,0";
|
||||
}
|
||||
];
|
||||
};}
|
||||
];
|
||||
|
||||
@@ -24,15 +24,23 @@
|
||||
|
||||
|
||||
startupScript = pkgs.writeShellScriptBin "hyprland-start" ''
|
||||
${pkgs.eww}/bin/eww open bar &
|
||||
${pkgs.awww}/bin/awww-daemon &
|
||||
${pkgs.awww}/bin/awww restore &
|
||||
|
||||
sleep 2
|
||||
keepassxc &
|
||||
firefox &
|
||||
jellyfin-mpv-shim &
|
||||
easyeffects --gapplication-service &
|
||||
|
||||
sleep 2
|
||||
nextcloud &
|
||||
# telegram-desktop &
|
||||
# discord &
|
||||
'';
|
||||
in {
|
||||
config = lib.mkIf (config.usercfg.wm == "Wayland") {
|
||||
services.awww.enable = true;
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
@@ -95,6 +103,7 @@ in {
|
||||
disable_splash_rendering = true;
|
||||
animate_mouse_windowdragging = false;
|
||||
animate_manual_resizes = false;
|
||||
vrr = 0; #vrr=2;
|
||||
};
|
||||
debug = {
|
||||
vfr = false;
|
||||
@@ -295,10 +304,9 @@ in {
|
||||
(bind "XF86AudioPlay" (dsp.exec "${lib.getExe pkgs.playerctl} play-pause"))
|
||||
(bind "XF86AudioPrev" (dsp.exec "${lib.getExe pkgs.playerctl} previous"))
|
||||
(bind "XF86AudioNext" (dsp.exec "${lib.getExe pkgs.playerctl} next"))
|
||||
(bindOpts "XF86AudioRaiseVolume" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+") { locked = true; repeating = true; })
|
||||
(bindOpts "XF86AudioLowerVolume" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") { locked = true; repeating = true; })
|
||||
(bindOpts "XF86AudioMute" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle") { locked = true; })
|
||||
(bindOpts "XF86AudioMicMute" (dsp.exec "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle") { locked = true; })
|
||||
(bindOpts "XF86AudioRaiseVolume" (dsp.exec "amixer -q sset 'Master' 5%+") { locked = true; repeating = true; })
|
||||
(bindOpts "XF86AudioLowerVolume" (dsp.exec "amixer -q sset 'Master' 5%-") { locked = true; repeating = true; })
|
||||
(bindOpts "XF86AudioMute" (dsp.exec "amixer -q sset 'Master' toggle") { locked = true; })
|
||||
(bindOpts "XF86MonBrightnessUp" (dsp.exec "${lib.getExe pkgs.brightnessctl} s 5%+") { locked = true; repeating = true; })
|
||||
(bindOpts "XF86MonBrightnessDown" (dsp.exec "${lib.getExe pkgs.brightnessctl} s 5%-") { locked = true; repeating = true; })
|
||||
(bindOpts "SUPER + mouse:272" dsp.drag { mouse = true; })
|
||||
|
||||
@@ -108,6 +108,8 @@
|
||||
bspc desktop -f 0
|
||||
|
||||
telegram-desktop &
|
||||
nextcloud &
|
||||
jellyfin-mpv-shim &
|
||||
#flameshot &
|
||||
|
||||
sleep 2
|
||||
@@ -116,6 +118,7 @@
|
||||
|
||||
ibus-daemon -drx
|
||||
|
||||
easyeffects --gapplication-service &
|
||||
bspc desktop -f 0
|
||||
'';
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ in {
|
||||
# wireplumber.enable = true;
|
||||
};
|
||||
|
||||
programs.dconf.enable = true;
|
||||
environment.systemPackages = with pkgs; [ alsa-utils ];
|
||||
environment.systemPackages = with pkgs; [ easyeffects alsa-utils ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ config, lib, ... }: {
|
||||
imports = [ ./dbus ./docs ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
|
||||
imports = [ ./dbus ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
|
||||
|
||||
services.journald.extraConfig = ''
|
||||
SystemMaxUse=512M
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.syscfg.make;
|
||||
withDocs = cfg.gui || cfg.develop || cfg.serverExtras;
|
||||
in
|
||||
{
|
||||
documentation = lib.mkIf (!withDocs) {
|
||||
enable = false;
|
||||
man.enable = false;
|
||||
info.enable = false;
|
||||
doc.enable = false;
|
||||
nixos.enable = false;
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
|
||||
fonts = lib.mkIf (config.syscfg.make.gui || config.syscfg.make.serverExtras) {
|
||||
fonts = {
|
||||
enableDefaultPackages = false;
|
||||
fontDir.enable = true;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ config, lib, ... }: {
|
||||
services.fwupd.enable = lib.mkDefault (config.syscfg.make.gui || config.syscfg.make.power);
|
||||
{ lib, ... }: {
|
||||
services.fwupd.enable = true;
|
||||
hardware.enableAllFirmware = false;
|
||||
services.power-profiles-daemon.enable = lib.mkDefault config.syscfg.make.gui;
|
||||
services.power-profiles-daemon.enable = lib.mkDefault true;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
hasNfsFileSystems = lib.any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") (lib.attrValues config.fileSystems);
|
||||
in {
|
||||
{ pkgs, ... }: {
|
||||
services.fstrim.enable = true; # Improves SSD life
|
||||
services.gvfs.enable = config.syscfg.make.gui; # User Mounted FS
|
||||
services.gvfs.enable = true; # User Mounted FS
|
||||
|
||||
environment.systemPackages = lib.optionals hasNfsFileSystems [ pkgs.nfs-utils ];
|
||||
environment.systemPackages = with pkgs; [ nfs-utils ];
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, ... }: {
|
||||
hardware.graphics.enable = config.syscfg.make.gui || config.syscfg.make.serverExtras || config.syscfg.make.game;
|
||||
hardware.graphics.enable32Bit = config.syscfg.make.game;
|
||||
{ ... }: {
|
||||
hardware.graphics.enable = true;
|
||||
hardware.graphics.enable32Bit = true;
|
||||
}
|
||||
|
||||
@@ -36,20 +36,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
# Let the desktop (eww network panel, scripts/net/wg-toggle) bring the
|
||||
# tunnel up and down. eww runs as a user service outside the login
|
||||
# session, where polkit cannot ask for a password, so wheel users may
|
||||
# start/stop wireguard-* units without one.
|
||||
security.polkit.extraConfig = ''
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (action.id == "org.freedesktop.systemd1.manage-units" &&
|
||||
subject.isInGroup("wheel") &&
|
||||
/^wireguard-/.test(action.lookup("unit") || "")) {
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
});
|
||||
'';
|
||||
|
||||
systemd.services."wireguard-wg0-peer-vpn-helcel" = {
|
||||
after = [ "network-online.target" "nss-lookup.target" ];
|
||||
bindsTo = [ "network-online.target" ];
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
{ config, inputs, lib, pkgs, ... }: {
|
||||
{ inputs, pkgs, ... }: {
|
||||
nixpkgs.config = {
|
||||
permittedInsecurePackages = [ ];
|
||||
allowUnfree = true;
|
||||
android_sdk.accept_license = true;
|
||||
packageOverrides = pkgs: rec {
|
||||
custom = import ../../../../packages { inherit pkgs; };
|
||||
};
|
||||
nixpkgs.overlays = import ../../../../overlays { inherit inputs; };
|
||||
|
||||
};
|
||||
nixpkgs.overlays = import ../../../../overlays { inherit inputs pkgs; };
|
||||
nix = {
|
||||
package = pkgs.nixVersions.stable;
|
||||
extraOptions = ''
|
||||
@@ -33,9 +37,7 @@
|
||||
];
|
||||
};
|
||||
};
|
||||
programs.nix-ld = lib.mkIf (
|
||||
config.syscfg.make.gui || config.syscfg.make.develop || config.syscfg.make.serverExtras
|
||||
) {
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [
|
||||
libx11 libxcb libxi libxext libxkbfile xcbutilcursor
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
config = lib.mkIf config.syscfg.make.gui {
|
||||
{ pkgs, ... }: {
|
||||
security.polkit.enable = true;
|
||||
security.pam.services.hyprlock = { #swaylock
|
||||
text = ''
|
||||
@@ -7,6 +6,5 @@
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.polkit_gnome ];
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ polkit_gnome ];
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
config = lib.mkIf (config.syscfg.make.develop) {
|
||||
|
||||
programs.wireshark.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ wget dconf wireshark mtr android-tools ];
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
imports = [ ./debug ./develop ./telegraf ];
|
||||
|
||||
environment.systemPackages = lib.optionals config.syscfg.make.gui [ pkgs.engrampa ];
|
||||
environment.systemPackages = with pkgs; [ pkgs.engrampa ];
|
||||
}
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
{ name, ... }:
|
||||
throw "Container app `${name}` is not implemented yet."
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
{ name, ... }:
|
||||
throw "Container app `${name}` is not implemented yet."
|
||||
{...}:{
|
||||
|
||||
}
|
||||
@@ -37,9 +37,7 @@ let
|
||||
environment = {
|
||||
TZ = config.time.timeZone;
|
||||
} // extraEnv;
|
||||
autoRemoveOnStop = false;
|
||||
autoStart = true;
|
||||
pull = "newer";
|
||||
|
||||
labels = (if subdomain!=null then ({
|
||||
"traefik.enable" = "true";
|
||||
"traefik.http.routers.${routerName}.entrypoints" = "web-secure";
|
||||
|
||||
@@ -16,9 +16,7 @@ let
|
||||
basePathConfigs =
|
||||
lib.mapAttrsToList (_: cfg: cfg) (lib.filterAttrs (name: _: name != "config" && name != "data") serverCfg.path);
|
||||
runtimePathConfigs = concatRuntimeLists "paths";
|
||||
allSetupConfigs = builtins.filter
|
||||
(setup: setup.script != null)
|
||||
(map (app: ({ name = app.name; envFile = [ ]; } // app.runtime.setup)) appsList);
|
||||
allSetupConfigs = map (app: ({ name = app.name; envFile = ""; } // app.runtime.setup)) appsList;
|
||||
allCronsConfigs = concatRuntimeLists "cron";
|
||||
allVMConfigs = builtins.filter (app: app.runtime.vm != null) appsList;
|
||||
mkPathSetup = cfg:
|
||||
@@ -90,7 +88,7 @@ in {
|
||||
value = {
|
||||
description = "Run ${e.name} setup";
|
||||
after = [ "podman-${e.name}-${e.trigger}.service" ];
|
||||
# wants = [ "podman-${e.name}-${e.trigger}.service" ];
|
||||
wants = [ "podman-${e.name}-${e.trigger}.service" ];
|
||||
partOf = [ "podman-${e.name}-${e.trigger}.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ e.script ];
|
||||
@@ -98,8 +96,7 @@ in {
|
||||
Type = "simple";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "15s";
|
||||
# TimeoutStartSec = "360s";
|
||||
TimeoutStartSec = "30s";
|
||||
TimeoutStartSec = "360s";
|
||||
EnvironmentFile = e.envFile;
|
||||
ExecStart = e.script;
|
||||
RemainAfterExit = true;
|
||||
|
||||
@@ -3,9 +3,7 @@ let
|
||||
listNames = config.syscfg.server.db;
|
||||
containerNames = lib.concatMap (app: app.requires.secrets) (builtins.attrValues config.syscfg.server.loadedContainers);
|
||||
allApps = lib.unique (listNames ++ containerNames);
|
||||
needsServerSops = config.syscfg.server.loadedContainers != {} || allApps != [];
|
||||
in{
|
||||
config = lib.mkIf needsServerSops {
|
||||
sops.secrets = {
|
||||
CUSTOM = {
|
||||
mode = "0444";
|
||||
@@ -15,5 +13,4 @@ in{
|
||||
mode = "0444";
|
||||
sopsFile = ./server.yaml;
|
||||
}));
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
{ lib, ... }:
|
||||
{ inputs, lib, ... }:
|
||||
let
|
||||
systemsDir = ../../../systems;
|
||||
isIgnoredSystemDir = name: lib.hasPrefix "_" name || lib.hasPrefix "." name;
|
||||
systemNames = lib.attrNames (
|
||||
lib.filterAttrs
|
||||
(name: type:
|
||||
type == "directory"
|
||||
&& !isIgnoredSystemDir name
|
||||
&& builtins.pathExists (systemsDir + "/${name}/cfg.nix"))
|
||||
(builtins.readDir systemsDir)
|
||||
);
|
||||
systemNames = lib.attrNames (lib.filterAttrs
|
||||
(name: type: type == "directory" && builtins.pathExists (systemsDir + "/${name}/cfg.nix"))
|
||||
(builtins.readDir systemsDir));
|
||||
|
||||
|
||||
in with lib; {
|
||||
options.usercfg = import ./user.nix {inherit lib;};
|
||||
options.syscfg = {
|
||||
|
||||
@@ -6,6 +6,6 @@ with lib; {
|
||||
domain = mkOption { type = types.str; default = ""; };
|
||||
port = mkOption { type = types.str; default = ""; };
|
||||
noProxy = mkOption { type = types.str; default = ""; };
|
||||
cert = mkOption { type = types.nullOr types.path; default = null; };
|
||||
cert = mkOption { type = types.path; default = null; };
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,6 @@
|
||||
with lib; {
|
||||
cli = mkOption { type = types.bool; default = true; };
|
||||
gui = mkOption { type = types.bool; default = false; };
|
||||
serverExtras = mkOption { type = types.bool; default = false; };
|
||||
virt = mkOption { type = types.bool; default = false; };
|
||||
power = mkOption { type = types.bool; default = false; };
|
||||
game = mkOption { type = types.bool; default = false; };
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#yarn-berry = import ./yarn-berry { inherit final prev; };
|
||||
#eww = import ./eww { inherit final prev; };
|
||||
# ags = import ./ags { inherit final prev; };
|
||||
custom = import ../packages { pkgs = final; };
|
||||
wine = final.unstable.wineWow64Packages.unstableFull;
|
||||
unstable = import inputs.nixUnstable {
|
||||
system = final.stdenv.hostPlatform.system;
|
||||
|
||||
@@ -6,7 +6,11 @@
|
||||
|
||||
vosk = pkgs.callPackage ./vosk { };
|
||||
|
||||
eww-bar = pkgs.callPackage ./eww-bar { };
|
||||
pythonPackages = {
|
||||
|
||||
network-watchdog = pkgs.callPackage ./network-watchdog { };
|
||||
};
|
||||
|
||||
nodePackages = {
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
{ writeShellApplication
|
||||
, coreutils
|
||||
, eww
|
||||
, gnugrep
|
||||
, gnused
|
||||
, hyprland
|
||||
, iproute2
|
||||
, jq
|
||||
, procps
|
||||
, systemd
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
# Lifecycle manager for the eww daemon and the bar window. Used by
|
||||
# eww.service (ExecStartPre/Post, ExecReload), eww-watchdog.timer, the kanshi
|
||||
# profiles and the user (`eww-bar status`, `eww-bar reset`).
|
||||
writeShellApplication {
|
||||
name = "eww-bar";
|
||||
runtimeInputs = [ coreutils eww gnugrep gnused hyprland iproute2 jq procps systemd util-linux ];
|
||||
text = builtins.readFile ./eww-bar.sh;
|
||||
}
|
||||
@@ -1,370 +0,0 @@
|
||||
# eww-bar — lifecycle manager for the eww daemon and the bar window.
|
||||
#
|
||||
# The daemon is owned by the user unit eww.service. Two eww facts shape this
|
||||
# script:
|
||||
#
|
||||
# * A client waits only 100 ms for the daemon's reply. Any slower command
|
||||
# (opening the popup, reload) fails on the client side, and a plain
|
||||
# `eww open` then forks a SECOND daemon that takes over the socket path and
|
||||
# orphans the first one's surfaces ("two bars", "a popup I can't close").
|
||||
# Every client call here passes --no-daemonize, which turns that into a
|
||||
# harmless error; outcomes are verified with `active-windows`, never with
|
||||
# the exit status.
|
||||
# * `eww ping` is answered by the IPC thread; `eww active-windows` by the GTK
|
||||
# main loop. Only the latter proves the UI is alive.
|
||||
#
|
||||
# SCREEN is a GDK monitor index (0), a connector name (DP-1) or
|
||||
# desc:<prefix of the description shown by `hyprctl monitors`>. Descriptions
|
||||
# survive re-plugging and profile changes; indices do not.
|
||||
|
||||
usage() {
|
||||
cat <<'USAGE'
|
||||
usage: eww-bar COMMAND [ARGS]
|
||||
|
||||
ensure make sure a healthy, service-owned daemon is running
|
||||
open [SCREEN] open the bar (no-op if already open there), remember SCREEN
|
||||
place [SCREEN] force re-open of the bar on SCREEN (used by kanshi)
|
||||
close close the bar and the popups
|
||||
reload reload the eww config and re-place the bar
|
||||
restart restart eww.service (the bar comes back with it)
|
||||
reset kill every eww process, wipe the sockets, start fresh
|
||||
check health check run by eww-watchdog.timer
|
||||
clean ExecStartPre: kill stray daemons, wipe stale sockets
|
||||
focused print the name of the focused Hyprland monitor
|
||||
status show unit state, socket owner, open windows and screen
|
||||
USAGE
|
||||
}
|
||||
|
||||
uid=$(id -u)
|
||||
runtime_dir=${XDG_RUNTIME_DIR:-/run/user/$uid}
|
||||
state_dir=$runtime_dir/eww-bar
|
||||
lock_file=$state_dir/lock
|
||||
screen_file=$state_dir/screen # requested screen spec, re-resolved on restart
|
||||
current_file=$state_dir/current # resolved screen the bar is currently on
|
||||
fail_file=$state_dir/strikes
|
||||
unit=eww.service
|
||||
default_screen=0
|
||||
max_strikes=2
|
||||
|
||||
mkdir -p "$state_dir"
|
||||
|
||||
log() { printf 'eww-bar: %s\n' "$*" >&2; }
|
||||
|
||||
# ---------------------------------------------------------------- client ---
|
||||
|
||||
# fd 9 (the lock) is closed for every client call so nothing can inherit it.
|
||||
ewwc() { timeout 5 eww --no-daemonize "$@" 9>&-; }
|
||||
|
||||
ping_daemon() { ewwc ping >/dev/null 2>&1; }
|
||||
# Empty when the daemon did not answer within the client's 100 ms deadline —
|
||||
# its main thread is busy (a popup takes seconds to build) — as well as when
|
||||
# nothing is open. Only a non-empty listing is authoritative.
|
||||
list_windows() { ewwc active-windows 2>/dev/null || true; }
|
||||
bar_open() { list_windows | grep -qx 'bar: bar'; }
|
||||
|
||||
# wait_for_window NAME [SECONDS]
|
||||
wait_for_window() {
|
||||
local i n=$((${2:-5} * 5))
|
||||
for ((i = 0; i < n; i++)); do
|
||||
list_windows | grep -qx "$1: $1" && return 0
|
||||
sleep 0.2
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# window_state NAME [SECONDS] → open | closed (listed without NAME) |
|
||||
# busy (nothing listed within SECONDS: main thread stuck, or nothing open)
|
||||
window_state() {
|
||||
local i n=$((${2:-5} * 5)) out
|
||||
for ((i = 0; i < n; i++)); do
|
||||
out=$(list_windows)
|
||||
if [[ -n $out ]]; then
|
||||
if grep -qx "$1: $1" <<<"$out"; then echo open; else echo closed; fi
|
||||
return 0
|
||||
fi
|
||||
sleep 0.2
|
||||
done
|
||||
echo busy
|
||||
}
|
||||
|
||||
# The compositor's view: does the daemon own any layer surface? Tells a
|
||||
# daemon that is merely not answering from one with nothing on screen.
|
||||
daemon_has_layer() {
|
||||
hyprctl -j layers 2>/dev/null \
|
||||
| jq -e --argjson pid "$(main_pid)" '[.. | objects | select(.pid? == $pid)] | length > 0' >/dev/null 2>&1
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------- daemon ---
|
||||
|
||||
# nixpkgs wraps eww (wrapGAppsHook), so the running process is `.eww-wrapped`;
|
||||
# `pkill -x eww` never matched it. Exact match, this user only.
|
||||
kill_stray_daemons() {
|
||||
pkill -TERM -x -u "$uid" '(\.eww-wrapped|eww)' 2>/dev/null || true
|
||||
sleep 0.3
|
||||
pkill -KILL -x -u "$uid" '(\.eww-wrapped|eww)' 2>/dev/null || true
|
||||
rm -f "$runtime_dir"/eww-server_*
|
||||
}
|
||||
|
||||
unit_state() { systemctl --user show -p ActiveState --value "$unit" 2>/dev/null || echo unknown; }
|
||||
unit_running() {
|
||||
case $(unit_state) in
|
||||
active | activating | reloading) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
main_pid() { systemctl --user show -p MainPID --value "$unit" 2>/dev/null || echo 0; }
|
||||
|
||||
# pids listening on an eww socket path. After a rival rebinds the path, ss
|
||||
# lists BOTH sockets under the same name (the old one is merely unlinked), so
|
||||
# every pid matters, not just the first.
|
||||
socket_owners() {
|
||||
ss -xlp 2>/dev/null | grep -F "$runtime_dir/eww-server_" \
|
||||
| sed -n 's/.*pid=\([0-9]*\).*/\1/p' | sort -u | tr '\n' ' '
|
||||
}
|
||||
|
||||
# The socket file is gone while the daemon lives on: a rival that crashed at
|
||||
# startup unlinked it, and no client can reach the daemon any more.
|
||||
socket_missing() { ! ls "$runtime_dir"/eww-server_* >/dev/null 2>&1; }
|
||||
daemon_age() { ps -o etimes= -p "$(main_pid)" 2>/dev/null | tr -d " " || echo 0; }
|
||||
|
||||
# pids of daemons other than the service's main process listening on the socket
|
||||
rival_pids() {
|
||||
local main pid
|
||||
main=$(main_pid)
|
||||
for pid in $(socket_owners); do
|
||||
[[ $pid != "$main" ]] && printf '%s ' "$pid"
|
||||
done
|
||||
return 0
|
||||
}
|
||||
rival_daemon() { [[ -n $(rival_pids) ]]; }
|
||||
|
||||
healthy() { unit_running && ping_daemon && ! rival_daemon; }
|
||||
|
||||
wait_for_daemon() {
|
||||
local i
|
||||
for ((i = 0; i < 100; i++)); do
|
||||
ping_daemon && return 0
|
||||
sleep 0.1
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
start_unit() {
|
||||
systemctl --user reset-failed "$unit" >/dev/null 2>&1 || true
|
||||
systemctl --user start --no-block "$unit"
|
||||
}
|
||||
|
||||
restart_unit() {
|
||||
log "restarting $unit"
|
||||
systemctl --user reset-failed "$unit" >/dev/null 2>&1 || true
|
||||
systemctl --user restart --no-block "$unit"
|
||||
}
|
||||
|
||||
ensure() {
|
||||
healthy && return 0
|
||||
(
|
||||
flock -x 9
|
||||
healthy && exit 0
|
||||
if rival_daemon; then
|
||||
log "a second eww daemon (pid $(rival_pids)) owns the socket"
|
||||
elif unit_running && wait_for_daemon && ! rival_daemon; then
|
||||
# The unit was (re)starting — possibly running us from ExecStartPost.
|
||||
exit 0
|
||||
fi
|
||||
log "daemon unhealthy, restarting $unit"
|
||||
systemctl --user stop "$unit" >/dev/null 2>&1 || true
|
||||
kill_stray_daemons
|
||||
start_unit
|
||||
wait_for_daemon
|
||||
) 9>"$lock_file"
|
||||
}
|
||||
|
||||
# --------------------------------------------------------------- screens ---
|
||||
|
||||
focused_monitor() {
|
||||
hyprctl -j monitors 2>/dev/null | jq -r 'first(.[] | select(.focused) | .name) // empty'
|
||||
}
|
||||
|
||||
# desc:<prefix> → connector name via hyprctl; anything else is passed to eww.
|
||||
resolve_screen() {
|
||||
local spec=$1 name
|
||||
case $spec in
|
||||
desc:*)
|
||||
name=$(hyprctl -j monitors 2>/dev/null \
|
||||
| jq -r --arg p "${spec#desc:}" '[.[] | select(.description | startswith($p))][0].name // empty')
|
||||
if [[ -n $name ]]; then
|
||||
printf '%s\n' "$name"
|
||||
else
|
||||
log "no monitor matches '$spec', using screen $default_screen"
|
||||
printf '%s\n' "$default_screen"
|
||||
fi
|
||||
;;
|
||||
'') printf '%s\n' "$default_screen" ;;
|
||||
*) printf '%s\n' "$spec" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
saved_screen() { cat "$screen_file" 2>/dev/null || true; }
|
||||
current_screen() { cat "$current_file" 2>/dev/null || true; }
|
||||
|
||||
# ------------------------------------------------------------------- bar ---
|
||||
|
||||
close_popups() {
|
||||
local w
|
||||
for w in popup powermenu; do
|
||||
list_windows | grep -qx "$w: $w" && { ewwc close "$w" >/dev/null 2>&1 || true; }
|
||||
done
|
||||
ewwc update active-panel= >/dev/null 2>&1 || true
|
||||
}
|
||||
|
||||
# open_bar [--force] [SPEC]
|
||||
open_bar() {
|
||||
local force=0 spec screen state
|
||||
if [[ ${1:-} == --force ]]; then force=1; shift; fi
|
||||
spec=${1:-$(saved_screen)}
|
||||
spec=${spec:-$default_screen}
|
||||
ensure || { log "no daemon, cannot open the bar"; return 1; }
|
||||
screen=$(resolve_screen "$spec")
|
||||
(
|
||||
flock -x 9
|
||||
if ((force == 0)) && [[ $(current_screen) == "$screen" ]] && bar_open; then
|
||||
exit 0
|
||||
fi
|
||||
# Popups may sit on an output that just vanished; `eww open` itself
|
||||
# replaces an already-open bar. The exit status is meaningless (100 ms
|
||||
# client deadline), so the result is verified instead.
|
||||
close_popups
|
||||
ewwc open bar --screen "$screen" >/dev/null 2>&1 || true
|
||||
state=$(window_state bar 10)
|
||||
# Only an answered "no bar" means the screen was refused; busy just needs time.
|
||||
if [[ $state == closed && $screen != "$default_screen" ]]; then
|
||||
log "cannot open the bar on '$screen', using screen $default_screen"
|
||||
screen=$default_screen
|
||||
ewwc open bar --screen "$screen" >/dev/null 2>&1 || true
|
||||
state=$(window_state bar 10)
|
||||
fi
|
||||
if [[ $state != open ]]; then
|
||||
log "the bar does not come up ($state), restarting $unit"
|
||||
restart_unit
|
||||
exit 1
|
||||
fi
|
||||
printf '%s\n' "$spec" >"$screen_file"
|
||||
printf '%s\n' "$screen" >"$current_file"
|
||||
log "bar opened on screen $screen"
|
||||
) 9>"$lock_file"
|
||||
}
|
||||
|
||||
close_bar() {
|
||||
close_popups
|
||||
ewwc close bar >/dev/null 2>&1 || true
|
||||
rm -f "$current_file"
|
||||
}
|
||||
|
||||
reload() {
|
||||
ensure || return 1
|
||||
# Slow: the client always hits its deadline, so ignore the status and
|
||||
# verify that the daemon is still with us afterwards.
|
||||
ewwc reload >/dev/null 2>&1 || true
|
||||
sleep 1
|
||||
if ! wait_for_daemon; then
|
||||
log "daemon lost during reload, restarting $unit"
|
||||
restart_unit
|
||||
return 0
|
||||
fi
|
||||
open_bar --force
|
||||
}
|
||||
|
||||
reset() {
|
||||
log "full reset"
|
||||
systemctl --user stop "$unit" >/dev/null 2>&1 || true
|
||||
kill_stray_daemons
|
||||
rm -f "$current_file" "$fail_file"
|
||||
start_unit # ExecStartPost re-opens the bar
|
||||
}
|
||||
|
||||
# ExecStartPre
|
||||
clean() {
|
||||
kill_stray_daemons
|
||||
rm -f "$current_file" "$fail_file"
|
||||
}
|
||||
|
||||
# -------------------------------------------------------------- watchdog ---
|
||||
|
||||
# One bad check is tolerated (a busy daemon can miss eww's 100 ms IPC reply
|
||||
# deadline); the second consecutive one restarts the unit.
|
||||
strike() {
|
||||
local n
|
||||
n=$(($(cat "$fail_file" 2>/dev/null || echo 0) + 1))
|
||||
if ((n >= max_strikes)); then
|
||||
log "$1 ($n/$max_strikes) — restarting $unit"
|
||||
rm -f "$fail_file"
|
||||
restart_unit
|
||||
else
|
||||
log "$1 ($n/$max_strikes)"
|
||||
printf '%s\n' "$n" >"$fail_file"
|
||||
fi
|
||||
}
|
||||
|
||||
check() {
|
||||
systemctl --user is-active --quiet graphical-session.target || return 0
|
||||
if ! unit_running; then
|
||||
log "$unit is not running, starting it"
|
||||
start_unit || true
|
||||
return 0
|
||||
fi
|
||||
[[ $(unit_state) == active ]] || return 0 # still starting; ExecStartPost handles it
|
||||
if rival_daemon; then
|
||||
log "a second eww daemon (pid $(rival_pids)) owns the socket, restarting $unit"
|
||||
restart_unit
|
||||
return 0
|
||||
fi
|
||||
if socket_missing && (($(daemon_age) > 15)); then
|
||||
log "socket file is gone, restarting $unit"
|
||||
restart_unit
|
||||
return 0
|
||||
fi
|
||||
if ! ping_daemon; then
|
||||
strike "daemon does not answer"
|
||||
return 0
|
||||
fi
|
||||
case $(window_state bar 10) in
|
||||
open) rm -f "$fail_file"; return 0 ;;
|
||||
# Nothing listed for 10 s while something is on screen: the main loop is
|
||||
# frozen or still building a popup. Leave the windows alone; a second
|
||||
# miss restarts the unit.
|
||||
busy) if daemon_has_layer; then strike "UI unresponsive"; return 0; fi ;;
|
||||
esac
|
||||
# Listed without the bar, or nothing on screen at all: it really is gone.
|
||||
open_bar || true
|
||||
if wait_for_window bar 5; then
|
||||
rm -f "$fail_file"
|
||||
log "bar was missing, reopened"
|
||||
else
|
||||
strike "UI unresponsive"
|
||||
fi
|
||||
}
|
||||
|
||||
status() {
|
||||
systemctl --user --no-pager status "$unit" 2>&1 | head -n 12 || true
|
||||
printf '\nsocket listeners: %s(service main pid %s)\n' "$(socket_owners)" "$(main_pid)"
|
||||
printf 'windows:\n'
|
||||
list_windows | sed 's/^/ /'
|
||||
printf 'screen: %s (requested: %s)\n' "$(current_screen)" "$(saved_screen)"
|
||||
printf 'strikes: %s\n' "$(cat "$fail_file" 2>/dev/null || echo 0)"
|
||||
}
|
||||
|
||||
case ${1:-} in
|
||||
ensure) ensure ;;
|
||||
open) shift; open_bar "$@" ;;
|
||||
place) shift; open_bar --force "$@" ;;
|
||||
close) close_bar ;;
|
||||
reload) reload ;;
|
||||
restart) restart_unit ;;
|
||||
reset) reset ;;
|
||||
check) check ;;
|
||||
clean) clean ;;
|
||||
focused) focused_monitor ;;
|
||||
status) status ;;
|
||||
-h | --help | help) usage ;;
|
||||
*) usage >&2; exit 64 ;;
|
||||
esac
|
||||
@@ -1,69 +0,0 @@
|
||||
{ writeShellScriptBin
|
||||
, coreutils
|
||||
, findutils
|
||||
, gnugrep
|
||||
, iproute2
|
||||
, systemd
|
||||
}:
|
||||
|
||||
# For user services that only make sense while online (jellyfin-mpv-shim,
|
||||
# nextcloud-client, ...). They keep a persistent socket to their server; when
|
||||
# the machine drops off the network that socket dies, but the process stays
|
||||
# alive and the unit stays "active" — running yet deaf, the "up but not
|
||||
# working, restart it by hand" case. systemd can't see this: nothing crashes
|
||||
# and the programs speak no health protocol, so we probe the real thing — is
|
||||
# the MainPID still holding a live (established, non-loopback) connection?
|
||||
#
|
||||
# wait-online UNIT block until a default route exists; used as ExecStartPre
|
||||
# so UNIT only starts once online. Also stamps the start
|
||||
# time so `check` leaves a freshly (re)started UNIT alone.
|
||||
# check UNIT... one tick, run by a 60s timer: restart every UNIT that is
|
||||
# active but not connected, at most once per 2 minutes.
|
||||
#
|
||||
# Wired up by the services.network-watchdog home-manager module.
|
||||
|
||||
writeShellScriptBin "network-watchdog" ''
|
||||
set -u
|
||||
stampdir="''${XDG_RUNTIME_DIR:-/run/user/$(${coreutils}/bin/id -u)}/network-watchdog"
|
||||
${coreutils}/bin/mkdir -p "$stampdir"
|
||||
|
||||
usage() { echo "usage: network-watchdog wait-online UNIT | check UNIT..." >&2; exit 64; }
|
||||
|
||||
# Online = a default route. An address alone is not enough: wg0 and virtual
|
||||
# bridges carry global-scope addresses whether or not there is a way out.
|
||||
network_up() { { ${iproute2}/bin/ip -4 route show default; ${iproute2}/bin/ip -6 route show default; } 2>/dev/null | ${gnugrep}/bin/grep -q .; }
|
||||
|
||||
# Healthy: MainPID owns an established socket to something other than loopback.
|
||||
connected() {
|
||||
pid="$(${systemd}/bin/systemctl --user show -p MainPID --value "$1" 2>/dev/null)"
|
||||
[ "''${pid:-0}" != 0 ] && ${iproute2}/bin/ss -tnpH state established 2>/dev/null \
|
||||
| ${gnugrep}/bin/grep "pid=$pid," \
|
||||
| ${gnugrep}/bin/grep -qv -e '127\.0\.0\.1' -e '\[::1\]'
|
||||
}
|
||||
|
||||
# Stamped within the last 2 minutes: still connecting, or already restarted.
|
||||
recently_started() { [ -n "$(${findutils}/bin/find "$stampdir/$1" -mmin -2 2>/dev/null)" ]; }
|
||||
|
||||
[ $# -ge 1 ] || usage
|
||||
cmd="$1"; shift
|
||||
case "$cmd" in
|
||||
wait-online)
|
||||
[ $# -eq 1 ] || usage
|
||||
while ! network_up; do ${coreutils}/bin/sleep 5; done
|
||||
: > "$stampdir/$1"
|
||||
;;
|
||||
check)
|
||||
# Nothing can be connected while offline, and restarting wouldn't help.
|
||||
network_up || exit 0
|
||||
for unit; do
|
||||
# Not "active" (inactive, failed, or still in wait-online): systemd's job, not ours.
|
||||
${systemd}/bin/systemctl --user is-active --quiet "$unit" || continue
|
||||
recently_started "$unit" && continue
|
||||
connected "$unit" && continue
|
||||
echo "network-watchdog: $unit is online but has no live connection -> restarting"
|
||||
${systemd}/bin/systemctl --user restart "$unit" # its wait-online refreshes the stamp
|
||||
done
|
||||
;;
|
||||
*) usage ;;
|
||||
esac
|
||||
''
|
||||
+14
-4
@@ -1,8 +1,18 @@
|
||||
{ inputs, mkPkgs, systems, ... }:
|
||||
inputs.nixpkgs.lib.genAttrs systems (
|
||||
{
|
||||
inputs,
|
||||
mkPkgs,
|
||||
supportedSystems,
|
||||
...
|
||||
}:
|
||||
let
|
||||
forEachSystem = inputs.nixpkgs.lib.genAttrs supportedSystems;
|
||||
in
|
||||
forEachSystem (
|
||||
system:
|
||||
let pkgs = mkPkgs system;
|
||||
in {
|
||||
let
|
||||
pkgs = mkPkgs system;
|
||||
in
|
||||
{
|
||||
default = import ./devsh { inherit pkgs; };
|
||||
devsh = import ./devsh { inherit pkgs; };
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ pkgs.mkShell {
|
||||
#CUSTOM (custom...)
|
||||
]) ++ (with pkgs.llvmPackages; [
|
||||
libcxxClang
|
||||
]) ++ (with pkgs.python3Packages; [
|
||||
]) ++ (with pkgs.python313Packages; [
|
||||
pip pandas numpy matplotlib typer pillow reportlab python-barcode pypdf markdown requests
|
||||
])
|
||||
;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
{
|
||||
username = "sora";
|
||||
git = {
|
||||
email = "github@helcel.net";
|
||||
email = "soraefir+git@helcel";
|
||||
username = "soraefir";
|
||||
key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
|
||||
};
|
||||
@@ -8,7 +8,7 @@
|
||||
pubssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrrUB0KBjeAKPVG2Bdcm4mI9AMab7y97SOCdEHGogYv sora@gateway";
|
||||
wm = "-";
|
||||
git = {
|
||||
email = "github@helcel.net";
|
||||
email = "soraefir+git@helcel";
|
||||
username = "soraefir";
|
||||
key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
|
||||
};
|
||||
|
||||
@@ -17,9 +17,4 @@
|
||||
10.10.1.2 avalon.helcel.net
|
||||
'';
|
||||
|
||||
swapDevices = [ {
|
||||
device = "/swapfile";
|
||||
size = 2 * 1024; # Size in megabytes (4 GB)
|
||||
} ];
|
||||
|
||||
}
|
||||
|
||||
@@ -5,12 +5,10 @@
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
||||
boot.loader.systemd-boot.enable = lib.mkForce false;
|
||||
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
|
||||
boot.loader.grub = {
|
||||
enable = true;
|
||||
device = "/dev/sda";
|
||||
efiSupport = true;
|
||||
efiInstallAsRemovable = true;
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules =
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
pubssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGtotfQkclilrhEOzY3QUpOwYF+eOjHvqN6Of3NVg4x8NQLjx/X/gxC+GAllQxy9Zkz/N5wY0Fa4/6HoGheCRvWaN/nofz95VgtX8a1A/flrT8CGdBfRqXlcd4OEXhpFcbEm9VRXmxSKnsD4zySZr/151S+1PlQr8pJ1yyzxsIQx+RNo9P4gzpoJgkfZ3JIqLWb6B4aXallAg9Ha1WX0lx24voWNgg9AQt6/lccfmeoWAzBGUNq5a/mH59O+UCIM2y19ksEweY6URHpk6Ss597zp+0j2NYg8MS4rToYUb0Y7giNNBdKAzqNd+Wp6gjqBthuDIOfsXM082O5IarPKPJNVbx/Xpf3m1hYtxfL+LhEkdoE94iue601WqTltC0btS63LeZuoAZYji/GG/D8U7V77Lh3MV5/hJm5sK6wM6r7fCoenehgiy49z00NqtgM33rWNrpL9eXNKb//5Lxe7U58jPyteWpsL8+fJFcs/2uh4D5zN3d/I+yLZ1OMgUN6LM= sora@iriy";
|
||||
wm = "Wayland";
|
||||
git = {
|
||||
email = "github@helcel.net";
|
||||
email = "soraefir+git@helcel";
|
||||
username = "soraefir";
|
||||
key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
|
||||
};
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
pubssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrrUB0KBjeAKPVG2Bdcm4mI9AMab7y97SOCdEHGogYv sora@gateway";
|
||||
wm = "-";
|
||||
git = {
|
||||
email = "github@helcel.net";
|
||||
email = "soraefir+git@helcel";
|
||||
username = "soraefir";
|
||||
key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
|
||||
};
|
||||
@@ -32,7 +32,6 @@
|
||||
# ===== BASE =====
|
||||
traefik.subdomain = "traefik";
|
||||
traefik.extra={provider="infomaniak";};
|
||||
robotstxt.extra = {};
|
||||
umami.subdomain = "umami";
|
||||
authentik.subdomain = "sso";
|
||||
searxng.subdomain = "searx";
|
||||
@@ -43,19 +42,14 @@
|
||||
collabora.subdomain = "office";
|
||||
etherpad.subdomain = "pad";
|
||||
# ethercalc.subdomain = "calc";
|
||||
drawio.subdomain = "draw";
|
||||
immich.subdomain = "pic";
|
||||
# ===== FLIX =====
|
||||
# invidious.subdomain = "yt";
|
||||
# jellyfin.subdomain = "flix";
|
||||
# suwayomi.subdomain = "manga";
|
||||
# calibre.subdomain = "books";
|
||||
# ===== ARR =====
|
||||
# servarr.subdomain = "arr";
|
||||
# servarr.extra.modules = ["prowlarr" "sonarr" "radarr" "flaresolverr" ];
|
||||
# transmission = { subdomain = "arr"; subpath = "transmission"; };
|
||||
# handbrake = { subdomain = "arr"; subpath = "hb"; };
|
||||
# selfmark = { subdomain = "arr"; subpath = "selfmark"; };
|
||||
# ===== DEV =====
|
||||
gitea.subdomain = "git";
|
||||
# ===== HOME =====
|
||||
@@ -64,6 +58,9 @@
|
||||
influx.subdomain = "metrum";
|
||||
|
||||
freshrss.subdomain = "rss";
|
||||
suwayomi.subdomain = "manga";
|
||||
calibre.subdomain = "books";
|
||||
selfmark = { subdomain = "arr"; subpath = "selfmark"; };
|
||||
|
||||
favicon.extra = {
|
||||
mappings = {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
pubssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDCZibVYTvS4Dd+ZhGCpRpKfxs1fQeepNTzfzYk9I12Hyez25pQCeH+6ArrVhf6yX5Na1ffkvqTrNIDYJ1V2GHhemX0ruYp2B3xt229JszI7DeRC7YeG7v5uvsfTgicADCstGPSNorKXuNnHuBebSHpmWWbuKrYZdmcA/Az7H8uwF5+VQrnyASgZgwGV94MHinFVWsisB7o6iq4qxqpsUdtuZGbU0stDE5f9DLMDYuUxtx+jASRt+X60Bzjv3OFjU/b/YYzojTtuujkYXunNNTceCB4DTue5YMKQOlmd/IezL5nPAK9IsonPqojX9LPk2RvTCr4qalQ6AD92nq+xMW6FY1uJaKT81S8TvZcaqTm4FhEDkChuFq77biSUDhQkpcdNVOjUn5OtKpYl+0VkCaAx/8uyoylBacrn1XXLLg+gjwGCFHa2eeNu/BKIUa+5EK/FRwLpnEoPDkAHQ95JXQewChcUKG8A+Bz29XRKr9J64kbbGmwa+yjlVTPLSE6ZZE= sora@valinor";
|
||||
wm = "Wayland";
|
||||
git = {
|
||||
email = "github@helcel.net";
|
||||
email = "soraefir+git@helcel";
|
||||
username = "soraefir";
|
||||
key = "4E241635F8EDD2919D2FB44CA362EA0491E2EEA0";
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "v4l2loopback" "kvm-amd" ];
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
#boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.extraModulePackages = with config.boot.kernelPackages;
|
||||
[ v4l2loopback ];
|
||||
boot.extraModprobeConfig = ''
|
||||
|
||||
Reference in New Issue
Block a user