commit 06c00eed6862b582e5297bad378e6bdbda95c620 · soopy.moe/gensokyo

+10 -3

flake.nix

···

       14
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       15
        
           };

     

       16
        
       

     

       17
       -
           attic.url = "github:zhaofengli/attic";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
         };

     

       19
        
       

     

       20
       -
         outputs = { nixpkgs, home-manager, lanzaboote, attic, ... }:

     

       21
        
         let

     

       22
        
           pkgs = import nixpkgs {};

     

       23
        
           lib = nixpkgs.lib;

     
···

       29
        
               # see docs/tips_n_tricks.md#extra_opts for syntax

     

       30
        
               # see docs/utils.md for functions

     

       31
        
               specialArgs = {

     

       32
       -
                 # inherit mystia;

     

       33
        
                 _utils = (import ./global/utils.nix) { inherit pkgs; };

     

       34
        
               };

     

       35

···

       14
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       15
        
           };

     

       16
        
       

     

       17
       +
           attic = {

     

       18
       +
             url = "github:zhaofengli/attic";

     

       19
       +
             inputs.nixpkgs.follows = "nixpkgs";

     

       20
       +
           };

     

       21
       +
           mystia = {

     

       22
       +
             url = "github:soopyc/mystia";

     

       23
       +
             inputs.nixpkgs.follows = "nixpkgs";

     

       24
       +
           };

     

       25
        
         };

     

       26
        
       

     

       27
       +
         outputs = { nixpkgs, home-manager, lanzaboote, attic, mystia, ... }@inputs:

     

       28
        
         let

     

       29
        
           pkgs = import nixpkgs {};

     

       30
        
           lib = nixpkgs.lib;

     
···

       36
        
               # see docs/tips_n_tricks.md#extra_opts for syntax

     

       37
        
               # see docs/utils.md for functions

     

       38
        
               specialArgs = {

     

       39
       +
                 inherit inputs;

     

       40
        
                 _utils = (import ./global/utils.nix) { inherit pkgs; };

     

       41
        
               };

     

       42

+1 -4

overlays/default.nix

···

       1
       -
       [

     

       2
       -
         (import ./nim)

     

       3
       -
         (import ./nitter)

     

       4
       -
       ]

-6

overlays/nim/default.nix

···

       1
       -
       final: prev: {

     

       2
       -
         nimPackages = prev.nimPackages // {

     

       3
       -
           sha1 = prev.callPackage ./sha1.nix {};

     

       4
       -
           oauth = final.callPackage ./oauth.nix {};

     

       5
       -
         };

     

       6
       -
       }

-26

overlays/nim/oauth.nix

···

       1
       -
       # copied and adapted from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/development/nim-packages/jsony/default.nix

     

       2
       -
       { lib, pkgs, nimPackages, fetchFromGitHub }:

     

       3
       -
       

     

       4
       -
       nimPackages.buildNimPackage rec {

     

       5
       -
         pname = "oauth";

     

       6
       -
         version = "b8c163b0d9cfad6d29ce8c1fb394e5f47182ee1c";

     

       7
       -
       

     

       8
       -
         src = fetchFromGitHub {

     

       9
       -
           owner = "CORDEA";

     

       10
       -
           repo = pname;

     

       11
       -
           rev = version;

     

       12
       -
           sha256 = "0k5slyzjngbdr6g0b0dykhqmaf8r8n2klbkg2gpid4ckm8hg62v5";

     

       13
       -
         };

     

       14
       -
       

     

       15
       -
         propagatedBuildInputs = with nimPackages; [

     

       16
       -
           sha1

     

       17
       -
         ];

     

       18
       -
       

     

       19
       -
         meta = {

     

       20
       -
           homepage = src.meta.homepage;

     

       21
       -
           downloadPage = src.url;

     

       22
       -
           description = "OAuth library for nim";

     

       23
       -
           license = lib.licenses.asl20;

     

       24
       -
           maintainers = [ ];

     

       25
       -
         };

     

       26
       -
       }

-22

overlays/nim/sha1.nix

···

       1
       -
       # copied and adapted from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/development/nim-packages/jsony/default.nix

     

       2
       -
       { lib, nimPackages, fetchFromGitHub }:

     

       3
       -
       

     

       4
       -
       nimPackages.buildNimPackage rec {

     

       5
       -
         pname = "sha1";

     

       6
       -
         version = "92ccc5800bb0ac4865b275a2ce3c1544e98b48bc";

     

       7
       -
       

     

       8
       -
         src = fetchFromGitHub {

     

       9
       -
           owner = "onionhammer";

     

       10
       -
           repo = pname;

     

       11
       -
           rev = version;

     

       12
       -
           sha256 = "sha256-tWHouIa6AFRmbvJaMsoWKNZX7bzqd3Je1kJ4rVHb+wM=";

     

       13
       -
         };

     

       14
       -
       

     

       15
       -
         meta = {

     

       16
       -
           homepage = src.meta.homepage;

     

       17
       -
           downloadPage = src.url;

     

       18
       -
           description = "SHA-1 hashing library for Nim";

     

       19
       -
           license = lib.licenses.mit;  # the author did something to it so i'm not exactly sure, but the previous ver. is mit.

     

       20
       -
           maintainers = [ ];

     

       21
       -
         };

     

       22
       -
       }

-4

overlays/nitter/default.nix

···

       1
       -
       self: super:

     

       2
       -
       {

     

       3
       -
         nitter = super.callPackage ./nitter.nix {};

     

       4
       -
       }

-17

overlays/nitter/nitter-version.patch

···

       1
       -
       diff --git a/src/views/about.nim b/src/views/about.nim

     

       2
       -
       index e7e8de9..54a6050 100644

     

       3
       -
       --- a/src/views/about.nim

     

       4
       -
       +++ b/src/views/about.nim

     

       5
       -
       @@ -3,10 +3,8 @@ import os, strformat

     

       6
       -
        import karax/[karaxdsl, vdom]

     

       7
       -
       

     

       8
       -
        const

     

       9
       -
       -  date = staticExec("git show -s --format=\"%cd\" --date=format:\"%Y.%m.%d\"")

     

       10
       -
       -  hash = staticExec("git show -s --format=\"%h\"")

     

       11
       -
       -  link = "https://github.com/zedeus/nitter/commit/" & hash

     

       12
       -
       -  version = &"{date}-{hash}"

     

       13
       -
       +  link = "@url@"

     

       14
       -
       +  version = "@version@-@rev@"

     

       15
       -
       

     

       16
       -
        var aboutHtml: string

     

       17
       -

-71

overlays/nitter/nitter.nix

···

       1
       -
       # via https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/servers/nitter/default.nix

     

       2
       -
       

     

       3
       -
       { lib

     

       4
       -
       , fetchFromGitHub

     

       5
       -
       , nimPackages

     

       6
       -
       , nixosTests

     

       7
       -
       , substituteAll

     

       8
       -
       , unstableGitUpdater

     

       9
       -
       }:

     

       10
       -
       

     

       11
       -
       nimPackages.buildNimPackage rec {

     

       12
       -
         pname = "nitter";

     

       13
       -
         version = "unstable-2023-08-26+guest_accounts";

     

       14
       -
       

     

       15
       -
         src = fetchFromGitHub {

     

       16
       -
           owner = "zedeus";

     

       17
       -
           repo = "nitter";

     

       18
       -
           rev = "7630f57f17246ffb60d4f5472d17af5fc3c6fa9f";

     

       19
       -
           hash = "sha256-eBD77Yf12Geatld+RMieQHLnGxHkvllQCWnPo36yY2o=";

     

       20
       -
         };

     

       21
       -
       

     

       22
       -
         patches = [

     

       23
       -
           (substituteAll {

     

       24
       -
             src = ./nitter-version.patch;

     

       25
       -
             inherit version;

     

       26
       -
             inherit (src) rev;

     

       27
       -
             url = builtins.replaceStrings [ "archive" ".tar.gz" ] [ "commit" "" ] src.url;

     

       28
       -
           })

     

       29
       -
         ];

     

       30
       -
       

     

       31
       -
         buildInputs = with nimPackages; [

     

       32
       -
           flatty

     

       33
       -
           jester

     

       34
       -
           jsony

     

       35
       -
           karax

     

       36
       -
           markdown

     

       37
       -
           nimcrypto

     

       38
       -
           oauth

     

       39
       -
           packedjson

     

       40
       -
           redis

     

       41
       -
           redpool

     

       42
       -
           sass

     

       43
       -
           supersnappy

     

       44
       -
           zippy

     

       45
       -
         ];

     

       46
       -
       

     

       47
       -
         nimBinOnly = true;

     

       48
       -
       

     

       49
       -
         postBuild = ''

     

       50
       -
           nim c --hint[Processing]:off -r tools/gencss

     

       51
       -
           nim c --hint[Processing]:off -r tools/rendermd

     

       52
       -
         '';

     

       53
       -
       

     

       54
       -
         postInstall = ''

     

       55
       -
           mkdir -p $out/share/nitter

     

       56
       -
           cp -r public $out/share/nitter/public

     

       57
       -
         '';

     

       58
       -
       

     

       59
       -
         passthru = {

     

       60
       -
           tests = { inherit (nixosTests) nitter; };

     

       61
       -
           updateScript = unstableGitUpdater {};

     

       62
       -
         };

     

       63
       -
       

     

       64
       -
         meta = with lib; {

     

       65
       -
           homepage = "https://github.com/zedeus/nitter";

     

       66
       -
           description = "Alternative Twitter front-end";

     

       67
       -
           license = licenses.agpl3Only;

     

       68
       -
           maintainers = with maintainers; [ erdnaxe infinidoge ];

     

       69
       -
           mainProgram = "nitter";

     

       70
       -
         };

     

       71
       -
       }

+5 -2

systems/koumakan/configuration.nix

···

       2
        
       # your system.  Help is available in the configuration.nix(5) man page

     

       3
        
       # and in the NixOS manual (accessible by running `nixos-help`).

     

       4
        
       

     

       5
       -
       { ... }:

     

       6
        
       

     

       7
        
       {

     

       8
        
         imports = [ # Include the results of the hardware scan.

     
···

       17
        
             ./services

     

       18
        
         ];

     

       19
        
       

     

       20
       -
         nixpkgs.overlays = import ../../overlays;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
        
         boot.loader.efi = {

     

       23
        
           canTouchEfiVariables = true;

···

       2
        
       # your system.  Help is available in the configuration.nix(5) man page

     

       3
        
       # and in the NixOS manual (accessible by running `nixos-help`).

     

       4
        
       

     

       5
       +
       { inputs, ... }:

     

       6
        
       

     

       7
        
       {

     

       8
        
         imports = [ # Include the results of the hardware scan.

     
···

       17
        
             ./services

     

       18
        
         ];

     

       19
        
       

     

       20
       +
         nixpkgs.overlays = import ../../overlays ++ (with inputs; [

     

       21
       +
           mystia.overlays.default

     

       22
       +
           attic.overlays.default

     

       23
       +
         ]);

     

       24
        
       

     

       25
        
         boot.loader.efi = {

     

       26
        
           canTouchEfiVariables = true;

+2 -1

systems/koumakan/services/proxies/nitter.nix

···

       1
       -
       { _utils, ... }:

     

       2
        
       

     

       3
        
       {

     

       4
        
         services.nitter = {

     
···

       11
        
             hostname = "nitter.soopy.moe";

     

       12
        
             address = "127.0.0.1";

     

       13
        
           };

     

       0
        
       
     

       14
        
         };

     

       15
        
       

     

       16
        
         systemd.services.nitter = {

···

       1
       +
       { _utils, pkgs, ... }:

     

       2
        
       

     

       3
        
       {

     

       4
        
         services.nitter = {

     
···

       11
        
             hostname = "nitter.soopy.moe";

     

       12
        
             address = "127.0.0.1";

     

       13
        
           };

     

       14
       +
           package = pkgs.nitterExperimental;

     

       15
        
         };

     

       16
        
       

     

       17
        
         systemd.services.nitter = {