From 280e1bbe5e733128a451260685cc8ecd10a042a3 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 17 Oct 2026 21:53:43 +1300 Subject: feat: Dendritic pattern This re-write was done with the help of claude, and still needs a decent amount of changes before it properly follows the dendritic pattern --- CLAUDE.md | 55 +++- computers/nixnode.nix | 334 -------------------- computers/nixy.nix | 321 ------------------- flake.lock | 39 ++- flake.nix | 74 +---- hardware-setups/linode.nix | 40 --- hardware-setups/tuf.nix | 53 ---- home-manager/YATwm/config | 0 home-manager/YATwm/default.nix | 111 ------- home-manager/claude-code-manifest-2.1.282.json | 84 ----- home-manager/emacs/default.nix | 35 --- home-manager/home.nix | 210 ------------- home-manager/hyprland/default.nix | 151 --------- home-manager/hyprland/default.nix~ | 95 ------ home-manager/hyprland/hyprlock.conf | 41 --- home-manager/hyprpaper/default.nix | 10 - home-manager/hyprpaper/hyprpaper.conf | 3 - home-manager/i3/config | 333 -------------------- home-manager/i3/default.nix | 42 --- home-manager/i3/i3-commands.nix | 20 -- home-manager/i3/rofi-passmenu.nix | 72 ----- home-manager/i3/scripts/exit.sh | 20 -- home-manager/i3/scripts/image_upload.sh | 7 - home-manager/i3/scripts/monitor-config.sh | 23 -- home-manager/i3/scripts/rofi-passmenu | 27 -- home-manager/i3/scripts/workspaces.sh | 7 - home-manager/i3/scripts/workspaces.txt | 11 - home-manager/kitty/default.nix | 24 -- home-manager/kitty/palenight.conf | 40 --- home-manager/picom/default.nix | 18 -- home-manager/polybar/config.ini | 186 ----------- home-manager/polybar/default.nix | 20 -- home-manager/polybar/launch.sh | 20 -- home-manager/rofi/config/config.rasi | 145 --------- home-manager/rofi/config/customised.rasi | 195 ------------ home-manager/rofi/default.nix | 13 - home-manager/shells/bash.nix | 83 ----- home-manager/waybar/config/config.jsonc | 57 ---- home-manager/waybar/config/style.css | 71 ----- home-manager/waybar/default.nix | 16 - modules/cgit.nix | 157 ---------- modules/computers/nixnode.nix | 347 +++++++++++++++++++++ modules/computers/nixy.nix | 343 ++++++++++++++++++++ modules/default.nix | 6 - modules/deploy.nix | 30 ++ modules/flake-parts.nix | 8 + modules/hardware-setups/linode.nix | 44 +++ modules/hardware-setups/tuf.nix | 57 ++++ modules/home-manager/YATwm/config | 0 modules/home-manager/YATwm/default.nix | 117 +++++++ .../home-manager/claude-code-manifest-2.1.282.json | 84 +++++ modules/home-manager/emacs/default.nix | 39 +++ modules/home-manager/home.nix | 217 +++++++++++++ modules/home-manager/hyprland/default.nix | 157 ++++++++++ modules/home-manager/hyprland/default.nix~ | 95 ++++++ modules/home-manager/hyprland/hyprlock.conf | 41 +++ modules/home-manager/hyprpaper/default.nix | 14 + modules/home-manager/hyprpaper/hyprpaper.conf | 3 + modules/home-manager/i3/config | 333 ++++++++++++++++++++ modules/home-manager/i3/default.nix | 49 +++ modules/home-manager/i3/i3-commands.nix | 28 ++ modules/home-manager/i3/rofi-passmenu.nix | 80 +++++ modules/home-manager/i3/scripts/exit.sh | 20 ++ modules/home-manager/i3/scripts/image_upload.sh | 7 + modules/home-manager/i3/scripts/monitor-config.sh | 23 ++ modules/home-manager/i3/scripts/rofi-passmenu | 27 ++ modules/home-manager/i3/scripts/workspaces.sh | 7 + modules/home-manager/i3/scripts/workspaces.txt | 11 + modules/home-manager/kitty/default.nix | 28 ++ modules/home-manager/kitty/palenight.conf | 40 +++ modules/home-manager/picom/default.nix | 22 ++ modules/home-manager/polybar/config.ini | 186 +++++++++++ modules/home-manager/polybar/default.nix | 24 ++ modules/home-manager/polybar/launch.sh | 20 ++ modules/home-manager/rofi/config/config.rasi | 145 +++++++++ modules/home-manager/rofi/config/customised.rasi | 195 ++++++++++++ modules/home-manager/rofi/default.nix | 17 + modules/home-manager/shells/bash.nix | 87 ++++++ modules/home-manager/waybar/config/config.jsonc | 57 ++++ modules/home-manager/waybar/config/style.css | 71 +++++ modules/home-manager/waybar/default.nix | 20 ++ modules/my-pkgs/adom.nix | 59 ++++ modules/my-pkgs/default.nix | 12 + modules/my-pkgs/stk-installers.nix | 44 +++ modules/nix.nix | 41 --- modules/nvidia.nix | 36 --- modules/teh-nix/cgit.nix | 161 ++++++++++ modules/teh-nix/nix.nix | 45 +++ modules/teh-nix/nvidia.nix | 40 +++ modules/teh-nix/xorg.nix | 60 ++++ modules/website/default.nix | 20 ++ modules/website/src/index.html | 4 + modules/website/src/other-page.html | 4 + modules/xorg.nix | 57 ---- my-pkgs/adom.nix | 51 --- my-pkgs/default.nix | 8 - my-pkgs/stk-installers.nix | 36 --- website/default.nix | 12 - website/src/index.html | 4 - website/src/other-page.html | 4 - 100 files changed, 3625 insertions(+), 3435 deletions(-) delete mode 100644 computers/nixnode.nix delete mode 100644 computers/nixy.nix delete mode 100644 hardware-setups/linode.nix delete mode 100644 hardware-setups/tuf.nix delete mode 100644 home-manager/YATwm/config delete mode 100644 home-manager/YATwm/default.nix delete mode 100644 home-manager/claude-code-manifest-2.1.282.json delete mode 100644 home-manager/emacs/default.nix delete mode 100644 home-manager/home.nix delete mode 100644 home-manager/hyprland/default.nix delete mode 100644 home-manager/hyprland/default.nix~ delete mode 100644 home-manager/hyprland/hyprlock.conf delete mode 100644 home-manager/hyprpaper/default.nix delete mode 100644 home-manager/hyprpaper/hyprpaper.conf delete mode 100644 home-manager/i3/config delete mode 100644 home-manager/i3/default.nix delete mode 100644 home-manager/i3/i3-commands.nix delete mode 100644 home-manager/i3/rofi-passmenu.nix delete mode 100755 home-manager/i3/scripts/exit.sh delete mode 100755 home-manager/i3/scripts/image_upload.sh delete mode 100755 home-manager/i3/scripts/monitor-config.sh delete mode 100755 home-manager/i3/scripts/rofi-passmenu delete mode 100755 home-manager/i3/scripts/workspaces.sh delete mode 100644 home-manager/i3/scripts/workspaces.txt delete mode 100644 home-manager/kitty/default.nix delete mode 100644 home-manager/kitty/palenight.conf delete mode 100644 home-manager/picom/default.nix delete mode 100644 home-manager/polybar/config.ini delete mode 100644 home-manager/polybar/default.nix delete mode 100755 home-manager/polybar/launch.sh delete mode 100644 home-manager/rofi/config/config.rasi delete mode 100644 home-manager/rofi/config/customised.rasi delete mode 100644 home-manager/rofi/default.nix delete mode 100644 home-manager/shells/bash.nix delete mode 100644 home-manager/waybar/config/config.jsonc delete mode 100644 home-manager/waybar/config/style.css delete mode 100644 home-manager/waybar/default.nix delete mode 100644 modules/cgit.nix create mode 100644 modules/computers/nixnode.nix create mode 100644 modules/computers/nixy.nix delete mode 100644 modules/default.nix create mode 100644 modules/deploy.nix create mode 100644 modules/flake-parts.nix create mode 100644 modules/hardware-setups/linode.nix create mode 100644 modules/hardware-setups/tuf.nix create mode 100644 modules/home-manager/YATwm/config create mode 100644 modules/home-manager/YATwm/default.nix create mode 100644 modules/home-manager/claude-code-manifest-2.1.282.json create mode 100644 modules/home-manager/emacs/default.nix create mode 100644 modules/home-manager/home.nix create mode 100644 modules/home-manager/hyprland/default.nix create mode 100644 modules/home-manager/hyprland/default.nix~ create mode 100644 modules/home-manager/hyprland/hyprlock.conf create mode 100644 modules/home-manager/hyprpaper/default.nix create mode 100644 modules/home-manager/hyprpaper/hyprpaper.conf create mode 100644 modules/home-manager/i3/config create mode 100644 modules/home-manager/i3/default.nix create mode 100644 modules/home-manager/i3/i3-commands.nix create mode 100644 modules/home-manager/i3/rofi-passmenu.nix create mode 100755 modules/home-manager/i3/scripts/exit.sh create mode 100755 modules/home-manager/i3/scripts/image_upload.sh create mode 100755 modules/home-manager/i3/scripts/monitor-config.sh create mode 100755 modules/home-manager/i3/scripts/rofi-passmenu create mode 100755 modules/home-manager/i3/scripts/workspaces.sh create mode 100644 modules/home-manager/i3/scripts/workspaces.txt create mode 100644 modules/home-manager/kitty/default.nix create mode 100644 modules/home-manager/kitty/palenight.conf create mode 100644 modules/home-manager/picom/default.nix create mode 100644 modules/home-manager/polybar/config.ini create mode 100644 modules/home-manager/polybar/default.nix create mode 100755 modules/home-manager/polybar/launch.sh create mode 100644 modules/home-manager/rofi/config/config.rasi create mode 100644 modules/home-manager/rofi/config/customised.rasi create mode 100644 modules/home-manager/rofi/default.nix create mode 100644 modules/home-manager/shells/bash.nix create mode 100644 modules/home-manager/waybar/config/config.jsonc create mode 100644 modules/home-manager/waybar/config/style.css create mode 100644 modules/home-manager/waybar/default.nix create mode 100644 modules/my-pkgs/adom.nix create mode 100644 modules/my-pkgs/default.nix create mode 100644 modules/my-pkgs/stk-installers.nix delete mode 100644 modules/nix.nix delete mode 100644 modules/nvidia.nix create mode 100644 modules/teh-nix/cgit.nix create mode 100644 modules/teh-nix/nix.nix create mode 100644 modules/teh-nix/nvidia.nix create mode 100644 modules/teh-nix/xorg.nix create mode 100644 modules/website/default.nix create mode 100644 modules/website/src/index.html create mode 100644 modules/website/src/other-page.html delete mode 100644 modules/xorg.nix delete mode 100644 my-pkgs/adom.nix delete mode 100644 my-pkgs/default.nix delete mode 100644 my-pkgs/stk-installers.nix delete mode 100644 website/default.nix delete mode 100644 website/src/index.html delete mode 100644 website/src/other-page.html diff --git a/CLAUDE.md b/CLAUDE.md index 797acd7..e7561de 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -38,38 +38,61 @@ There are no tests or linter. "Does it evaluate/build" is the check. `nil` is in ## Gotchas -- **Flakes only see git-tracked files.** You must `git add` a new file before a rebuild can see it. This matters even more for `modules/`, which auto-imports files (see below). -- **`flake.lock` is gitignored**, so inputs aren't pinned in the repo. -- The **`YATwm` and `STK` inputs are `git+file://` paths** on this machine (`~/Documents/Coding/WM/YATwm`, `~/stk`). Evaluating either host needs them present. `nixnode` is always built from `nixy` and then pushed. +- **Flakes only see git-tracked files.** You must `git add` a new file before a rebuild can see it. This matters even more here, because `modules/` is auto-imported by import-tree (see below). +- **`flake.lock` is tracked.** Run `nix flake lock` after adding an input. +- The **`STK` input is a `git+file://` path** (`~/stk`), and evaluating the flake needs it present. The `YATwm` input (`~/Documents/Coding/WM/YATwm`) is currently commented out; `homeManager.YATwm` references it lazily, so that's fine as long as nothing imports that module. `nixnode` is always built from `nixy` and then pushed. - Indentation is **4 spaces**. Multi-line `''` strings (shell scripts, configs) usually start at column 0 rather than following the Nix indentation. Match that. - Leave `system.stateVersion` and `home.stateVersion` alone. ## Architecture -### Flake wiring (`flake.nix`) -Each host is assembled as `./modules` + `./hardware-setups/.nix` + `./computers/.nix`. `nixy` also gets `./my-pkgs`, the home-manager NixOS module, and stylix. `inputs` is passed to every NixOS and home-manager module through `specialArgs`/`extraSpecialArgs`, so third-party modules are imported inline, e.g. `inputs.sops.nixosModules.sops`. +### Dendritic pattern (flake-parts + import-tree) +`flake.nix` only declares inputs and runs `inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules)`. **Every `.nix` file under `modules/` is a flake-parts module** and is auto-imported. A file whose name has a path component starting with `_` is skipped. Each file exports exactly one thing: +- NixOS modules: `flake.modules.nixos.` +- home-manager modules: `flake.modules.homeManager.` +- packages: `perSystem.packages. = pkgs.callPackage () { };` +- hosts: `flake.nixosConfigurations.` + +The original module goes inside, wrapped like this: +```nix +{ inputs, config, ... }: +let + nixos = config.flake.modules.nixos; + hm = config.flake.modules.homeManager; +in +{ + flake.modules.nixos. = + { config, lib, pkgs, ... }: + { ... }; +} +``` +**There are no `specialArgs`.** Inner modules use the outer-captured `inputs`, so `inputs` must never be added back to an inner argument list. Modules import each other by reference (`hm.polybar`, `nixos.teh-nix`), not by relative path. Relative paths are only for asset files that sit next to the module, such as `./config` and `./scripts`. Paths to the repo-root `secrets/` and `wallpaper.png` are `../../`. + +`modules/flake-parts.nix` imports `flake-parts.flakeModules.modules` and sets `systems`. `modules/deploy.nix` holds `flake.deploy.nodes.nixnode` and the deploy-rs `checks`. -### `modules/`: custom option modules under the `teh-nix.*` namespace -`modules/default.nix` **auto-imports every `.nix` file in the directory recursively**, except `default.nix`. Both hosts import all of them, so each module has to be gated behind `lib.mkIf config.teh-nix..enable`, and a host turns on only what it needs: +### `modules/teh-nix/`: custom option modules under the `teh-nix.*` namespace +All four files define **`flake.modules.nixos.teh-nix`**. These deferred modules merge into one module, and both hosts import it, so each feature has to be gated behind `lib.mkIf config.teh-nix..enable`. A host turns on only what it needs: - `teh-nix.nix`: nix settings, flakes, the registry/NIX_PATH pointing at the flake's nixpkgs, and `nh` cleanup (in place of `nix.gc`). -- `teh-nix.xorg`: X server, and pulls in the YATwm NixOS module. It enables `teh-nix.nvidia` by default. +- `teh-nix.xorg`: X server, with a YATwm NixOS module hook (commented out). It enables `teh-nix.nvidia` by default. - `teh-nix.nvidia`: PRIME offload with bus IDs, plus the `prime-run` wrapper. - `teh-nix.services.cgit`: self-written cgit + nginx + git-over-ssh service, used on nixnode. Add new reusable functionality here in the same `options`/`config = mkIf` pattern instead of putting it straight into a host file. -### `computers/`: per-host config -These are the old `configuration.nix` equivalents. They set the `teh-nix.*` toggles, sops secrets, networking, and the services for the host. The wireguard tunnel spans both files: `nixnode` is the hub (`10.100.0.1`, kernel wireguard), and `nixy` is the peer (`10.100.0.2`, a NetworkManager profile that gets its key from sops through `nm-file-secret-agent`). +### `modules/computers/`: per-host config +Each file defines both `flake.modules.nixos.` and `flake.nixosConfigurations.`. These are the old `configuration.nix` equivalents, and their `imports` do the host assembly: `nixos.teh-nix`, the hardware module (`nixos.tuf` / `nixos.linode` from `modules/hardware-setups/`), and the `inputs.*` modules. `nixy` additionally imports `nixos.my-pkgs`, home-manager (`home-manager.users.boss = hm.boss`) and stylix. Host files set the `teh-nix.*` toggles, sops secrets, networking and the host's services. The wireguard tunnel spans both files: `nixnode` is the hub (`10.100.0.1`, kernel wireguard), and `nixy` is the peer (`10.100.0.2`, a NetworkManager profile that gets its key from sops through `nm-file-secret-agent`). + +### `modules/home-manager/`: user `boss` on nixy +`home.nix` exports `homeManager.boss`, the entry point. There is one directory per program, each with a `default.nix` exporting `homeManager.`; some ship raw dotfiles next to it, such as `i3/config`, `polybar/config.ini` and `waybar/config/`. `shells/bash.nix` exports `homeManager.bash`. Commented-out imports, like `hm.hyprland`, are kept for switching back. `xsession.windowManager.command` is `mkForce`d to `"$@"` so the display manager decides which WM starts. Colors and fonts come from **stylix**, configured in `computers/nixy.nix`, so don't hardcode colors in program configs that stylix targets. -### `home-manager/`: user `boss` on nixy -`home.nix` is the entry point and imports one directory per program (each has a `default.nix`; some ship raw dotfiles next to it, such as `i3/config`, `polybar/config.ini`, `waybar/config/`). Commented-out imports, like `hyprland`, are kept for switching back. Both `i3` and `YATwm` are imported, and `xsession.windowManager.command` is `mkForce`d to `"$@"` so the display manager decides which WM starts. Colors and fonts come from **stylix**, configured in `computers/nixy.nix`, so don't hardcode colors in program configs that stylix targets. +`i3/i3-commands.nix` and `i3/rofi-passmenu.nix` are flake packages, and the i3 module uses them through `inputs.self.packages.${pkgs.stdenv.hostPlatform.system}`. -`claude-code` is pinned by overriding the nixpkgs package with a vendored manifest (`home-manager/claude-code-manifest-.json`). To bump it, add the new manifest and update the filename in `home.nix`. +`claude-code` is pinned by overriding the nixpkgs package with a vendored manifest (`modules/home-manager/claude-code-manifest-.json`). To bump it, add the new manifest and update the filename in `home.nix`. -### `my-pkgs/` -`default.nix` is a NixOS module that adds an overlay (it currently provides `adom`). `stk-installers.nix` isn't part of the overlay: it's exposed directly as a flake package and served (currently commented out) from nixnode. +### `modules/my-pkgs/` +`adom.nix` and `stk-installers.nix` are flake packages. `default.nix` exports `nixos.my-pkgs`, an overlay that exposes `inputs.self.packages..adom` as `pkgs.adom`. `stk-installers` is served (currently commented out) from nixnode. -### `website/` +### `modules/website/` A static site: it copies `src/` into `$out/srv/www`. It's built as the flake package `teh-website`, and the `tehbox.org` vhost references it through `inputs.self.packages`. ### Secrets (sops-nix) diff --git a/computers/nixnode.nix b/computers/nixnode.nix deleted file mode 100644 index ad19086..0000000 --- a/computers/nixnode.nix +++ /dev/null @@ -1,334 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ config, lib, pkgs, inputs, ... }: - -{ - imports = - [ - inputs.STK.nixosModules.default - inputs.sops.nixosModules.sops - inputs.nixos-mailserver.nixosModules.default - inputs.neodrive-website.nixosModules.default - ]; - - teh-nix.nix.enable = true; - - # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - # boot.loader.grub.efiSupport = true; - # boot.loader.grub.efiInstallAsRemovable = true; - # boot.loader.efi.efiSysMountPoint = "/boot/efi"; - # Define on which hard drive you want to install Grub. - # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - - networking.hostName = "nixnode"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - time.timeZone = "NZ"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfcpfig = true; # use xkb.options in tty. - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - security.sudo.wheelNeedsPassword = false; - - sops.defaultSopsFile = ../secrets/general.yaml; - sops.defaultSopsFormat = "yaml"; - - sops.age.keyFile = "/home/boss/.config/sops/age/keys.txt"; - - sops.secrets = { - #"wg/nixy/pub" = { }; - "wg/nixnode/priv" = { }; - "acme/linode" = { - owner = "acme"; - mode = "440"; - }; - "mail/boss" = { }; - "nginx/dashboard-htpasswd" = { - owner = "nginx"; - mode = "400"; - }; - }; - - networking.firewall = { - enable = true; - allowedTCPPorts = [ 80 443 ]; - allowedUDPPorts = [ 51820 ]; - }; - - security.acme.acceptTerms = true; - # security.acme.useRoot = true; - security.acme.defaults.email = "boss@tehbox.org"; - # security.acme.certs = { - # "tehbox.org" = - # { - # webroot = "/var/lib/acme/acme-challenge/"; - # email = "boss@tehbox.org"; - # extraDomainNames = (map (sub: sub + ".tehbox.org" ) [ "www" "git" ]); - # #dnsProvider = "linode"; - # # dnsResolver = "92.123.94.2"; - # # dnsPropagationCheck = false; - # #environmentFile = environmentFile; - # }; - # }; - users.groups.acme.members = [ "nginx" ]; - - # Wireguard - networking = { - nat = { - enable = true; - externalInterface = "eth0"; - internalInterfaces = [ "wg0" ]; - }; - - wireguard.interfaces.wg0 = { - ips = [ "10.100.0.1/24" ]; - listenPort = 51820; - - postSetup = '' -${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE -''; - postShutdown = '' -${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE -''; - - privateKeyFile = config.sops.secrets."wg/nixnode/priv".path; - - peers = [ - { - name = "nixy"; - publicKey = "FMkFU9k+YeCvj48+WDVglySgoncbITqkS//o2e+TClY="; - allowedIPs = [ "10.100.0.2/32" ]; - } - ]; - }; - }; - - services.nginx = { - enable = true; - # Log the vhost at the start of each line ("vcombined") so goaccess - # can split traffic by subdomain - commonHttpConfig = '' -log_format vcombined '$host:$server_port $remote_addr - $remote_user [$time_local] ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent"'; -access_log /var/log/nginx/access.log vcombined; -''; - # virtualHosts.${config.mailserver.fqdn}.enableACME = true; - virtualHosts = { - "tehbox.org" = { - root = "${inputs.self.packages.x86_64-linux.teh-website}/srv/www"; - serverAliases = [ "www.tehbox.org" ]; - enableACME = true; - forceSSL = true; - }; - "files.tehbox.org" = { - root = "/srv/files"; - enableACME = true; - forceSSL = true; - }; - # "stk.lug.ac" = { - # root = "${inputs.self.packages.x86_64-linux.stk-installers}/srv/www"; - # enableACME = true; - # forceSSL = true; - # locations."/".extraConfig = "autoindex on;\n"; - # }; - "dashboard.tehbox.org" = { - root = "/var/lib/goaccess/html"; - basicAuthFile = config.sops.secrets."nginx/dashboard-htpasswd".path; - enableACME = true; - forceSSL = true; - }; - "_" = { - globalRedirect = "tehbox.org"; - }; - }; - }; - - # Web traffic dashboard, rebuilt from the nginx access log every 10 minutes. - # --persist/--restore keep the totals in /var/lib/goaccess/db across log rotations. - systemd.services.goaccess-report = { - description = "Build goaccess report for dashboard.tehbox.org"; - serviceConfig = { - Type = "oneshot"; - User = "nginx"; - Group = "nginx"; - StateDirectory = [ "goaccess" "goaccess/db" "goaccess/html" ]; - }; - script = '' -${pkgs.goaccess}/bin/goaccess /var/log/nginx/access.log \ - --log-format=VCOMBINED \ - --num-tests=0 \ - --no-query-string \ - --persist --restore --db-path=/var/lib/goaccess/db \ - --html-report-title="tehbox.org traffic" \ - -o /var/lib/goaccess/html/index.html -''; - }; - systemd.timers.goaccess-report = { - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = "*:0/10"; - Persistent = true; - }; - }; - - teh-nix.services.cgit = { - enable = true; - authorizedKeys = config.users.users.boss.openssh.authorizedKeys.keys; - authorizedUsers = [ "boss" ]; - domain = "git.tehbox.org"; - enableACME = true; - # useACMEHost = "tehbox.org"; - forceSSL = true; - # onlySSL = true; - }; - - services.neodrive-website = { - enable = true; - domain = "neodrive.tehbox.org"; - }; - - services.znc = { - enable = true; - mutable = true; - useLegacyConfig = false; - openFirewall = true; - config = { - SSLCertFile = "/var/lib/acme/tehbox.org/key.pem"; - LoadModule = [ "webadmin" ]; - User.boss = { - Admin = true; - Pass.password = { - Method = "sha256"; - Hash = "401e8fed9a3ab1f93047b7465fd7cc6b0ca5aaed6b1c0482f0f4331ebdca8647"; - Salt = "*F_-,pqOdiJi;p)JoMnm"; - }; - }; - User.komodo = { - Admin = false; - Pass.password = { - Method = "sha256"; - Hash = "2c624debe3e2672383346230b6acad82192e40df05666481f792a9dd97d935cc"; - Salt = "q9At0+KZvmofZil(3us1"; - }; - }; - }; - }; - - services.openssh = { - enable = true; - settings.PermitRootLogin = "no"; - settings.PasswordAuthentication = false; - }; - - services.superTuxKarts = { - enable = true; - port = 2759; - package = pkgs.superTuxKart; - serverOptions = { - server-name = "LUG STK server"; - server-mode = 3; - server-difficulty = 3; - server-max-players = 16; - track-voting = false; - voting-timeout = 15; - private-server-password = "lug@uoa"; - motd = "Server for LUG@UoA\nChampionship coming soon!"; - live-spectate = true; - server-configurable = true; - }; - }; - - mailserver = { - enable = true; - stateVersion = 3; - fqdn = "tehbox.org"; - domains = [ "tehbox.org" ]; - - x509.useACMEHost = config.mailserver.fqdn; - - loginAccounts = { - "boss@tehbox.org" = { - hashedPasswordFile = config.sops.secrets."mail/boss".path; - aliases = ["postmaster@tehbox.org"]; - }; - }; - - # certificateScheme = "acme"; - }; - - users.users.boss = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager"]; # Enable ‘sudo’ for the user. - home = "/home/boss"; - openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOukEKExoF6vr3vciQN8pBdd4FtZtRzqIGFJrUvllOY boss@nixy" ]; - }; - users.groups.files.members = [ "boss" "nginx" ]; - users.groups.nginx.members = [ "nginx" "znc" ]; - - environment.systemPackages = with pkgs; [ - vim - emacs - inetutils - mtr - sysstat - git - goaccess - inputs.self.packages.x86_64-linux.teh-website - # inputs.self.packages.x86_64-linux.stk-installers - ]; - - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - networking.usePredictableInterfaceNames = false; - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "25.05"; # Did you read the comment? - -} diff --git a/computers/nixy.nix b/computers/nixy.nix deleted file mode 100644 index a576c8b..0000000 --- a/computers/nixy.nix +++ /dev/null @@ -1,321 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, inputs, ... }: -{ - imports = - [ - inputs.sops.nixosModules.sops - #inputs.spicetify-nix.nixosModules.default - ]; - - teh-nix.nix.enable = true; - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; [ - # stdenv.cc.cc - glib - glibc - nspr - nss - dbus - atk - cups - cairo - gtk3 - alsa-lib - expat - fontconfig - freetype - libgbm - libnotify - libsecret - libxkbcommon - mesa - pango - libX11 - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libxcb - ]; - - # Use the systemd-boot EFI boot loader. - boot = { - loader.grub.enable = true; - loader.grub.device = "nodev"; - loader.grub.efiSupport = true; - loader.grub.enableCryptodisk = true; - # loader.grub.useOSProber = true; - loader.efi.canTouchEfiVariables = true; - kernel.sysctl."kernel.sysrq" = 502; - plymouth.enable = true; - }; - - - networking.hostName = "nixy"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - sops.defaultSopsFile = ../secrets/general.yaml; - sops.defaultSopsFormat = "yaml"; - - sops.age.keyFile = "/home/boss/.config/sops/age/keys.txt"; - - sops.secrets = { - #"wg/nixnode/pub" = { }; - "wg/nixy/priv" = { - restartUnits = [ "nm-file-secret-agent.service" ]; - group = "networkmanager"; - mode = "440"; - }; - }; - - networking.firewall = { - allowedUDPPorts = [ 51820 ]; - allowedTCPPorts = [ 8081 ]; - }; - networking.networkmanager.ensureProfiles = { - profiles = { - wg-nixnode = { - connection = { - id = "wg-nixnode"; - autoconnect = "false"; - interface-name = "wg0"; - type = "wireguard"; - }; - ipv4 = { - address1 = "10.100.0.2/32"; - may-fail = "false"; - method = "manual"; - }; - ipv6 = { - method = "disabled"; - }; - wireguard = { - listen-port = "51820"; - private-key-flags = 1; - #private-key = "dummy"; - }; - proxy = { }; - "wireguard-peer./6bWy02DhOSjaeXk+ol5ATgEYDDJvL+mTO9SCNvfIUQ=" = { - allowed-ips = "0.0.0.0/0;"; - endpoint = "172.105.172.191:51820"; - persistent-keepalive = "25"; - }; - }; - }; - secrets.entries = [ - { - matchId = "wg-nixnode"; - matchType = "wireguard"; - matchSetting = "wireguard"; - key = "private-key"; - file = config.sops.secrets."wg/nixy/priv".path; - } - ]; - }; - - systemd.services."nm-file-secret-agent" = { - serviceConfig.User = "boss"; - }; - - - # Set your time zone. - time.timeZone = "NZ"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - #keyMap = "us"; - #useXkbConfig = true; # use xkbOptions in tty. - }; - - teh-nix.xorg = { - enable = true; - }; - - programs.hyprland = { - enable = false; - #package = inputs.hyprland.packages.${pkgs.system}.hyprland; - #portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; - }; - - security.pam.services.swaylock = {}; - - # Enable CUPS to print documents. - services.printing.enable = true; - services.printing.drivers = with pkgs;[ - hplip - ]; - services.avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; - - # Enable sound. - #sound.enable = true; - services.pipewire = { - enable = true; - alsa.enable = false; - alsa.support32Bit = false; - pulse.enable = true; - }; - - services.upower.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - security.rtkit.enable = true; - services.libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - }; - }; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.boss = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "input" "uinput" ]; - }; - - fonts.packages = with pkgs; [ - #(nerdfonts.override { fonts = [ "Cousine" ]; }) - nerd-fonts.cousine - ]; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; - [ - vim - firefox - pfetch - fastfetch - pinentry-gtk2 - git - nm-file-secret-agent - ]; - documentation.dev.enable = true; - - hardware.graphics.enable32Bit = true; - programs.steam = { - enable = true; - package = pkgs.steam.override { - extraEnv = { - __NV_PRIME_RENDER_OFFLOAD=1; - __NV_PRIME_RENDER_OFFLOAD_PROVIDER="NVIDIA-G0"; - __GLX_VENDOR_LIBRARY_NAME="nvidia"; - __VK_LAYER_NV_optimus="NVIDIA_only"; - }; - }; - - extraCompatPackages = with pkgs; [ - proton-ge-bin - ]; - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - programs.gnupg = { - agent = { - enable = true; - pinentryPackage = pkgs.pinentry-gtk2; - }; - # enableSSHSupport = true; - }; - - hardware.bluetooth.enable = true; # enables support for Bluetooth - hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - services.blueman.enable = true; - - systemd.tmpfiles.rules = [ - "f /var/lib/systemd/linger/boss" # enables lingering - ]; - - # programs.dconf.enable = true; - - - services.ratbagd.enable = true; - - # xdg.portal.enable = true; - # services.flatpak.enable = true; - - stylix = { - enable = true; - - base16Scheme = "${pkgs.base16-schemes}/share/themes/material-palenight.yaml"; - - image = ../wallpaper.png; - targets.grub.useWallpaper = true; - - opacity = { - terminal = 0.8; - }; - - polarity = "dark"; - - fonts = { - monospace = { - package = pkgs.nerd-fonts.cousine; - name = "Cousine Nerd Font Mono"; - }; - - serif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - - sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans"; - }; - - emoji = { - package = pkgs.noto-fonts-color-emoji; - name = "Noto Color Emoji"; - }; - - sizes = { - terminal = 10; - applications = 10; - desktop = 10; - popups = 10; - }; - }; - - cursor = { - package = pkgs.nordzy-cursor-theme; - name = "Nordzy-cursors"; - size = 20; - }; - }; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? - -} diff --git a/flake.lock b/flake.lock index 5b56429..b768583 100644 --- a/flake.lock +++ b/flake.lock @@ -230,6 +230,26 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1790898470, + "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -507,6 +527,21 @@ "type": "github" } }, + "import-tree": { + "locked": { + "lastModified": 1788467110, + "narHash": "sha256-ljEMTXP/rH0tOvDzc9gzwww6KcHRPRnEHzd9lK48V7s=", + "owner": "vic", + "repo": "import-tree", + "rev": "eb1b52eaecc57f7c136d07ae8a93e724dfecac46", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, "libnbtplusplus": { "flake": false, "locked": { @@ -744,8 +779,10 @@ "STK": "STK", "claude-desktop": "claude-desktop", "deploy-rs": "deploy-rs", + "flake-parts": "flake-parts_2", "home-manager": "home-manager", "hyprlock": "hyprlock", + "import-tree": "import-tree", "neodrive-website": "neodrive-website", "nil": "nil", "nixcord": "nixcord", @@ -806,7 +843,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index fcdf0cf..ec936c3 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,11 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + import-tree.url = "github:vic/import-tree"; home-manager = { url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -77,72 +82,5 @@ # }; }; - outputs = inputs@{self, nixpkgs, ... }: let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - deployPkgs = import nixpkgs { - inherit system; - overlays = [ - inputs.deploy-rs.overlays.default # or deploy-rs.overlays.default - (self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; }) - ]; - }; - in - { - nixosConfigurations = { - nixy = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs;}; - modules = [ - ./my-pkgs - ./modules - - ./hardware-setups/tuf.nix - ./computers/nixy.nix - - { - environment.systemPackages = [ - deployPkgs.deploy-rs.deploy-rs - ]; - } - - inputs.home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - home-manager.users.boss = import ./home-manager/home.nix; - home-manager.extraSpecialArgs = {inherit inputs;}; - } - - inputs.stylix.nixosModules.stylix - ]; - }; - nixnode = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs;}; - modules = [ - ./modules - ./hardware-setups/linode.nix - ./computers/nixnode.nix - ]; - }; - }; - - deploy.nodes.nixnode = { - hostname = "tehbox.org"; - profiles.system = { - user = "root"; - sshUser = "boss"; - interactiveSudo = true; - path = deployPkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.nixnode; - }; - }; - - checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib; - - packages.x86_64-linux.teh-website = (nixpkgs.legacyPackages.x86_64-linux.callPackage ./website { }); - packages.x86_64-linux.stk-installers = (nixpkgs.legacyPackages.x86_64-linux.callPackage ./my-pkgs/stk-installers.nix { }); - }; - + outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); } diff --git a/hardware-setups/linode.nix b/hardware-setups/linode.nix deleted file mode 100644 index d952ae5..0000000 --- a/hardware-setups/linode.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - boot.kernelParams = [ "console=ttyS0,19200n8" ]; - boot.loader.grub.extraConfig = '' - serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1; - terminal_input serial; - terminal_output serial - ''; - boot.loader.grub.forceInstall = true; - boot.loader.grub.device = "nodev"; - boot.loader.timeout = 10; - - fileSystems."/" = - { device = "/dev/sda"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/sdb"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s5.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/hardware-setups/tuf.nix b/hardware-setups/tuf.nix deleted file mode 100644 index 20cc5f9..0000000 --- a/hardware-setups/tuf.nix +++ /dev/null @@ -1,53 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" "cryptd"]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - boot.initrd.luks.devices.cryptroot = { - device = "/dev/disk/by-uuid/18e2ffad-9ffb-4c3a-a82f-dd8098171427"; - preLVM = true; - }; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/db909240-4006-4ca8-a03a-3e3fc60cba17"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/9ef8fad1-08cb-4c7a-9db1-3a37097544b0"; - fsType = "ext4"; - neededForBoot = true; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6FC0-9F1C"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/e1e972c8-3bb9-4131-a77f-fdea9f086a4d"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp5s0f3u1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.enableAllFirmware = true; -} diff --git a/home-manager/YATwm/config b/home-manager/YATwm/config deleted file mode 100644 index e69de29..0000000 diff --git a/home-manager/YATwm/default.nix b/home-manager/YATwm/default.nix deleted file mode 100644 index f63c8ca..0000000 --- a/home-manager/YATwm/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - pkgs, - inputs, - lib, - ... -} : { - imports = [ - ../polybar - ../rofi - ../kitty - inputs.YATwm.homeManagerModules.default - ]; - home.packages = with pkgs; [ - i3lock - xss-lock - networkmanagerapplet - flameshot - picom - nitrogen - pamixer - kitty - alacritty - ]; - - xsession.windowManager.YATwm = { - enable = true; - package = inputs.YATwm.packages.x86_64-linux.YATwm; - useEmacsBinds = true; - quitKey = "C-s-g"; - swapMods = false; - keybinds = let - left = "h"; - right = "l"; - up = "k"; - down = "j"; - wsBind = key: ws: { - "s-${key}" = "changeWS ${ws}"; - "s-S-${key}" = "wToWS ${ws}"; - }; - wsBinds = workspaces: lib.attrsets.concatMapAttrs (key: ws: wsBind key ws) workspaces; - in { - # Important - "s-E" = "exit"; - "s-R" = "reload"; - - # Directions - "s-${left}" = "focChange left"; - "s-${right}" = "focChange right"; - "s-${up}" = "focChange up"; - "s-${down}" = "focChange down"; - - # Tiling - "s-t" = "toggle"; - "s-f" = "fullscreen"; - - # Application shortcuts - "s-d" = "bashSpawn rofi -i -show drun -disable-history"; - "s-D" = "bashSpawn prime-run rofi -i -show drun -disable-history"; - "s-g" = "bashSpawn ~/bin/rofi-passmenu"; - "s-RET" = "bashSpawn kitty"; - # "s-r k" = "spawn kitty"; - "s-c" = "spawn firefox"; - "s-S--" = "bashSpawn emacsclient -c"; - "s-S" = "spawn flameshot gui"; - "s-x" = "spawn loginctl lock-session"; - "s-X" = "bashSpawn loginctl lock-session && systemctl suspend"; - "s-Q" = "kill"; - - # Sound - "s-[" = "spawn playerctl -p firefox play-pause"; - "s-]" = "spawn playerctl -p spotify play-pause"; - - # Special workspaces - "s-p s" = "changeWS 11"; - "s-S-p s" = "wToWS 11"; - } // - wsBinds { - "1" = "1"; - "2" = "2"; - "3" = "3"; - "4" = "4"; - "5" = "5"; - "6" = "6"; - "7" = "7"; - "8" = "8"; - "9" = "9"; - "0" = "10"; - }; - workspaces = [ - {name = "1: A";} - {name = "2: B";} - {name = "3: C";} - {name = "4: D";} - {name = "5: E";} - {name = "6: F"; monitorPriorities = [2 1];} - {name = "7: G"; monitorPriorities = [2 1];} - {name = "8: H"; monitorPriorities = [2 1];} - {name = "9: I"; monitorPriorities = [2 1];} - {name = "10: J"; monitorPriorities = [2 1];} - {name = "S"; monitorPriorities = [1];} - ]; - startup = [ - {command = "~/.config/polybar/launch.sh"; once = false;} - {command = "picom --legacy-backends -fD 3"; once = false;} - {command = "xss-lock --transfer-sleep-lock -- i3lock -eti ~/Documents/lockscreen.png --nofork"; bash = false;} - {command = "nitrogen --restore";} - {command = "nm-applet"; once = false; bash = false;} - ]; - #extraConfig = "bindmode normal\n" + (builtins.readFile ./config); - }; -} diff --git a/home-manager/claude-code-manifest-2.1.282.json b/home-manager/claude-code-manifest-2.1.282.json deleted file mode 100644 index 78dbc55..0000000 --- a/home-manager/claude-code-manifest-2.1.282.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "version": "2.1.282", - "manifestSignatureEnforcement": "flag", - "commit": "88e628ac87357ab077f78e21f78aee6156f01ab3", - "modsCommit": "d78be9481b889e11186ec4578b4f5e9301396e25", - "buildDate": "2026-09-24T04:11:54Z", - "platforms": { - "darwin-arm64": { - "binary": "claude", - "checksum": "fcfd837103965c64de34a6b9b94370d77a347ea71819715a27d5f0ef01775ea4", - "size": 222245312 - }, - "darwin-x64": { - "binary": "claude", - "checksum": "5c34b00b5c0f3862b76011015c334e91904c4593afea7a5451e00746ad7934c1", - "size": 230651344 - }, - "linux-arm64": { - "binary": "claude", - "checksum": "6764ffc39e9fed425a493ff61ea28506d1ba83996ce81a48d1177dbb393419c9", - "size": 238084088 - }, - "linux-x64": { - "binary": "claude", - "checksum": "3afe8535c0cc33f0e24f7b25dab7a1727b8b592196f8496a8bc302ba2161eed3", - "size": 238767288 - }, - "linux-arm64-musl": { - "binary": "claude", - "checksum": "5c3b3c9904f84b59d01c4e7f5c9305a4fc1981b18b26745688c9c1dab9cb25ae", - "size": 230438720 - }, - "linux-x64-musl": { - "binary": "claude", - "checksum": "e01fc77a210c54acf69205db13d8d50d11fa6ac62b81b6c6201de8440c293b0d", - "size": 232525912 - }, - "win32-x64": { - "binary": "claude.exe", - "checksum": "fc0e3af017705624b9e1bce913f72761864ff994804514da1f5e41380fca4484", - "size": 242171040 - }, - "win32-arm64": { - "binary": "claude.exe", - "checksum": "a7f3db85706ca2ca123ea9088e565f10a657a15a0f5d7b9b34283609d857de25", - "size": 229716640 - } - }, - "sdkCompat": { - "testedWrapperVersions": [ - "0.3.243", - "0.3.245", - "0.3.246", - "0.3.247", - "0.3.248", - "0.3.250", - "0.3.251", - "0.3.252", - "0.3.257", - "0.3.258", - "0.3.259", - "0.3.260", - "0.3.261", - "0.3.263", - "0.3.265", - "0.3.266", - "0.3.267", - "0.3.268", - "0.3.269", - "0.3.270", - "0.3.271", - "0.3.272", - "0.3.273", - "0.3.274", - "0.3.275", - "0.3.276", - "0.3.277", - "0.3.278", - "0.3.280", - "0.3.281" - ], - "harnessSchema": 1 - } -} diff --git a/home-manager/emacs/default.nix b/home-manager/emacs/default.nix deleted file mode 100644 index 47c3fdd..0000000 --- a/home-manager/emacs/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ pkgs, config, ... } : -let - tex = (pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-medium - dvisvgm dvipng # for preview and export as html - # svg transparent - etoolbox - subfiles - enumitem - wrapfig amsmath ulem hyperref capt-of; - }); - myEmacs = (pkgs.emacsPackagesFor pkgs.emacs30).emacsWithPackages (epkgs: with epkgs; [ - # vterm - # ghostel - treesit-grammars.with-all-grammars - ]); -in -{ - services.emacs = { - enable = true; - package = myEmacs; - }; - - home.packages = with pkgs; [ - mu - emacsPackages.mu4e - isync - ispell - poppler-utils - tex - ghostscript - haskell-language-server - myEmacs - ]; -} diff --git a/home-manager/home.nix b/home-manager/home.nix deleted file mode 100644 index 2017720..0000000 --- a/home-manager/home.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ pkgs, lib, inputs, ... }: -let - claude-code-latest = pkgs.claude-code.override { - manifest = lib.importJSON ./claude-code-manifest-2.1.282.json; - }; -in -{ - - imports = [ - ./shells/bash.nix - ./emacs - #./hyprland - ./i3 - # ./YATwm - ./kitty - inputs.spicetify-nix.homeManagerModules.default - inputs.nixcord.homeModules.nixcord - inputs.zen-browser.homeModules.twilight-official - #inputs.stylix.homeManagerModules.stylix - ]; - - home = { - stateVersion = "24.05"; - username = "boss"; - homeDirectory = "/home/boss"; - }; - - # The home.packages option allows you to install Nix packages into your - # environment. - # nixpkgs.config.allowUnfree = true; - home.packages = with pkgs; [ - feh - pass - # spotify - playerctl - libqalculate - libreoffice - hunspell - hunspellDicts.en_AU - logisim-evolution - thunderbird - xdotool - discord - # (discord.override { - # withOpenASAR = true; - # withVencord = true; - # }) - # vesktop - mumble - gimp - bottom - xfce.thunar - mpv - man-pages - man-pages-posix - # (inputs.plover-flake.packages.${system}.plover.with-plugins (ps: with ps;[ - # plover-dict-commands - # plover-console-ui - # plover-controller - # ])) - pavucontrol - unzip zip - appimage-run - # lunar-client - libnotify - xclip - (python3.withPackages (ps: with ps; [ - python-lsp-server - numpy - matplotlib - jupyter - jupytext - pandas - pydot - scikit-learn - nbdev - pillow - ])) - graphviz - alacritty - # nyxt - wireguard-tools - brightnessctl - # inputs.nil.packages.${system}.default - nil - #inputs.polymc.packages.${system}.default - jre8 - #inputs.zen-browser.packages."${system}".default - piper - qbittorrent - # sbcl - superTuxKart - typst - sops - ffmpeg - ghc - # hytale-launcher - # inputs.hytale-launcher.packages.${pkgs.system}.default - #adom - flatpak - deadlock-mod-manager - nh - claude-code-latest - inputs.claude-desktop.packages.${system}.claude-desktop - # openttd - ]; - - nix = { - #package = pkgs.nix; - settings.experimental-features = [ "nix-command" "flakes" ]; - }; - - home.sessionVariables = { - EDITOR = "emacsclient -c"; - MAKEFLAGS = " -j16 "; - MOZ_ENABLE_WAYLAND = 1; - }; - - - programs.home-manager.enable = true; - - programs.direnv = { - enable = true; - enableBashIntegration = true; - nix-direnv.enable = true; - }; - - services.gpg-agent.enable = true; - services.gpg-agent.pinentry.package = pkgs.pinentry-gtk2; - - services.dunst = { - enable = true; - settings = { - global = { - follow = "keyboard"; - frame_width = 0; - }; - }; - }; - - programs.obs-studio = { - enable = true; - - # optional Nvidia hardware acceleration - # package = ( - # pkgs.obs-studio.override { - # cudaSupport = true; - # } - # ); - - plugins = with pkgs.obs-studio-plugins; [ - obs-pipewire-audio-capture - input-overlay - ]; - }; - - # services.easyeffects.enable = true; - - services.pass-secret-service.enable = true; - # Start with the X session rather than at boot, so it inherits DISPLAY/XAUTHORITY - # and gpg can show the GTK pinentry. Otherwise apps get logged out. - systemd.user.services.pass-secret-service = { - Unit.After = [ "graphical-session.target" ]; - Unit.PartOf = lib.mkForce [ "graphical-session.target" ]; - Install.WantedBy = lib.mkForce [ "graphical-session.target" ]; - }; - - - programs.firefox = { - enable = true; - }; - programs.zen-browser = { - enable = true; - setAsDefaultBrowser = true; - }; - - # programs.nixcord = { - # enable = true; - # }; - - - stylix.targets.spicetify.enable = true; - stylix.targets.firefox.profileNames = [ "default"]; - stylix.targets.zen-browser.profileNames = [ "default" ]; - # stylix.targets.nixcord.enable = true; - - programs.spicetify = - let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; - in - { - enable = true; - spotifyLaunchFlags = "--disable-gpu --disable-software-rasterizer"; - enabledExtensions = with spicePkgs.extensions; [ - fullAppDisplay - powerBar - # addToQueueTop - loopyLoop - ]; - enabledCustomApps = with spicePkgs.apps; [ - newReleases - lyricsPlus - betterLibrary - ]; - # theme = spicePkgs.themes.nightlight; - }; - - - xsession.windowManager.command = lib.mkForce "$@"; -} diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix deleted file mode 100644 index 4a0b9f3..0000000 --- a/home-manager/hyprland/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ - pkgs, - lib, - inputs, - ... -}: -{ - imports = [ - ../rofi - ../kitty - ../waybar - ../hyprpaper - ]; - - home.file.".config/hypr/hyprlock.conf".source = ./hyprlock.conf; - - wayland.windowManager.hyprland= { - enable = true; - xwayland.enable = true; - systemd.variables = ["--all"]; - #package = inputs.hyprland.packages.${pkgs.system}.hyprland; - #portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; - settings = { - "$mod" = "SUPER"; - exec-once = [ - "waybar" - "xss-lock --transfer-sleep-lock -- hyprlock" - "nm-applet" - "hyprpaper" - ]; - bind = - [ - "$mod, C, exec, firefox" - ", Print, exec, grimblast copy area" - "$mod, D, exec, rofi -i -show drun -disable-history" - "$mod Shift, E, exit" - "$mod, Return, exec, kitty" - "$mod, T, togglesplit" - "$mod Control, left, workspace, m-1" - "$mod Control, h, workspace, m-1" - "$mod Control, right, workspace, m+1" - "$mod Control, l, workspace, m+1" - "$mod, x, exec, hyprlock" - "$mod Shift, x, exec, hyprlock" - "$mod Shift, x, exec, systemctl suspend" - "$mod Shift, MINUS, exec, emacsclient -c" - "ALT, Tab, focusmonitor, +1" - "$mod, G, exec, bash /home/boss/bin/rofi-passmenu" - ", XF86AudioRaiseVolume, exec, pamixer -i 5" - ", XF86AudioLowerVolume, exec, pamixer -d 5" - "$mod Shift, Q, killactive" - "$mod, F, fullscreen" - "$mod Shift, space, togglefloating" - "$mod, mouse:272, movewindow" - ", XF86AudioPlay, exec, playerctl play-pause" - "$mod, bracketleft, exec, playerctl -p firefox play-pause" - "$mod, bracketright, exec, playerctl -p spotify play-pause" - "$mod Shift, S, exec spectacle -r" - ] - ++ ( - # workspaces - # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - key = let - c = (x + 1) / 10; - in toString (x + 1 - (c * 10)); - in [ - "$mod, ${key}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${key}, movetoworkspace, ${toString (x + 1)}" - (lib.mkIf (x < 5) - "$mod Control, ${key}, workspace, ${toString (x + 6)}" - ) - "$mod Control, ${key}, workspace, ${toString (x + 1)}" - ] - ) - 10) - ) - ++ ( - builtins.map ( - x: "$mod, ${ builtins.elemAt x 0}, movefocus, ${builtins.elemAt x 1}\nbind=$mod Shift, ${builtins.elemAt x 0}, movewindow, ${builtins.elemAt x 1}" - ) - [ - ["h" "l"] - ["left" "l"] - ["j" "d"] - ["down" "d"] - ["k" "u"] - ["up" "u"] - ["l" "r"] - ["right" "r"] - ] - ); - monitor = - [ - "eDP-1, highrr, 0x0, 1" - "HDMI-A-1, highrr, 1920x0, 1" - ]; - workspace = - (builtins.genList - (x : "${toString (x + 1)},monitor:eDP-1") - 5 - ) - ++ (builtins.genList - (x : "${toString (x + 6)},monitor:HDMI-A-1") - 5 - ); - - - input = { - touchpad.natural_scroll = true; - #touchpad.scroll_factor = 0.5; - accel_profile = "flat"; - follow_mouse = true; - kb_options = "caps:super"; - #sensitivity = 0.00; - }; - decoration = { - rounding = 10; - drop_shadow = false; - }; - animation = [ - "workspaces,1,5,easeOutQuint,slide" - ]; - bezier = [ - "easeInOutCubic,0.65,0,0.35,1" - "easeOutQuint,0.22,1,0.36,1" - ]; - general = { - #"col.inactive_border" = "rgb(2f2e43)"; - #"col.active_border" = "rgb(ab47bc)"; - border_size = 2; - gaps_in = 6; - gaps_out = 12; - }; - windowrulev2 = [ - "opacity 0.8 override 0.8 override, title:Spotify$" - ]; - }; - }; - - home.packages = with pkgs; [ - ydotool - xss-lock - pamixer - grimblast - playerctl - libsForQt5.spectacle - inputs.hyprlock.packages.${system}.hyprlock - ]; -} diff --git a/home-manager/hyprland/default.nix~ b/home-manager/hyprland/default.nix~ deleted file mode 100644 index 569d7ff..0000000 --- a/home-manager/hyprland/default.nix~ +++ /dev/null @@ -1,95 +0,0 @@ -{ - pkgs, - ... -}: -{ - imports = [ - ../rofi - ../kitty - ../waybar - ]; - - wayland.windowManager.hyprland= { - enable = true; - xwayland.enable = true; - settings = { - "$mod" = "SUPER"; - exec-once = [ - "waybar" - "xss-lock --transfer-sleep-lock -- swaylock" - ]; - bind = - [ - "$mod, C, exec, firefox" - #", Print, exec, grimblast copy area" - "$mod, D, exec, rofi -i -show drun -disable-history" - "$mod Shift, E, exit" - "$mod, Return, exec, kitty" - "$mod, T, togglesplit" - "$mod Control, left, workspace, m-1" - "$mod Control, h, workspace, m-1" - "$mod Control, right, workspace, m+1" - "$mod Control, l, workspace, m+1" - "$mod, x, exec, swaylock" - "$mod Shift, x, exec, swaylock" - "$mod Shift, x, exec, systemctl suspend" - "$mod Shift, MINUS, exec, emacsclient -c" - ] - ++ ( - # workspaces - # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" - ] - ) - 10) - ) - ++ ( - builtins.map ( - x: "$mod, ${ builtins.elemAt x 0}, movefocus, ${builtins.elemAt x 1}\nbind=$mod Shift, ${builtins.elemAt x 0}, movewindow, ${builtins.elemAt x 1}" - ) - [ - ["h" "l"] - ["left" "l"] - ["j" "d"] - ["down" "d"] - ["k" "u"] - ["up" "u"] - ["l" "r"] - ["right" "r"] - ] - ); - monitor = - [ - "eDP-1, 1920x1080, 0x0, 1" - "HDMI-A-1, 1920x1080, 1920x0, 1" - ]; - input = { - touchpad.natural_scroll = true; - #touchpad.scroll_factor = 0.5; - accel_profile = "flat"; - follow_mouse = true; - #sensitivity = 0.00; - }; - decoration.rounding = 10; - animation = [ - "workspaces,1,5,easeOutQuint,slide" - ]; - bezier = [ - "easeInOutCubic,0.65,0,0.35,1" - "easeOutQuint,0.22,1,0.36,1" - ]; - }; - }; - - home.packages = with pkgs; [ - swaylock - ]; -} diff --git a/home-manager/hyprland/hyprlock.conf b/home-manager/hyprland/hyprlock.conf deleted file mode 100644 index dc2bc93..0000000 --- a/home-manager/hyprland/hyprlock.conf +++ /dev/null @@ -1,41 +0,0 @@ -background { - path = /home/boss/Wallpapers/lockscreen.png - blur_passes = 0 -} -input-field { - size = 200, 50 - outline_thickness = 3 - dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 - dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 - dots_center = false - dots_rounding = -1 # -1 default circle, -2 follow input-field rounding - outer_color = rgb(151515) - inner_color = rgb(200, 200, 200) - font_color = rgb(10, 10, 10) - fade_on_empty = true - fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. - placeholder_text = Input Password... # Text rendered in the input box when it's empty. - hide_input = false - rounding = -1 # -1 means complete rounding (circle/oval) - check_color = rgb(204, 136, 34) - fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color - fail_text = $FAIL ($ATTEMPTS) # can be set to empty - fail_transition = 300 # transition time in ms between normal outer_color and fail_color - capslock_color = -1 - numlock_color = -1 - bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) - invert_numlock = false # change color if numlock is off - swap_font_color = false # see below - - position = 0, -20 - halign = center - valign = center -} -label { - text = $TIME - text_align = center - color = rgb(50, 50, 50) - position = 0, 200 - halign = center - valign = center -} \ No newline at end of file diff --git a/home-manager/hyprpaper/default.nix b/home-manager/hyprpaper/default.nix deleted file mode 100644 index 6509222..0000000 --- a/home-manager/hyprpaper/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - pkgs, - ... -}: -{ - #home.file.".config/hypr/hyprpaper.conf".source = ./hyprpaper.conf; - home.packages = with pkgs; [ - hyprpaper - ]; -} diff --git a/home-manager/hyprpaper/hyprpaper.conf b/home-manager/hyprpaper/hyprpaper.conf deleted file mode 100644 index 02bec8b..0000000 --- a/home-manager/hyprpaper/hyprpaper.conf +++ /dev/null @@ -1,3 +0,0 @@ -preload = ~/Wallpapers/val.png - -wallpaper = ,~/Wallpapers/val.png \ No newline at end of file diff --git a/home-manager/i3/config b/home-manager/i3/config deleted file mode 100644 index fc0afae..0000000 --- a/home-manager/i3/config +++ /dev/null @@ -1,333 +0,0 @@ -# i3 config file (v4) -# -# Please see https://i3wm.org/docs/userguide.html for a complete reference! -# -# This config file uses keycodes (bindsym) and was written for the QWERTY -# layout. -# -# To get a config file with the same key positions, but for your current -# layout, use the i3-config-wizard -# - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:Ubuntu 10 - -# This font is widely installed, provides lots of unicode glyphs, right-to-left -# text rendering and scalability on retina/hidpi displays (thanks to pango). -#font pango:DejaVu Sans Mono 8 - -# The combination of xss-lock, nm-applet and pactl is a popular choice, so -# they are included here as an example. Modify as you see fit. - -# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the -# screen before suspend. Use loginctl lock-session to lock your screen. -exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -eti ~/Documents/lockscreen.png --nofork - -# NetworkManager is the most popular way to manage wireless networks on Linux, -# and nm-applet is a desktop environment-independent system tray GUI for it. -exec_always --no-startup-id nm-applet - -# Use pactl to adjust volume in PulseAudio. -#set $refresh_i3status killall -SIGUSR1 i3status -#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% -#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% -#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle -#bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle - -bindsym XF86AudioRaiseVolume exec --no-startup-id pamixer -i 5 -bindsym XF86AudioLowerVolume exec --no-startup-id pamixer -d 5 - -# use these keys for focus, movement, and resize directions when reaching for -# the arrows is not convenient - -set $up k -set $down j -set $left h -set $right l - -##STARTUP -exec_always --no-startup-id "feh --bg-scale ~/Wallpapers/val.png" -#exec_always --no-startup-id nitrogen --restore -#exec_always --no-startup-id "picom --backend glx -fD 3 --vsync" -exec_always --no-startup-id "~/.config/polybar/launch.sh" -# Bind caps to super -#exec_always --no-startup-id "setxkbmap -option caps:super" -# Bind caps to control -# exec --no-startup-id "setxkbmap -option ctrl:nocaps" -# exec --no-startup-id "systemctl --user start dunst" -exec_always --no-startup-id xinput set-prop "ELAN1203:00 04F3:307A Touchpad" "libinput Tapping Enabled" 1 -exec_always --no-startup-id xinput set-prop "ELAN1203:00 04F3:307A Touchpad" "libinput Natural Scrolling Enabled" 1 -exec --no-startup-id flameshot -exec --no-startup-id rog-control-center -# Using systemd instead -#exec --no-startup-id "emacs --daemon" -exec --no-startup-id "emacsclient -c --eval '(start-scratch)'" -for_window [title="scratch-emacs"] , move scratchpad - -set $mod Mod4 - - -#GAPS - -for_window[class="-*"] border pixel 0 - -gaps inner 6 - - -#My keybinds -bindsym $mod+Control+$right workspace next -bindsym $mod+Control+Right workspace next - -#Special workspaces -bindsym $mod+p exec --no-startup-id "workspaces.sh" -bindsym $mod+Shift+p exec --no-startup-id "workspaces.sh move" - -bindsym $mod+Control+$left workspace prev -bindsym $mod+Control+Left workspace prev - -#set $i3lock-cmd i3lock -eti ~/Documents/lockscreen.png - -bindsym $mod+Shift+s exec --no-startup-id flameshot gui - -bindsym $mod+x exec --no-startup-id "loginctl lock-session" -bindsym $mod+Shift+x exec --no-startup-id "loginctl lock-session; systemctl suspend" -# bindsym $mod+Shift+c exec --no-startup-id "~/.i3_commands/open-qb.sh" -bindsym $mod+c exec --no-startup-id "zen-twilight" -bindsym $mod+Shift+c exec --no-startup-id "nyxt" -bindsym $mod+Shift+minus exec --no-startup-id "emacsclient -c" - -bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl s +5 -bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl s 5- - -bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause -bindsym XF86AudioNext exec --no-startup-id playerctl next -bindsym XF86AudioPrev exec --no-startup-id playerctl previous -bindxym XF86AudioStop exec --no-startup-id playerctl stop - -bindsym $mod+bracketleft exec --no-startup-id playerctl -p firefox play-pause -bindsym $mod+bracketright exec --no-startup-id playerctl -p spotify play-pause - -#Emoji picker -#bindsym $mod+comma exec --no-startup-id "emojis.sh" - -#Monitor config -bindsym $mod+m exec --no-startup-id "monitor-config.sh" - -# use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# start a terminal -bindsym $mod+Return exec --no-startup-id kitty - -# Start emacs with vterm -bindsym $mod+Shift+Return exec --no-startup-id "emacsclient -c --eval '(multi-vterm)'" - -# kill focused window -bindsym $mod+Shift+q kill - -# start dmenu (a program launcher) -bindsym $mod+d exec --no-startup-id rofi -i -show drun -disable-history -bindsym $mod+Shift+d exec --no-startup-id "prime-run rofi -i -show drun -disable-history" -#bindsym $mod+Shift+c exec --no-startup-id "rofi -i -lines 0 -dmenu -p 'Search:' | xargs -I{} ~/.i3_commands/browser-open.sh '{}'" -#bindsym $mod+d exec dmenu_run -i -nb '#303239' -nf '#f3f4f5' -sb '#bf00f6' -sf '#f3f4f5' - -# Password menu -bindsym $mod+g exec --no-startup-id "rofi-passmenu" - -# i3 command runner -bindsym $mod+Shift+semicolon exec --no-startup-id "i3-msg $(echo | rofi -l 0 -dmenu -p 'i3 command')" - -# There also is the (new) i3-dmenu-desktop which only displays applications -# shipping a .desktop file. It is a wrapper around dmenu, so you need that -# installed. -# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop - -# change focus -bindsym $mod+$left focus left -bindsym $mod+$down focus down -bindsym $mod+$up focus up -bindsym $mod+$right focus right - -bindsym Mod1+Tab focus output left - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+$left move left -bindsym $mod+Shift+$down move down -bindsym $mod+Shift+$up move up -bindsym $mod+Shift+$right move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -# bindsym $mod+g split h - -# split in vertical orientation -# bindsym $mod+v split v - -# split toggle -bindsym $mod+t split toggle - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+a focus parent - -# focus the child container -#bindsym $mod+d focus child - -# move the currently focused window to the scratchpad -# bindsym $mod+Shift+minus move scratchpad - -# Show the next scratchpad window or hide the focused scratchpad window. -# If there are multiple scratchpad windows, this command cycles through them. -for_window [title="scratch-emacs"] , floating_minimum_size 1600 x 900 -bindsym $mod+minus scratchpad show - -# Define names for default workspaces for which we configure key bindings later on. -# We use variables to avoid repeating the names in multiple places. -set $ws1 "1: " -set $ws2 "2: 󰑴" -set $ws3 "3: " -set $ws4 "4: " -set $ws5 "5: " -set $ws6 "6: " -set $ws7 "7: 󰑴" -set $ws8 "8: " -set $ws9 "9: " -set $ws10 "10: " - -# make workspaces go on correct monitors -workspace $ws1 output eDP eDP-1 eDP-1-1 -workspace $ws2 output eDP eDP-1 eDP-1-1 -workspace $ws3 output eDP eDP-1 eDP-1-1 -workspace $ws4 output eDP eDP-1 eDP-1-1 -workspace $ws5 output eDP eDP-1 eDP-1-1 -workspace $ws6 output HDMI-A-0 HDMI-1 HDMI-1-1 eDP eDP-1 eDP-1-1 -workspace $ws7 output HDMI-A-0 HDMI-1 HDMI-1-1 eDP eDP-1 eDP-1-1 -workspace $ws8 output HDMI-A-0 HDMI-1 HDMI-1-1 eDP eDP-1 eDP-1-1 -workspace $ws9 output HDMI-A-0 HDMI-1 HDMI-1-1 eDP eDP-1 eDP-1-1 -workspace $ws10 output HDMI-A-0 HDMI-1 HDMI-1-1 eDP eDP-1 eDP-1-1 - -# switch to workspace -bindsym $mod+1 workspace number $ws1 -bindsym $mod+2 workspace number $ws2 -bindsym $mod+3 workspace number $ws3 -bindsym $mod+4 workspace number $ws4 -bindsym $mod+5 workspace number $ws5 -bindsym $mod+6 workspace number $ws6 -bindsym $mod+7 workspace number $ws7 -bindsym $mod+8 workspace number $ws8 -bindsym $mod+9 workspace number $ws9 -bindsym $mod+0 workspace number $ws10 - - -bindsym $mod+Control+1 workspace number $ws6; workspace number $ws1 -bindsym $mod+Control+2 workspace number $ws7; workspace number $ws2 -bindsym $mod+Control+3 workspace number $ws8; workspace number $ws3 -bindsym $mod+Control+4 workspace number $ws9; workspace number $ws4 -bindsym $mod+Control+5 workspace number $ws10; workspace number $ws5 - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace number $ws1 -bindsym $mod+Shift+2 move container to workspace number $ws2 -bindsym $mod+Shift+3 move container to workspace number $ws3 -bindsym $mod+Shift+4 move container to workspace number $ws4 -bindsym $mod+Shift+5 move container to workspace number $ws5 -bindsym $mod+Shift+6 move container to workspace number $ws6 -bindsym $mod+Shift+7 move container to workspace number $ws7 -bindsym $mod+Shift+8 move container to workspace number $ws8 -bindsym $mod+Shift+9 move container to workspace number $ws9 -bindsym $mod+Shift+0 move container to workspace number $ws10 - -# reload the configuration file -# bindsym $mod+Shift+c reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+e exec "exit.sh" -#bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" - -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym $left resize shrink width 10 px or 10 ppt - bindsym $down resize grow height 10 px or 10 ppt - bindsym $up resize shrink height 10 px or 10 ppt - bindsym $right resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - -bindsym $mod+r mode "resize" - -set $bg-color #303239 -set $inactive-bg-color #303239 -set $text-color #f3f4f5 -set $inactive-text-color #676E7D -set $urgent-bg-color #bf00f6 - -set $focused-border #ffcb6b - -# window colors -# border background text indicator -client.focused $bg-color $focused-border $text-color $bg-color -client.unfocused $inactive-bg-color $inactive-bg-color $inactive-text-color $inactive-bg-color -client.focused_inactive $inactive-bg-color $inactive-bg-color $inactive-text-color $inactive-bg-color -client.urgent $urgent-bg-color $urgent-bg-color $text-color $urgent-bg-color - - -hide_edge_borders none - -# bar -bar { - i3bar_command none - tray_output primary - font pango: Sauce Code Pro Nerd Font, Powerline 10 - height 19 - #status_command i3status - status_command "i3status-rs" - colors { - background $bg-color - # border background text - focused_workspace $bg-color $bg-color $text-color - inactive_workspace $inactive-bg-color $inactive-bg-color $inactive-text-color - urgent_workspace $urgent-bg-color $urgent-bg-color $text-color - } -} diff --git a/home-manager/i3/default.nix b/home-manager/i3/default.nix deleted file mode 100644 index 0272d79..0000000 --- a/home-manager/i3/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -# let -# nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11"; -# pkgs = import nixpkgs { config = {}; overlays = []; }; -# in -# { -# i3-commands = pkgs.callPackage ./i3-commands.nix { }; -# } - - -{ - config, - pkgs, - ... -} : { - imports = [ - ../polybar - ../rofi - ../kitty - ../picom - ]; - xsession.enable = true; - xsession.windowManager.i3 = { - enable = true; - package = pkgs.i3; - }; - xdg.configFile."i3/config".enable = false; - home.file.".config/i3/config" = { - source = ./config; - onChange = "${pkgs.i3}/bin/i3-msg restart"; - }; - home.packages = with pkgs; [ - i3lock - xss-lock - networkmanagerapplet - flameshot - picom - nitrogen - pamixer - (pkgs.callPackage ./i3-commands.nix { }) - (pkgs.callPackage ./rofi-passmenu.nix { }) - ]; -} diff --git a/home-manager/i3/i3-commands.nix b/home-manager/i3/i3-commands.nix deleted file mode 100644 index 68cf7b6..0000000 --- a/home-manager/i3/i3-commands.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - stdenv, - lib -}: -stdenv.mkDerivation { - pname = "i3-commands"; - version = "0.0.1"; - - srcs = lib.cleanSourceWith { - src = ./scripts; - filter = path: type: baseNameOf path != "rofi-passmenu"; - }; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D -m 755 ./* $out/bin - runHook postInstall - ''; -} diff --git a/home-manager/i3/rofi-passmenu.nix b/home-manager/i3/rofi-passmenu.nix deleted file mode 100644 index 153ffc3..0000000 --- a/home-manager/i3/rofi-passmenu.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - pkgs -}: - -pkgs.writeShellApplication { - name = "rofi-passmenu"; - - runtimeInputs = with pkgs; [ - pass - rofi - xclip - xdotool - gnugrep - gawk - coreutils - libnotify - ]; - - text = '' - #!/usr/bin/env bash - - store_dir="''${PASSWORD_STORE_DIR:-$HOME/.password-store}" - - get_passwords() { - echo "[+] Add New Password" - if [ -d "$store_dir" ]; then - find "$store_dir" -name "*.gpg" | sort | while IFS= read -r file; do - pass="''${file#"$store_dir"/}" - echo "''${pass%.gpg}" - done - fi - } - - selected=$(get_passwords | rofi -dmenu -i -p "pass") - [[ -z "$selected" ]] && exit 0 - - if [[ "$selected" == "[+] Add New Password" ]]; then - new_path=$(rofi -dmenu -p "Enter path/name for new password:") - [[ -z "$new_path" ]] && exit 0 - - choice=$(echo -e "Generate\nManual" | rofi -dmenu -p "Password method:") - if [[ "$choice" == "Generate" ]]; then - pass generate "$new_path" 20 - notify-send "Pass" "Generated password for $new_path" - elif [[ "$choice" == "Manual" ]]; then - new_pass=$(rofi -dmenu -p "Enter password:" -password) - [[ -n "$new_pass" ]] && echo "$new_pass" | pass insert -m "$new_path" - fi - exit 0 - fi - - action=$(echo -e "1. Type Password\n2. Type Username\n3. Copy Password\n4. Copy Username\n5. Show Password" | rofi -dmenu -i -p "$selected") - - case "$action" in - "1. Type Password") - pass show "$selected" | head -n 1 | tr -d '\n' | xdotool type --clearmodifiers -fi - - ;; - "2. Type Username") - pass show "$selected" | grep -i "^username:" | sed 's/^[^:]*:[[:space:]]*//' | tr -d '\n' | xdotool type --clearmodifiers -fi - - ;; - "3. Copy Password") - pass show -c "$selected" - ;; - "4. Copy Username") - pass show "$selected" | grep -i "^username:" | sed 's/^[^:]*:[[:space:]]*//' | xclip -selection clipboard - ;; - "5. Show Password") - pass show "$selected" | head -n 1 | rofi -dmenu -p "Password for $selected" - ;; - esac - ''; -} diff --git a/home-manager/i3/scripts/exit.sh b/home-manager/i3/scripts/exit.sh deleted file mode 100755 index 6e1f492..0000000 --- a/home-manager/i3/scripts/exit.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -choice=$(echo -e "Sleep\nLock\nLock and sleep\nExit i3" | rofi -dmenu -i -p "What do you want to do") -case $choice in - "Sleep") - systemctl suspend - ;; - "Lock") - i3lock -eti /usr/share/backgrounds/lockscreen.png - ;; - "Lock and sleep") - i3lock -eti /usr/share/backgrounds/lockscreen.png - systemctl suspend - ;; - "Exit i3") - i3-msg exit - ;; - *) - notify-send "Canceling" - ;; -esac diff --git a/home-manager/i3/scripts/image_upload.sh b/home-manager/i3/scripts/image_upload.sh deleted file mode 100755 index ea327ad..0000000 --- a/home-manager/i3/scripts/image_upload.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -image_name=$(rofi -dmenu -l 0 -p "Image name") -xclip -selection clipboard -t image/png -o > ~/Documents/tehbox-files/$image_name -eval $(ssh-agent) -rsync ~/Documents/tehbox-files/$image_name boss@tehbox.org:/srv/files -notify-send "uploaded https://files.tehbox.org/$image_name" -echo -n "https://files.tehbox.org/$image_name" | xclip -i -selection clipboard diff --git a/home-manager/i3/scripts/monitor-config.sh b/home-manager/i3/scripts/monitor-config.sh deleted file mode 100755 index 8f17660..0000000 --- a/home-manager/i3/scripts/monitor-config.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -choice=$(echo -e "One monitor\nTwo monitors" | rofi -dmenu -i -p "What monitor setup to use") - -monitor1=$(xrandr | grep -E "eDP(-1(-1)?)?" | awk '{print $1 }') -monitor2=$(xrandr | grep -E "HDMI(-A-0)?(-1(-1)?)?" | awk '{print $1 }') - -case $choice in - "One monitor") - xrandr --output $monitor1 --primary --mode 1920x1080 --rate 144 --pos 0x0 --rotate normal --output $monitor2 --off - sleep 1 - i3-msg restart - ;; - "Two monitors") - xrandr --output $monitor1 --primary --mode 1920x1080 --rate 144 --pos 0x0 --rotate normal --output $monitor2 --mode 1920x1080 --rate 144 --pos 1920x0 --rotate normal - sleep 1 - i3-msg restart - ;; - *) - notify-send "Invalid response, canceling" - ;; -esac - diff --git a/home-manager/i3/scripts/rofi-passmenu b/home-manager/i3/scripts/rofi-passmenu deleted file mode 100755 index 798961b..0000000 --- a/home-manager/i3/scripts/rofi-passmenu +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -shopt -s nullglob globstar - -typeit=1 - -if [[ -n $WAYLAND_DISPLAY ]]; then - rofi=rofi-wl - xdotool="ydotool type --file -" -elif [[ -n $DISPLAY ]]; then - rofi=rofi - xdotool="xdotool type --clearmodifiers --file -" -else - echo "Error: No Wayland or X11 display detected" >&2 - exit 1 -fi - -prefix=${PASSWORD_STORE_DIR-~/.password-store} -password_files=( "$prefix"/**/*.gpg ) -password_files=( "${password_files[@]#"$prefix"/}" ) -password_files=( "${password_files[@]%.gpg}" ) - -password=$(printf '%s\n' "${password_files[@]}" | "$rofi" -dmenu "$@") - -[[ -n $password ]] || exit - -pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool diff --git a/home-manager/i3/scripts/workspaces.sh b/home-manager/i3/scripts/workspaces.sh deleted file mode 100755 index 3ad68ef..0000000 --- a/home-manager/i3/scripts/workspaces.sh +++ /dev/null @@ -1,7 +0,0 @@ -choice=$(cat ~/.i3_commands/workspaces.txt | rofi -dmenu -i -p "Which workspace to switch to") -if [[ $1 == "move" ]] -then - i3-msg move container to workspace \"$choice\" -else - i3-msg workspace \"$choice\" -fi diff --git a/home-manager/i3/scripts/workspaces.txt b/home-manager/i3/scripts/workspaces.txt deleted file mode 100644 index 84b3bf0..0000000 --- a/home-manager/i3/scripts/workspaces.txt +++ /dev/null @@ -1,11 +0,0 @@ -1:  -2: 󰑴 -3:  -4:  -5:  -6:  -7: 󰑴 -8:  -9:  -10:  -S:  diff --git a/home-manager/kitty/default.nix b/home-manager/kitty/default.nix deleted file mode 100644 index 7d7326b..0000000 --- a/home-manager/kitty/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - pkgs, - config, - ... -}: -{ - programs.kitty = { - enable = true; - keybindings = { - "control+shift+c" = "copy_to_clipboard"; - "control+shift+v" = "paste_from_clipboard"; - }; - settings = { - #font_family = "Cousine Nerd Font"; - #font_size = "10.0"; - #background_opacity = "0.8"; - term = "xterm-256color"; - enable_audio_bell = "no"; - mouse_hide_wait = 2; - window_padding_width = 4; - }; - #extraConfig = (builtins.readFile ./palenight.conf); - }; -} diff --git a/home-manager/kitty/palenight.conf b/home-manager/kitty/palenight.conf deleted file mode 100644 index 6a58ece..0000000 --- a/home-manager/kitty/palenight.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Palenight Colorscheme for Kitty -# Based on https://github.com/sindresorhus/hyper-snazzy - -foreground #959dcb -background #292d3e -selection_foreground #eceef0 -selection_background #607c8b -url_color #82aaff - -# black -color0 #434759 -color8 #434758 - -# red -color1 #f07178 -color9 #ff8b92 - -# green -color2 #c3e88d -color10 #ddffa7 - -# yellow -color3 #ffcb6b -color11 #ffe585 - -# blue -color4 #82aaff -color12 #9cc4ff - -# magenta -color5 #c792ea -color13 #e1acff - -# cyan -color6 #89ddff -color14 #a3f7ff - -# white -color7 #d0d0d0 -color15 #fefefe diff --git a/home-manager/picom/default.nix b/home-manager/picom/default.nix deleted file mode 100644 index 1c13407..0000000 --- a/home-manager/picom/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - pkgs, - config, - ... -}: -{ - services.picom = { - enable = true; - fade = true; - fadeDelta = 3; - fadeExclude = [ - "window_type *= 'tooltip'" - ]; - settings = { - corner-radius = 10; - }; - }; -} diff --git a/home-manager/polybar/config.ini b/home-manager/polybar/config.ini deleted file mode 100644 index b7cf83e..0000000 --- a/home-manager/polybar/config.ini +++ /dev/null @@ -1,186 +0,0 @@ -;========================================================== -; -; -; ██████╗ ██████╗ ██╗ ██╗ ██╗██████╗ █████╗ ██████╗ -; ██╔══██╗██╔═══██╗██║ ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗ -; ██████╔╝██║ ██║██║ ╚████╔╝ ██████╔╝███████║██████╔╝ -; ██╔═══╝ ██║ ██║██║ ╚██╔╝ ██╔══██╗██╔══██║██╔══██╗ -; ██║ ╚██████╔╝███████╗██║ ██████╔╝██║ ██║██║ ██║ -; ╚═╝ ╚═════╝ ╚══════╝╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ -; -; -; To learn more about how to configure Polybar -; go to https://github.com/polybar/polybar -; -; The README contains a lot of information -; -;========================================================== -;;; -[colors] -background = #cc292d3e -background-alt = #cc292d3e -foreground = #676e96 -primary = #676e96 -secondary = #8ABEB7 -alert = #BF00F6 -disabled = #515772 -active = #eeffff -inactive = #515772 - -[section/bar-defaults] -width = 100% -height = 19pt -radius = 10 - -monitor = ${env:MONITOR:} - -bottom = true - -; dpi = 96 - -background = ${colors.background} -foreground = ${colors.foreground} - -border-size = 6px -border-color = #00000000 - -padding-left = 0 -padding-right = 1 -border-top-size = 0 - -module-margin = 1 - -separator = "|" -separator-foreground = ${colors.disabled} - -font-0 = Cousine Nerd Font;1 - -cursor-click = pointer -cursor-scroll = ns-resize - -enable-ipc = true - -; wm-restack = generic -; wm-restack = bspwm -wm-restack = generic - -override-redirect = false - -[bar/mainbar] -inherit = section/bar-defaults -modules-left = xworkspaces -modules-right = pipewire xkeyboard memory cpu battery date tray -modules-center = xwindow - -[bar/extrabar] -inherit = section/bar-defaults -modules-left = xworkspaces -modules-right = pipewire xkeyboard memory cpu battery date -modules-center = xwindow - -[module/xworkspaces] -type = internal/xworkspaces - -pin-workspaces = true - -label-active = %name% -label-active-foreground = ${colors.active} -label-active-padding = 1 - -label-occupied = %name% -label-occupied-foreground = ${colors.inactive} -label-occupied-padding = 1 - -label-urgent = %name% -label-urgent-foreground = ${colors.inactive} -label-urgent-background = ${colors.alert} -label-urgent-padding = 1 - -label-empty = -label-empty-foreground = ${colors.inactive} -label-empty-padding = 0 - -[module/pipewire] -type = internal/pulseaudio - -master-soundcard = hw:2 -master-mixer = Master -mapped = true - -format-volume-prefix = "VOL " -format-volume-prefix-foreground = ${colors.primary} -format-volume = - -label-volume = %percentage%% - -label-muted = muted -label-muted-foreground = ${colors.disabled} - -[module/battery] -type = internal/battery -low-at = 20 -full-at = 100 -battery = BAT1 -adapter = ACAD - -time-format = "%H:%M" - -format-charging-prefix = "BAT " -format-discharging-prefix = "BAT " -format-full-prefix = "BAT " -format-charging-prefix-foreground = ${colors.primary} -format-discharging-prefix-foreground = ${colors.primary} -format-full-prefix-foreground = ${colors.primary} -format-charging = "" -format-discharging = "" -format-full = - -label-charging = "%percentage%% - %time%" -label-discharging = "%percentage%% - %time%" -label-full = "FULL" - -[module/memory] -type = internal/memory -interval = 1 -format-prefix = "RAM " -format-prefix-foreground = ${colors.primary} -label = %percentage_used:2%% - -[module/cpu] -type = internal/cpu -interval = 1 -format-prefix = "CPU " -format-prefix-foreground = ${colors.primary} -label = %percentage:2%% - -[module/date] -type = internal/date -interval = 1 - -date = %H:%M:%S -date-alt = %H:%M:%S %d-%m-%Y - -label = %date% -label-foreground = ${colors.primary} - -[module/tray] -type = internal/tray -tray-spacing = 5 - -[module/xwindow] -type = internal/xwindow -format =