update all references from jacekpoz to poz on forgejo instance

udpate nix webring
add steamcmd and steam-tui to steam config
2024-09-15 18:48:50 +02:00 · 2024-09-14 23:08:55 +02:00 · 2024-09-14 19:55:09 +02:00 · 2024-09-14 18:10:35 +02:00 · 2024-09-14 14:09:40 +02:00 · 2024-09-14 11:37:47 +02:00
12 changed files with 212 additions and 48 deletions
--- a/flake.lock
+++ b/flake.lock
@ -563,7 +563,7 @@
    },
    "flake-utils_5": {
      "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_12"
      },
      "locked": {
        "lastModified": 1710146030,
@ -581,7 +581,7 @@
    },
    "flake-utils_6": {
      "inputs": {
-        "systems": "systems_12"
+        "systems": "systems_14"
      },
      "locked": {
        "lastModified": 1705309234,
@ -599,7 +599,7 @@
    },
    "flake-utils_7": {
      "inputs": {
-        "systems": "systems_14"
+        "systems": "systems_17"
      },
      "locked": {
        "lastModified": 1710146030,
@ -1260,6 +1260,28 @@
        "type": "github"
      }
    },
+    "nix-webring": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nte": "nte",
+        "systems": "systems_11"
+      },
+      "locked": {
+        "lastModified": 1726348058,
+        "narHash": "sha256-X6LdIw+qfvn39W3sQb3tjzeSe+CEonyMFD42AYP/SAc=",
+        "ref": "refs/heads/main",
+        "rev": "06737ed6d71df7ee9f4e2b52a606557f411cfa6a",
+        "revCount": 32,
+        "type": "git",
+        "url": "https://git.jacekpoz.pl/poz/nixwebr.ing"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jacekpoz.pl/poz/nixwebr.ing"
+      }
+    },
    "nixpak": {
      "inputs": {
        "flake-parts": "flake-parts_2",
@ -1522,11 +1544,11 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1725634671,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
+        "lastModified": 1726062873,
+        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
        "type": "github"
      },
      "original": {
@ -1555,22 +1577,45 @@
    "nte": {
      "inputs": {
        "nixpkgs": [
-          "pozsite",
+          "nix-webring",
          "nixpkgs"
-        ]
+        ],
+        "systems": "systems_10"
      },
      "locked": {
-        "lastModified": 1721236649,
-        "narHash": "sha256-aQCYsCicXN/p4VAYmWNvB7m4JLBOssHV9Lfa/L6VU/A=",
-        "ref": "refs/heads/master",
-        "rev": "2f8dd60760275c9bb94fd4d7d3510088c8d78ae0",
-        "revCount": 23,
+        "lastModified": 1726242453,
+        "narHash": "sha256-VTHc10y2gI1CVmCayzzswPQPZ4S/QIi28VKpyfS+K1M=",
+        "ref": "refs/heads/main",
+        "rev": "b1f9ff4ed5fe38973c5c16db7b8c1f6100c52a5e",
+        "revCount": 51,
        "type": "git",
-        "url": "https://git.jacekpoz.pl/jacekpoz/nte"
+        "url": "https://git.jacekpoz.pl/poz/nte"
      },
      "original": {
        "type": "git",
-        "url": "https://git.jacekpoz.pl/jacekpoz/nte"
+        "url": "https://git.jacekpoz.pl/poz/nte"
+      }
+    },
+    "nte_2": {
+      "inputs": {
+        "nixpkgs": [
+          "pozsite",
+          "nixpkgs"
+        ],
+        "systems": "systems_15"
+      },
+      "locked": {
+        "lastModified": 1726242453,
+        "narHash": "sha256-VTHc10y2gI1CVmCayzzswPQPZ4S/QIi28VKpyfS+K1M=",
+        "ref": "refs/heads/main",
+        "rev": "b1f9ff4ed5fe38973c5c16db7b8c1f6100c52a5e",
+        "revCount": 51,
+        "type": "git",
+        "url": "https://git.jacekpoz.pl/poz/nte"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jacekpoz.pl/poz/nte"
      }
    },
    "nur": {
@ -1699,7 +1744,7 @@
        "plugin-vim-vsnip": "plugin-vim-vsnip",
        "plugin-which-key": "plugin-which-key",
        "rnix-lsp": "rnix-lsp",
-        "systems": "systems_11",
+        "systems": "systems_13",
        "zig": "zig"
      },
      "locked": {
@ -3322,20 +3367,20 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nte": "nte"
+        "nte": "nte_2"
      },
      "locked": {
-        "lastModified": 1721584427,
-        "narHash": "sha256-D1bPqvyEjxXNP5xltvIQJsXnidKKSZA4V95bB5hTjBo=",
+        "lastModified": 1726270855,
+        "narHash": "sha256-4rP2vC7tgQLoBzRw35VZG6qNOKL9eSP4s5t4SQYhO3k=",
        "ref": "refs/heads/master",
-        "rev": "b0457bcee8ba6d22c890ac43b86480fc39d8199c",
-        "revCount": 295,
+        "rev": "5de178ba2bb71cc8843771a7e8300d068a6b9d81",
+        "revCount": 307,
        "type": "git",
-        "url": "ssh://jacekpoz/jacekpoz/pozsite.git"
+        "url": "ssh://jacekpoz/poz/pozsite.git"
      },
      "original": {
        "type": "git",
-        "url": "ssh://jacekpoz/jacekpoz/pozsite.git"
+        "url": "ssh://jacekpoz/poz/pozsite.git"
      }
    },
    "quickshell": {
@ -3394,6 +3439,7 @@
        "iio-hyprland": "iio-hyprland",
        "nh": "nh",
        "nix-minecraft": "nix-minecraft",
+        "nix-webring": "nix-webring",
        "nixpak": "nixpak",
        "nixpkgs": "nixpkgs_9",
        "nur": "nur",
@ -3506,7 +3552,7 @@
          "nixpkgs"
        ],
        "searx-randomizer": "searx-randomizer",
-        "systems": "systems_13"
+        "systems": "systems_16"
      },
      "locked": {
        "lastModified": 1725210690,
@ -3646,6 +3692,51 @@
      }
    },
    "systems_13": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_14": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_15": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_16": {
      "locked": {
        "lastModified": 1689347949,
        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -3660,7 +3751,7 @@
        "type": "github"
      }
    },
-    "systems_14": {
+    "systems_17": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
--- a/flake.nix
+++ b/flake.nix
@ -113,5 +113,10 @@
        nix-minecraft.url = "github:Infinidoge/nix-minecraft";

        work-secrets.url = "git+ssh://jacekpoz/work/work-secrets";
+
+        nix-webring = {
+            url = "git+https://git.jacekpoz.pl/poz/nixwebr.ing";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
    };
 }
--- a/hosts/chmura/configuration.nix
+++ b/hosts/chmura/configuration.nix
@ -10,11 +10,11 @@ in {

    services.caddy = let
        redirToFlake = ''
-            redir https://git.jacekpoz.pl/jacekpoz/niksos
+            redir https://git.jacekpoz.pl/poz/niksos
        '';

        redirToQmkFork = ''
-            redir https://git.jacekpoz.pl/jacekpoz/qmk_firmware/src/branch/master/keyboards/lily58/keymaps/poz
+            redir https://git.jacekpoz.pl/poz/qmk_firmware/src/branch/master/keyboards/lily58/keymaps/poz
        '';
    in {
        enable = true;
--- a/hosts/chmura/default.nix
+++ b/hosts/chmura/default.nix
@ -1,11 +1,11 @@
 _: {
    imports = [
-        ./nixwebr.ing
        ./services
        ./trollface.pl
        ./configuration.nix
        ./hardware-configuration.nix
        ./jacekpoz.pl.nix
+        ./nixwebr.ing.nix
        ./profile.nix
        ./programs.nix
        ./system.nix
--- a/hosts/chmura/nixwebr.ing.nix
+++ b/hosts/chmura/nixwebr.ing.nix
@ -0,0 +1,67 @@
+{
+    inputs,
+    lib,
+    pkgs,
+    ...
+}: let
+    inherit (lib.meta) getExe';
+
+    systemctl = getExe' pkgs.systemd "systemctl";
+
+    port = 5932;
+    sitePath = "/srv/web/nixwebr.ing";
+in {
+    services.caddy = {
+        enable = true;
+        virtualHosts = {
+            "nixwebr.ing".extraConfig = ''
+                reverse_proxy localhost:${toString port}
+            '';
+        };
+    };
+
+    users.groups.nixwebring = {};
+
+    users.users.nixwebring = {
+        isSystemUser = true;
+        group = "nixwebring";
+    };
+
+    systemd = {
+        services = {
+            nix-webring-server = {
+                description = "The backend for nixwebr.ing";
+                after = ["network.target"];
+                wantedBy = ["multi-user.target"];
+
+                serviceConfig = {
+                    Type = "simple";
+                    ExecStart = "${inputs.nix-webring.packages.${pkgs.system}.server}/bin/nix-webring-server";
+                    Restart = "on-failure";
+                    Environment = ''NIX_WEBRING_PORT="${toString port}" NIX_WEBRING_DIR="${sitePath}"'';
+                    User = "nixwebring";
+                    Group = "nixwebring";
+                };
+            };
+
+            nix-webring-server-watcher = {
+                description = "Restarter for the backend";
+                after = ["network.target"];
+                wantedBy = ["multi-user.target"];
+
+                serviceConfig = {
+                    Type = "oneshot";
+                    ExecStart = "${systemctl} restart nix-webring-server.service";
+                };
+            };
+        };
+        paths.nix-webring-server-watcher = {
+            wantedBy = ["multi-user.target"];
+
+            pathConfig = {
+                PathModified = sitePath;
+                Unit = "nix-webring-server-watcher.service";
+            };
+        };
+    };
+}
--- a/hosts/chmura/nixwebr.ing/default.nix
+++ b/hosts/chmura/nixwebr.ing/default.nix
@ -1,9 +0,0 @@
-_: {
-    services.caddy = {
-        enable = true;
-        virtualHosts."nixwebr.ing".extraConfig = ''
-            root * ${./.}
-            file_server
-        '';
-    };
-}
--- a/hosts/chmura/nixwebr.ing/index.html
+++ b/hosts/chmura/nixwebr.ing/index.html
@ -1,10 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>nix webring</title>
-  </head>
-  <body>
-    <p>work in progress</p>
-  </body>
-</html>
--- a/hosts/common/optional/steam.nix
+++ b/hosts/common/optional/steam.nix
@ -1,3 +1,19 @@
-_: {
+{
+    config,
+    lib,
+    pkgs,
+    ...
+}: let
+    inherit (config.poz.other.system) username;
+
+    inherit (lib.attrsets) attrValues;
+in {
    programs.steam.enable = true;
+
+    home-manager.users.${username} = {
+        home.packages = attrValues {
+            inherit (pkgs.steamPackages) steamcmd;
+            inherit (pkgs) steam-tui;
+        };
+    };
 }
--- a/hosts/del/programs.nix
+++ b/hosts/del/programs.nix
@ -112,6 +112,7 @@ in {
                delta
                scrcpy
                godot_4
+                libnotify
            ;
            inherit (pkgs.libsForQt5)
                kdenlive
--- a/hosts/hape/programs.nix
+++ b/hosts/hape/programs.nix
@ -69,6 +69,7 @@ in {
                lshw
                tree
                exiv2
+                libnotify
            ;
            inherit (config.boot.kernelPackages)
                cpupower
--- a/hosts/niks/programs.nix
+++ b/hosts/niks/programs.nix
@ -104,6 +104,7 @@ in {
                delta
                scrcpy
                godot_4
+                libnotify
            ;
            inherit (pkgs.libsForQt5)
                kdenlive
--- a/hosts/work/programs.nix
+++ b/hosts/work/programs.nix
@ -90,6 +90,7 @@ in {
                openconnect
                vpn-slice
                sshfs
+                libnotify
            ;
            inherit (config.boot.kernelPackages)
                cpupower
Author	SHA1	Message	Date
jacekpoz	190aa4727b	update all references from jacekpoz to poz on forgejo instance	2024-09-15 18:48:50 +02:00
jacekpoz	942b83b00f	udpate nix webring	2024-09-14 23:08:55 +02:00
jacekpoz	495f8f5cf3	add steamcmd and steam-tui to steam config	2024-09-14 19:55:09 +02:00
jacekpoz	5cc3cb08a4	add libnotify to env on all laptops	2024-09-14 18:10:35 +02:00
jacekpoz	a984ef5258	update nixpkgs	2024-09-14 14:09:40 +02:00
jacekpoz	1fb9097717	update pozsite	2024-09-14 11:37:47 +02:00
jacekpoz	e5bab6a044	update pozsite	2024-09-14 01:41:41 +02:00
jacekpoz	c9ccf02f1c	update nix webring	2024-09-13 22:07:53 +02:00
jacekpoz	611a33fa0b	actually init nix webring	2024-09-13 20:18:47 +02:00
jacekpoz	d93eed2cac	dark theme on nixwebr.ing	2024-09-13 00:17:01 +02:00