install android-tools for Tytonidae

add miniflux server for Cape
update flake inputs
2025-03-04 16:32:45 +08:00 · 2025-03-04 16:32:43 +08:00 · 2025-03-04 16:32:41 +08:00 · 2025-03-04 16:32:39 +08:00 · 2025-03-04 16:32:36 +08:00 · 2025-03-04 16:32:34 +08:00
17 changed files with 344 additions and 794 deletions
--- a/.justfile
+++ b/.justfile
@ -24,9 +24,6 @@ deploy host:
 clean keepSince=DEFAULT_KEEP_SINCE:
    nh clean all --verbose -K {{ keepSince }} -k 5

-health:
-    nix --accept-flake-config run github:juspay/nix-health
-
 switchHome host=DEFAULT_HOST $USER=DEFAULT_USER:
    @echo USER: $USER
    @echo HOST: {{ host }}
@ -41,7 +38,6 @@ alias s := switch
 alias u := update
 alias d := deploy
 alias c := clean
-alias h := health
 alias b := build
 alias H := switchHome
 alias B := buildHome
--- a/README.md
+++ b/README.md
@ -16,14 +16,15 @@ Hey, you. This is my nixos configurations.

 | Specialisation | DE / WM   | Shell       | Editor | Termianal | Launcher        | Browser | DM             |
 | -------------- | --------- | ----------- | ------ | --------- | --------------- | ------- | -------------- |
-| default        | cosmic de | fish + bash | helix  | ghostty   | cosmic-launcher | firefox | cosmic-greeter |
-| niri           | niri      | fish + bash | helix  | ghostty   | fuzzel          | firefox | gdm            |
+| default        | niri      | fish + bash | helix  | ghostty   | fuzzel          | firefox | gdm            |
+| cosmic         | cosmic de | fish + bash | helix  | ghostty   | cosmic-launcher | firefox | cosmic-greeter |
+| kde            | kde       | fish + bash | helix  | ghostty   | -               | firefox | sddm           |

 - david@Akun

-| Specialisation | DE / WM | Shell       | Editor | Termianal | Launcher | Browser | DM   |
-| -------------- | ------- | ----------- | ------ | --------- | -------- | ------- | ---- |
-| default        | kde     | fish + bash | helix  | ghostty   | -        | firefox | sddm |
+| Specialisation | DE / WM | Shell       | Editor | Termianal | Launcher | Browser | DM             |
+| -------------- | ------- | ----------- | ------ | --------- | -------- | ------- | -------------- |
+| default        | cosmic  | fish + bash | helix  | ghostty   | -        | firefox | cosmic-greeter |

 - alice@Cape

@ -41,6 +42,7 @@ Hey, you. This is my nixos configurations.
 | `nixosModules.default`                    | nixos modules shared on different nixos machines                            | ./nixos/modules                          |
 | `nixosConfigurations.${machine}`          | machine-local nixos config                                                  | ./nixos/configurations/${machine}        |
 | `homeManagerModules.default`              | home-manager modules shared between different user and machine combinations | ./home/modules                           |
+| `homeManagerModules.extra`                | home-manager modules only for non-nixos                                     | ./home/extra                             |
 | `homeManagerModules.${user}`              | home-manager modules shared between different users                         | ./home/${user}/modules                   |
 | `homeConfigurations."${user}@${machine}"` | home-manager config for different user and machine combinations             | ./home/${user}/configurations/${machine} |
 | `deploy.nodes.${machine}.system`          | deploy-rs profile for deploying `nixosConfiguration.${machine}` remotely    | -                                        |
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@ -7,7 +7,10 @@

    lix-module = {
      url = "git+https://git.lix.systems/lix-project/nixos-module";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
    };

    helix = {
@ -15,14 +18,19 @@
      owner = "helix-editor";
      repo = "helix";
      ref = "master";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
    };

    home-manager = {
      type = "github";
      owner = "nix-community";
      repo = "home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
    };

    oskars-dotfiles = {
@ -30,14 +38,16 @@
      owner = "oskardotglobal";
      repo = ".dotfiles";
      ref = "nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      flake = false;
    };

    niri-flake = {
      type = "github";
      owner = "sodiboo";
      repo = "niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
    };

    nixos-cosmic = {
@ -50,7 +60,10 @@
      type = "github";
      owner = "ghostty-org";
      repo = "ghostty";
-      inputs.nixpkgs-unstable.follows = "nixpkgs";
+      inputs = {
+        nixpkgs-unstable.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
    };

    nixos-hardware = {
@ -64,7 +77,10 @@
      type = "github";
      owner = "daeuniverse";
      repo = "flake.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-parts.follows = "flake-parts";
+      };
    };

    flake-parts = {
@ -99,21 +115,29 @@
      type = "github";
      owner = "Mic92";
      repo = "sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
    };

    stylix = {
      type = "github";
      owner = "danth";
      repo = "stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+        home-manager.follows = "home-manager";
+      };
    };

    disko = {
      type = "github";
      owner = "nix-community";
      repo = "disko";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
    };

    bt-tracker = {
@ -127,7 +151,10 @@
      type = "github";
      owner = "serokell";
      repo = "deploy-rs";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        utils.follows = "flake-utils";
+      };
    };
  };
  outputs =
@ -311,7 +338,7 @@
                  interactiveSudo = true;
                  profiles = {
                    system = {
-                      user = "${unixName}";
+                      user = "root";
                      path =
                        inputs.deploy-rs.lib."${system}".activate.nixos
                          self.outputs.nixosConfigurations."${hostName}";
@ -331,6 +358,7 @@
                )
                [
                  "Cape"
+                  "Akun"
                ]
            );
          }
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/home/david/configurations/Tytonidae/default.nix
@ -80,5 +80,6 @@
    fd
    viu
    just
+    android-tools
  ];
 }
--- a/home/david/configurations/Tytonidae/niri/config.kdl
+++ b/home/david/configurations/Tytonidae/niri/config.kdl
@ -161,6 +161,7 @@ window-rule {
    }
    border {
        inactive-color "#7d0d2d"
+        active-color "#f38ba8"
    }
    tab-indicator {
        active-color "#f38ba8"
--- a/nixos/configurations/Akun/default.nix
+++ b/nixos/configurations/Akun/default.nix
@ -22,7 +22,7 @@
      kanata.enable = true;
      tailscale.enable = true;
    };
-    gui.enabled = "kde";
+    gui.enabled = "cosmic";
  };
  programs.gnupg.agent = {
    enable = true;
--- a/nixos/configurations/Cape/default.nix
+++ b/nixos/configurations/Cape/default.nix
@ -10,6 +10,7 @@
    ./hardware-configuration.nix
    ./users
    ./disko-config.nix
+    ./miniflux.nix
  ];

  youthlic = {
--- a/nixos/configurations/Cape/miniflux.nix
+++ b/nixos/configurations/Cape/miniflux.nix
@ -0,0 +1,17 @@
+{ config, ... }:
+{
+  sops.secrets."miniflux" = {
+  };
+  youthlic.containers.miniflux = {
+    enable = true;
+    interface = "ens3";
+    adminCredentialsFile = config.sops.secrets."miniflux".path;
+  };
+  services.caddy.virtualHosts = {
+    "miniflux.${config.youthlic.programs.caddy.baseDomain}" = {
+      extraConfig = ''
+        reverse_proxy 10.231.137.102:8485
+      '';
+    };
+  };
+}
--- a/nixos/configurations/Tytonidae/default.nix
+++ b/nixos/configurations/Tytonidae/default.nix
@ -85,6 +85,12 @@
    nvtopPackages.full
    spotify
    localsend
+    jq
+    onefetch
+    vesktop
+    gg
+    aria2
+    fractal

    juicity
  ];
--- a/nixos/modules/containers/default.nix
+++ b/nixos/modules/containers/default.nix
@ -2,5 +2,6 @@
 {
  imports = [
    ./forgejo.nix
+    ./miniflux.nix
  ];
 }
--- a/nixos/modules/containers/miniflux.nix
+++ b/nixos/modules/containers/miniflux.nix
@ -0,0 +1,107 @@
+{ config, lib, ... }:
+let
+  cfg = config.youthlic.containers.miniflux;
+in
+{
+  options = {
+    youthlic.containers.miniflux = {
+      enable = lib.mkEnableOption "miniflux container";
+      adminCredentialsFile = lib.mkOption {
+        type = lib.types.nonEmptyStr;
+      };
+      interface = lib.mkOption {
+        type = lib.types.nonEmptyStr;
+        example = "ens3";
+      };
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    networking.nat = {
+      enable = true;
+      internalInterfaces = [ "ve-+" ];
+      externalInterface = cfg.interface;
+      enableIPv6 = true;
+    };
+    containers."miniflux" = {
+      ephemeral = true;
+      autoStart = true;
+      privateNetwork = true;
+      hostAddress = "10.231.137.1";
+      localAddress = "10.231.137.102";
+      bindMounts = {
+        "/var/lib/miniflux" = {
+          hostPath = "/mnt/containers/miniflux/state";
+          isReadOnly = false;
+        };
+        "/var/lib/postgresql" = {
+          hostPath = "/mnt/containers/miniflux/database";
+          isReadOnly = false;
+        };
+        "${cfg.adminCredentialsFile}" = {
+          isReadOnly = true;
+        };
+      };
+      forwardPorts = [
+        {
+          containerPort = 8485;
+          hostPort = 8485;
+          protocol = "tcp";
+        }
+        {
+          containerPort = 8485;
+          hostPort = 8485;
+          protocol = "udp";
+        }
+      ];
+
+      config =
+        { lib, ... }:
+        {
+          imports = [
+            ./../programs/miniflux.nix
+            ./../programs/postgresql.nix
+          ];
+
+          systemd.tmpfiles.rules = [
+            "d /var/lib/miniflux 770 miniflux miniflux -"
+            "d /var/lib/postgresql 770 postgres postgres -"
+            "d /run/secrets 770 root miniflux -"
+          ];
+
+          youthlic.programs = {
+            miniflux = {
+              enable = true;
+              database = {
+                user = "miniflux";
+              };
+              adminCredentialsFile = cfg.adminCredentialsFile;
+            };
+            postgresql = {
+              enable = true;
+              database = "miniflux";
+              auth_method = "peer";
+              version = "17";
+            };
+          };
+
+          systemd.services.miniflux = {
+            wants = [ "postgresql.service" ];
+            requires = [ "postgresql.service" ];
+            after = [ "postgresql.service" ];
+            wantedBy = [ "default.target" ];
+          };
+
+          networking = {
+            firewall = {
+              enable = true;
+              allowedTCPPorts = [ 8485 ];
+              allowedUDPPorts = [ 8485 ];
+            };
+            useHostResolvConf = lib.mkForce false;
+          };
+          services.resolved.enable = true;
+          system.stateVersion = "24.11";
+        };
+    };
+  };
+}
--- a/nixos/modules/programs/default.nix
+++ b/nixos/modules/programs/default.nix
@ -19,5 +19,6 @@
    ./conduwuit.nix
    ./nix-ld.nix
    ./juicity
+    ./miniflux.nix
  ];
 }
--- a/nixos/modules/programs/miniflux.nix
+++ b/nixos/modules/programs/miniflux.nix
@ -0,0 +1,48 @@
+{ lib, config, ... }:
+let
+  cfg = config.youthlic.programs.miniflux;
+in
+{
+  options = {
+    youthlic.programs.miniflux = {
+      enable = lib.mkEnableOption "miniflux";
+      adminCredentialsFile = lib.mkOption {
+        type = lib.types.path;
+      };
+      database = {
+        user = lib.mkOption {
+          type = lib.types.nonEmptyStr;
+          example = "miniflux";
+        };
+        socket = lib.mkOption {
+          type = lib.types.nonEmptyStr;
+          default = "/run/postgresql";
+        };
+      };
+    };
+  };
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      services.miniflux = {
+        enable = true;
+        config = {
+          LISTEN_ADDR = "0.0.0.0:8485";
+          DATABASE_URL = "user=${cfg.database.user} host=${cfg.database.socket} dbname=miniflux";
+          CREATE_ADMIN = 1;
+          WATCHDOG = 1;
+        };
+        createDatabaseLocally = false;
+        adminCredentialsFile = cfg.adminCredentialsFile;
+      };
+    })
+    (lib.mkIf (cfg.enable && config.youthlic.programs.caddy.enable) {
+      services.caddy.virtualHosts = {
+        "miniflux.${config.youthlic.programs.caddy.baseDomain}" = {
+          extraConfig = ''
+            reverse_proxy 127.0.0.1:8485
+          '';
+        };
+      };
+    })
+  ];
+}
--- a/nixpkgs.nix
+++ b/nixpkgs.nix
@ -1,7 +0,0 @@
-let
-  lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
-in
-import (fetchTarball {
-  url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
-  sha256 = lock.narHash;
-})
--- a/overlays/modifications/spotify.nix
+++ b/overlays/modifications/spotify.nix
@ -1 +1 @@
-{ inputs, ... }: inputs.oskars-dotfiles.overlays.spotx
+{ inputs, ... }: import "${inputs.oskars-dotfiles}/overlays/spotx.nix"
--- a/secrets/general.yaml
+++ b/secrets/general.yaml
@ -1,6 +1,7 @@
 rustypaste:
    auth: ENC[AES256_GCM,data:DORM12zY0wQQxqBNFYG3oYodhevUJXNjdqJcnyOnuPnZQIsUdEtm4TyNHokUKYoc30s8c6INOFoAB+7210y0dQE3hfg=,iv:Kms90lNPaL5fvQjD31+DZGJf+YQU/tTGLTxrqkvsbDY=,tag:5voNZlwGf2adVQoVqgyRqA==,type:str]
    delete: ENC[AES256_GCM,data:fbhJiJhh4YSMZQ6/dfquesJE0sNSn2PUkbjtJmisj5qHtsM=,iv:M1R7giNyLhbj98iiCPENQy44Ixqnie1PHlNcsVs5TLs=,tag:zdBbZ4NR7D4HxsxCizTliw==,type:str]
+miniflux: ENC[AES256_GCM,data:8u9ElF2LAsIZmq7U8oZJM367y6EAy0si4ZXhpdisYa/PjV70SybUWhrahBft86QB71l8KtLUVuF3Ins=,iv:q7vJzxZICGNv/IaHKDpV50Pc9P4rIwcvfz2+uS1AnyI=,tag:ycwVU3RqfBoXRZQMv653xQ==,type:str]
 atuin-key: ENC[AES256_GCM,data:e3K7/7BaeXuR+vHJdtO79UQp3XRvROcD8ISkuCp3KGCSlBKUM3GuCwhIeFoIl0fOUqVYOzcCAcjsH2nBRqcXhtS8jhM=,iv:Mh3jsu6mdj0VOLSIoNz/0awyydVf7q3/E7iB7CJi+UA=,tag:xuHhUmK/J2stdjRrtbhQSw==,type:str]
 access-tokens: ENC[AES256_GCM,data:TBg9y2xdVmLNQV3JzGRSbYSrqtYQxakWNPF+OBShqCP6Z/M9H8of6zbgevOudfAPXUbcDv55tBo58U/Z2VIMJysYuUDbbmO9WoqEB2AQNjFgbxBbSwGOEVz8fwKItj01f15r3gAfQVQl0T8Vaf5+VIVXpzG1h7O7,iv:IQw7ddpTuj5vzT6MEvqUiHEsd/Sekl8wVe+A8uibsEw=,tag:I4oyeM1j2LJ++5omk4Ao2A==,type:str]
 matrix-telegram-bot: ENC[AES256_GCM,data:4G9JSR4l3043SM63gvJr0xBFuS11eoesi9rrobTxN9HpEGNklYDWHH/+Bm7P/2Bxnye3CiO/Z8KffvbjH8slRHLtbSpo8lRsfi9uRAbeMl7aXe/nTjpN078QSN3WXXc9XqYq0sxwNKPrnW3bmPQsHUiykZ3Go5A9Qw1iIPvPpXITyNbeD0gA+2CBB7PIURI7X0PIgSfUtMFZvl2J9znqCnlfC41bj6aC3sywsEkpuFJiMEojrwl+XmVS/u4eNMq8KiofVn9QlGx5gdGZ9LfZZdc+8E6u5GovqP2JTwwfaeZPzdwdZ2YsdoAvmgAusMfjCNZvHF7msLsOyNJW4592ZC7+fHhRbkKnVKc3OwA4ILWd9Jl0p0BoS0Ckn3V5nUQFgxVJ2O0yd/FLFaEqbeBLHNqC6u9CTYk82Uy23ilXQYKIc9h2wQkM329E6j9Mk0f9uavoYVPkpz6ahLzcni2W26FUkeaZ7PkrHmHWfJvvvi32GB4+q1m0phPmcd3cKVhXhbhLXiBcx2Rj7Q==,iv:Br0w0SiYajFr8p5CZEg47x3KpJ+AOleHthsEc3ho4YI=,tag:k+wptcSnNzfefF66Ug824Q==,type:str]
@ -54,8 +55,8 @@ sops:
            a1Y1NU9CK2h1SS83VW42bzBMa01yMXMKI1DBtgNlkNCrxUQvnD6a45mQKNfg5gM4
            Zb5buo9Jofj4dn/HFwng3T3gxKTrP2Dh74CAH4L0M5yrF9fzk5TCcQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-02-25T05:46:18Z"
-    mac: ENC[AES256_GCM,data:QjSjc0QPNxOkKAIjLPdg5G/QQc+lcGbIhDHp4vWXLUrTrH9YRXVRSp6+qn8VJRAUuDz21A4VBLTq4Ar6CBxC8wlaoNLeYxXuY26rvajfSXTjY8Reg6j7hsbYnW26/zlrO3VwSQdTcxB+rJYr9pKSVwJvq+Q0gucw7qj1vGigui8=,iv:CEC2T6f9RsPJAbvAhxLpiF4SryhUvEJPVmOWZPBRl10=,tag:EgBhg7EU087pEvWdDGKF5w==,type:str]
+    lastmodified: "2025-03-04T06:22:13Z"
+    mac: ENC[AES256_GCM,data:nQ3ZmOL0MOxL3/dEY0TGsI0003O/ZNjqilSojikn0oN2OyR2chYcpbRDKpPtoZwoJ+QfMH+etnxt9lo+tPKr+hF8a4rQeWK4oErZTAemPoGPPsYgf9TLqjjQ7pUQI/wzLX0OaBJSbITNBiC4I1wUtA3NPyRPhGYNA0st7Mz2fP0=,iv:SkYgbhWrlyQAZer5ZeLExwMdOmnxRQ3mwxsdLtA7DYI=,tag:NAPlZ7UYRT0XXRLSigHfWA==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.9.4
Author	SHA1	Message	Date
ulic-youthlic	c84f295940	install android-tools for Tytonidae	2025-03-04 16:32:45 +08:00
ulic-youthlic	73981037fc	add miniflux server for Cape	2025-03-04 16:32:43 +08:00
ulic-youthlic	1d3dd17d1c	update flake inputs	2025-03-04 16:32:41 +08:00
ulic-youthlic	325891b204	change color for activate windows' border in cast	2025-03-04 16:32:39 +08:00
ulic-youthlic	6d9e7c762e	modify readme	2025-03-04 16:32:36 +08:00
ulic-youthlic	9f9f35493a	remove health just recipe	2025-03-04 16:32:34 +08:00
ulic-youthlic	4075e0050d	modify inputs	2025-03-02 17:37:46 +08:00
ulic-youthlic	5ab7018cf4	add some software into Tytonidae	2025-03-02 17:37:43 +08:00
ulic-youthlic	ffac1753e2	change gui config of Akun	2025-03-02 17:37:40 +08:00
ulic-youthlic	5a63e13214	add deploy config for Akun	2025-03-02 17:37:37 +08:00