Compare commits
No commits in common. "094af3fd01a969b0bede35369fc284ee92f8f0cf" and "b47e0f937bc24c44a5a645f621ea82e17b3ce8f7" have entirely different histories.
094af3fd01
...
b47e0f937b
24 changed files with 231 additions and 269 deletions
267
flake.lock
generated
267
flake.lock
generated
|
@ -19,6 +19,41 @@
|
||||||
"url": "https://git.elnu.com/jichan.org/apis.git"
|
"url": "https://git.elnu.com/jichan.org/apis.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"devshell": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722113426,
|
||||||
|
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "devshell",
|
||||||
|
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "devshell",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1696426674,
|
||||||
|
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||||
|
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||||
|
"revCount": 57,
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
|
@ -27,11 +62,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741352980,
|
"lastModified": 1726153070,
|
||||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -63,11 +98,11 @@
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -76,6 +111,58 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"git-hooks": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": [
|
||||||
|
"nixvim",
|
||||||
|
"flake-compat"
|
||||||
|
],
|
||||||
|
"gitignore": "gitignore",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1726745158,
|
||||||
|
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "git-hooks.nix",
|
||||||
|
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "git-hooks.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"gitignore": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"git-hooks",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709087332,
|
||||||
|
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -83,11 +170,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742569620,
|
"lastModified": 1726985855,
|
||||||
"narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=",
|
"narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "8a68f18e96bcab13e4f97bece61e6602298a3141",
|
"rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -96,51 +183,46 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ixx": {
|
"home-manager_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
|
||||||
"nixvim",
|
|
||||||
"nuschtosSearch",
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixvim",
|
"nixvim",
|
||||||
"nuschtosSearch",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729958008,
|
"lastModified": 1726902823,
|
||||||
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
|
"narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
|
||||||
"owner": "NuschtOS",
|
"owner": "nix-community",
|
||||||
"repo": "ixx",
|
"repo": "home-manager",
|
||||||
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
|
"rev": "14929f7089268481d86b83ed31ffd88713dcd415",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NuschtOS",
|
"owner": "nix-community",
|
||||||
"ref": "v0.0.6",
|
"repo": "home-manager",
|
||||||
"repo": "ixx",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ji-chan": {
|
"nix-darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": [
|
||||||
"rust-overlay": "rust-overlay_2"
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743033002,
|
"lastModified": 1726742753,
|
||||||
"narHash": "sha256-84TdCsIgDFDpgE9mXT/k0nxhTc7TgEfdfRia+hj//ow=",
|
"narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
|
||||||
"ref": "refs/heads/main",
|
"owner": "lnl7",
|
||||||
"rev": "2e45f0205ae1d16a9b9b5b8417a262a558dc367f",
|
"repo": "nix-darwin",
|
||||||
"revCount": 146,
|
"rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
|
||||||
"type": "git",
|
"type": "github"
|
||||||
"url": "https://git.elnu.com/tegakituesday/ji-chan.git"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"owner": "lnl7",
|
||||||
"url": "https://git.elnu.com/tegakituesday/ji-chan.git"
|
"repo": "nix-darwin",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
|
@ -177,15 +259,15 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742669843,
|
"lastModified": 1726755586,
|
||||||
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
|
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
|
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
|
@ -193,64 +275,38 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736320768,
|
"lastModified": 1726755586,
|
||||||
"narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
|
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
|
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_5": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1742422364,
|
|
||||||
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1742456341,
|
|
||||||
"narHash": "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "7344a3b78128f7b1765dba89060b015fb75431a7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixvim": {
|
"nixvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"devshell": "devshell",
|
||||||
|
"flake-compat": "flake-compat",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"nixpkgs": "nixpkgs_6",
|
"git-hooks": "git-hooks",
|
||||||
"nuschtosSearch": "nuschtosSearch"
|
"home-manager": "home-manager_2",
|
||||||
|
"nix-darwin": "nix-darwin",
|
||||||
|
"nixpkgs": "nixpkgs_4",
|
||||||
|
"nuschtosSearch": "nuschtosSearch",
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742559284,
|
"lastModified": 1727031271,
|
||||||
"narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=",
|
"narHash": "sha256-OvekOLCj7kEq6X8Ncgyda1ud4BMD+OxHu7bdIsCtl/g=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "c980271267ef146a6c30394c611a97e077471cf2",
|
"rev": "b473bdc5ae1260296d0f43f8f1fba6248b1ee078",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -262,18 +318,17 @@
|
||||||
"nuschtosSearch": {
|
"nuschtosSearch": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"ixx": "ixx",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixvim",
|
"nixvim",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741886583,
|
"lastModified": 1726816132,
|
||||||
"narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
|
"narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
|
"rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -286,8 +341,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"apis": "apis",
|
"apis": "apis",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"ji-chan": "ji-chan",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nixpkgs": "nixpkgs_5",
|
|
||||||
"nixvim": "nixvim"
|
"nixvim": "nixvim"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -310,24 +364,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1742870002,
|
|
||||||
"narHash": "sha256-eQnw8ufyLmrboODU8RKVNh2Mv7SACzdoFrRUV5zdNNE=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "b4c18f262dbebecb855136c1ed8047b99a9c75b6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
|
@ -357,6 +393,27 @@
|
||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1726734507,
|
||||||
|
"narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixvim.url = "github:nix-community/nixvim";
|
nixvim.url = "github:nix-community/nixvim";
|
||||||
apis.url = "git+https://git.elnu.com/jichan.org/apis.git";
|
apis.url = "git+https://git.elnu.com/jichan.org/apis.git";
|
||||||
ji-chan.url = "git+https://git.elnu.com/tegakituesday/ji-chan.git";
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = github:nix-community/home-manager;
|
url = github:nix-community/home-manager;
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -16,15 +16,12 @@
|
||||||
protonmail-bridge
|
protonmail-bridge
|
||||||
|
|
||||||
# GNOME apps
|
# GNOME apps
|
||||||
cheese
|
gnome.cheese
|
||||||
file-roller
|
gnome.nautilus
|
||||||
gnome-calculator
|
gnome.file-roller
|
||||||
gnome-disk-utility
|
gnome.gnome-calculator
|
||||||
simple-scan
|
gnome.gnome-disk-utility
|
||||||
ghex
|
gnome.simple-scan
|
||||||
|
|
||||||
# KDE apps
|
|
||||||
kdePackages.dolphin
|
|
||||||
|
|
||||||
# Applications
|
# Applications
|
||||||
anki
|
anki
|
||||||
|
@ -37,6 +34,7 @@
|
||||||
qbittorrent
|
qbittorrent
|
||||||
pureref
|
pureref
|
||||||
libreoffice
|
libreoffice
|
||||||
|
gnome.ghex
|
||||||
evince
|
evince
|
||||||
pdfsam-basic
|
pdfsam-basic
|
||||||
steam
|
steam
|
||||||
|
|
|
@ -10,6 +10,5 @@
|
||||||
trash-cli # aliased to rm in .bashrc
|
trash-cli # aliased to rm in .bashrc
|
||||||
unzip
|
unzip
|
||||||
pipes
|
pipes
|
||||||
git-crypt
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,8 +24,13 @@
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
resolvconf.enable = true;
|
# networking.nameservers doesn't apply to resolvconf
|
||||||
# DNS servers managed by tailscale
|
#nameservers = [ "9.9.9.9" "1.1.1.1" ];
|
||||||
|
# resolvconf.extraConfig = "name_servers=\"9.9.9.9 1.1.1.1\"";
|
||||||
|
# Temporary since MagicDNS is broken
|
||||||
|
hosts = {
|
||||||
|
"192.168.1.168" = [ "elnuhub.local" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
|
|
|
@ -9,7 +9,6 @@ let
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
configImports = [
|
configImports = [
|
||||||
inputs.apis.nixosModules.default
|
inputs.apis.nixosModules.default
|
||||||
inputs.ji-chan.nixosModules.default
|
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
];
|
];
|
||||||
hmImports = [
|
hmImports = [
|
||||||
|
|
|
@ -9,11 +9,6 @@ in
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
xkb.options = "caps:escape";
|
xkb.options = "caps:escape";
|
||||||
windowManager.i3 = {
|
|
||||||
enable = true;
|
|
||||||
# Don't install dmenu, i3status, and i3lock
|
|
||||||
extraPackages = lib.mkOverride 0 [];
|
|
||||||
};
|
|
||||||
displayManager = {
|
displayManager = {
|
||||||
lightdm = {
|
lightdm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -23,10 +18,13 @@ in
|
||||||
};
|
};
|
||||||
background = theme.wallpaper;
|
background = theme.wallpaper;
|
||||||
};
|
};
|
||||||
|
defaultSession = "none+i3";
|
||||||
|
};
|
||||||
|
windowManager.i3 = {
|
||||||
|
enable = true;
|
||||||
|
# Don't install dmenu, i3status, and i3lock
|
||||||
|
extraPackages = lib.mkOverride 0 [];
|
||||||
};
|
};
|
||||||
};
|
|
||||||
displayManager = {
|
|
||||||
defaultSession = "none+i3";
|
|
||||||
};
|
};
|
||||||
udev.packages = [ pkgs.yubikey-personalization ];
|
udev.packages = [ pkgs.yubikey-personalization ];
|
||||||
pcscd.enable = true;
|
pcscd.enable = true;
|
||||||
|
@ -78,15 +76,15 @@ in
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultPackages = false;
|
enableDefaultPackages = false;
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk
|
||||||
noto-fonts
|
noto-fonts
|
||||||
nerd-fonts.fira-code # required for icons
|
(nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons
|
||||||
twitter-color-emoji
|
twitter-color-emoji
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.graphics = {
|
hardware.opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enable32Bit = true; # Required for Touhou, Steam
|
driSupport32Bit = true; # Required for Touhou, Steam
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
hardware.enableAllFirmware = true;
|
hardware.enableAllFirmware = true;
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
hardware.nvidia.open = true;
|
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
|
|
|
@ -1,33 +1,22 @@
|
||||||
{ lib, modulesPath, enableSSL, user, pkgs, ... }:
|
{ lib, user, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
|
imports = [
|
||||||
(modulesPath + "/virtualisation/digital-ocean-config.nix")
|
./hardware-configuration.nix
|
||||||
#./hardware-configuration.nix
|
|
||||||
# Remember to update for new instances
|
# Remember to update for new instances
|
||||||
#./networking.nix # generated at runtime by nixos-infect
|
./networking.nix # generated at runtime by nixos-infect
|
||||||
|
|
||||||
# root gets managed by digital-ocean-config for us
|
|
||||||
# but we want to override some things and let user login
|
|
||||||
./modules/ssh.nix
|
./modules/ssh.nix
|
||||||
#./modules/headscale.nix
|
./modules/headscale.nix
|
||||||
./modules/tailscale.nix
|
./modules/tailscale.nix
|
||||||
|
|
||||||
./hosts/git.elnu.com
|
./hosts/jichan.org
|
||||||
#./hosts/jichan.org
|
|
||||||
./hosts/tegakituesday.com
|
./hosts/tegakituesday.com
|
||||||
./hosts/atlantapaversinc.com
|
|
||||||
];
|
|
||||||
fileSystems."/mnt/data" = { device = "/dev/sda"; fsType = "ext4"; };
|
|
||||||
|
|
||||||
programs.git.enable = true;
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
hugo
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
# May cause some issues
|
# May cause some issues
|
||||||
#networkmanager.enable = lib.mkForce false;
|
networkmanager.enable = lib.mkForce false;
|
||||||
firewall = {
|
firewall = {
|
||||||
enable = true;
|
enable = true;
|
||||||
allowedTCPPorts = [ 80 443 ];
|
allowedTCPPorts = [ 80 443 ];
|
||||||
|
@ -41,15 +30,13 @@
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "forgejo"; # prevent 403 Forbidden error
|
|
||||||
virtualHosts."default" = {
|
virtualHosts."default" = {
|
||||||
default = true;
|
default = true;
|
||||||
rejectSSL = true;
|
|
||||||
serverName = null;
|
serverName = null;
|
||||||
# https://stackoverflow.com/a/42802777
|
# https://stackoverflow.com/a/42802777
|
||||||
locations."/".return = "444";
|
locations."/".return = "444";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#services.do-agent.enable = true;
|
services.do-agent.enable = true;
|
||||||
}
|
}
|
|
@ -6,5 +6,4 @@
|
||||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
|
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
|
||||||
boot.initrd.kernelModules = [ "nvme" ];
|
boot.initrd.kernelModules = [ "nvme" ];
|
||||||
fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
|
fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
|
||||||
fileSystems."/mnt/data" = { device = "/dev/sda"; fsType = "ext4" };
|
|
||||||
}
|
}
|
|
@ -1,18 +0,0 @@
|
||||||
{ config, pkgs, lib, enableSSL, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
host = "atlantapaversinc.com";
|
|
||||||
in {
|
|
||||||
services.nginx.virtualHosts."www.${host}" = {
|
|
||||||
forceSSL = enableSSL;
|
|
||||||
enableACME = enableSSL;
|
|
||||||
globalRedirect = host;
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."${host}" = {
|
|
||||||
forceSSL = enableSSL;
|
|
||||||
enableACME = enableSSL;
|
|
||||||
locations = {
|
|
||||||
"/".root = "/mnt/data/forgejo/sites/atlantapaversinc.com/public";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,41 +0,0 @@
|
||||||
{ config, pkgs, lib, enableSSL, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
host = "git.elnu.com";
|
|
||||||
port = 3000;
|
|
||||||
in {
|
|
||||||
services.forgejo = {
|
|
||||||
package = pkgs.forgejo; # Don't use LTS
|
|
||||||
enable = true;
|
|
||||||
stateDir = "/mnt/data/forgejo";
|
|
||||||
settings = {
|
|
||||||
server = {
|
|
||||||
HTTP_PORT = port;
|
|
||||||
DOMAIN = host;
|
|
||||||
SSH_DOMAIN = host;
|
|
||||||
# security keys will get messed up if this isn't set exactly
|
|
||||||
# will default to http://git.elnu.com:3000/ otherwise
|
|
||||||
ROOT_URL = "https://${host}/";
|
|
||||||
# make gravatar etc work
|
|
||||||
OFFLINE_MODE = false;
|
|
||||||
};
|
|
||||||
service = {
|
|
||||||
DISABLE_REGISTRATION = true;
|
|
||||||
};
|
|
||||||
security = {
|
|
||||||
DISABLE_GIT_HOOKS = false;
|
|
||||||
};
|
|
||||||
git = {
|
|
||||||
# https://github.com/go-gitea/gitea/issues/10103#issuecomment-622222129
|
|
||||||
GC_ARGS = "--aggressive --auto";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."${host}" = {
|
|
||||||
forceSSL = enableSSL;
|
|
||||||
enableACME = enableSSL;
|
|
||||||
locations = {
|
|
||||||
"/".proxyPass = "http://localhost:${builtins.toString port}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1 +0,0 @@
|
||||||
discord.key filter=git-crypt diff=git-crypt
|
|
24
hosts/elnudrop/hosts/tegakituesday.com/502/502.html
Normal file
24
hosts/elnudrop/hosts/tegakituesday.com/502/502.html
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<link rel="stylesheet" href="/missing.min.css">
|
||||||
|
<style>:root { cursor: inherit } button { cursor: pointer }</style>
|
||||||
|
<title>Tegaki Tuesday is offline</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<main>
|
||||||
|
<img src="/mascot.png" alt="字ちゃん" style="height: 12em; display: block; margin: 1em auto 1em auto">
|
||||||
|
<p class="<h3>">
|
||||||
|
<b>Tegaki Tuesday</b> is currently offline for maintenance or due to an electrical outage.
|
||||||
|
Thank you for your patience and please check back soon. Sorry for the inconvenience!
|
||||||
|
</p>
|
||||||
|
<p lang="ja" class="<h4>">
|
||||||
|
現在、<b>手書きの火曜日</b>はメンテナンスのため、または停電のためオフラインとなっております。
|
||||||
|
しばらくお待ちください。ご迷惑をおかけして申し訳ございません!
|
||||||
|
</p>
|
||||||
|
<p class="text-align:center">Prolonged outage? <a href="https://discord.com/users/441283734214279178">Notify me on Discord.</a></p>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>
|
BIN
hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png
Normal file
BIN
hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 980 KiB |
|
@ -1,9 +1,7 @@
|
||||||
{ enableSSL, ... }:
|
{ enableSSL, ... }:
|
||||||
|
|
||||||
|
with import ../../../../modules/tailscale/default.nix;
|
||||||
let host = "tegakituesday.com"; in {
|
let host = "tegakituesday.com"; in {
|
||||||
imports = [
|
|
||||||
./ji-chan.nix
|
|
||||||
];
|
|
||||||
services.nginx.virtualHosts."www.${host}" = {
|
services.nginx.virtualHosts."www.${host}" = {
|
||||||
forceSSL = enableSSL;
|
forceSSL = enableSSL;
|
||||||
enableACME = enableSSL;
|
enableACME = enableSSL;
|
||||||
|
@ -12,8 +10,14 @@ let host = "tegakituesday.com"; in {
|
||||||
services.nginx.virtualHosts."${host}" = {
|
services.nginx.virtualHosts."${host}" = {
|
||||||
forceSSL = enableSSL;
|
forceSSL = enableSSL;
|
||||||
enableACME = enableSSL;
|
enableACME = enableSSL;
|
||||||
|
extraConfig = ''
|
||||||
|
error_page 502 /502.html;
|
||||||
|
'';
|
||||||
locations = {
|
locations = {
|
||||||
"/".root = "/mnt/data/forgejo/sites/tegakituesday.com/public";
|
"/".proxyPass = "http://elnuhub:3335";
|
||||||
|
"/502.html".root = "${./502}";
|
||||||
|
"/mascot.png".root = "${./502}";
|
||||||
|
"/missing.min.css".root = "${../shared/502}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
Binary file not shown.
|
@ -1,28 +0,0 @@
|
||||||
{
|
|
||||||
"1133469685220901016": {
|
|
||||||
"submissionChannel": "1134566066538946640",
|
|
||||||
"invite": "pxGx8AfJxC"
|
|
||||||
},
|
|
||||||
"116379774825267202": {
|
|
||||||
"announcementRole": "836803162127335444",
|
|
||||||
"invite": "2Tf75M9",
|
|
||||||
"submissionChannel": "346809059376234497"
|
|
||||||
},
|
|
||||||
"189571157446492161": {
|
|
||||||
"announcementRole": "800140383455019050",
|
|
||||||
"invite": "japanese",
|
|
||||||
"submissionChannel": "352299136307036160"
|
|
||||||
},
|
|
||||||
"582147335476346880": {
|
|
||||||
"announcementRole": "839853170176032770",
|
|
||||||
"invite": "5e5je2PXeq",
|
|
||||||
"submissionChannel": "839852933377425488"
|
|
||||||
},
|
|
||||||
"814700630958276649": {
|
|
||||||
"submissionChannel": "819038172927098910"
|
|
||||||
},
|
|
||||||
"893457600719515719": {
|
|
||||||
"submissionChannel": "905589521264042004"
|
|
||||||
},
|
|
||||||
"suggestionChannel": "968217486443053067"
|
|
||||||
}
|
|
|
@ -1,14 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
services.ji-chan = {
|
|
||||||
enable = true;
|
|
||||||
user = "forgejo";
|
|
||||||
token = builtins.readFile ./discord.key;
|
|
||||||
hugo = "/mnt/data/forgejo/sites/tegakituesday.com";
|
|
||||||
guildData = pkgs.writeTextFile {
|
|
||||||
name = "ji-chan-guilds";
|
|
||||||
text = builtins.readFile ./guilds.json;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -11,7 +11,6 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# TODO broken as of 2025-03-21
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = [
|
overlays = [
|
||||||
|
@ -53,8 +52,7 @@ in
|
||||||
"browser.backspace_action" = 0;
|
"browser.backspace_action" = 0;
|
||||||
"extensions.unifiedExtensions.enabled" = false;
|
"extensions.unifiedExtensions.enabled" = false;
|
||||||
};
|
};
|
||||||
# TODO broken as of 2025-03-21
|
userChrome = builtins.readFile "${firefox-csshacks}/chrome/autohide_toolbox.css";
|
||||||
# userChrome = builtins.readFile "${firefox-csshacks}/chrome/autohide_toolbox.css";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,9 +9,7 @@ in with theme.colors; {
|
||||||
playerctl # pactl comes with PulseAudio
|
playerctl # pactl comes with PulseAudio
|
||||||
wmctrl # For rofi power menu
|
wmctrl # For rofi power menu
|
||||||
xborders # Active window borders
|
xborders # Active window borders
|
||||||
maim xdotool
|
maim xdotool unclutter # Active window screenshots
|
||||||
# TODO build failure https://github.com/NixOS/nixpkgs/issues/388196
|
|
||||||
# unclutter # Active window screenshots
|
|
||||||
#xsel # Disable middle mouse paste
|
#xsel # Disable middle mouse paste
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
sha256 = "93MP1Iw1eklC+IEQXAhzLHJ+qsDASm53qw7vUEtEstI=";
|
sha256 = "93MP1Iw1eklC+IEQXAhzLHJ+qsDASm53qw7vUEtEstI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-aBuaXckalcBcfr/snUy+8W9ZITehoeMCsGt/4yb2BxA=";
|
cargoSha256 = "fiDdk6c1rPS6L//KKqfp6ODxcLEzNKrpySCb9n8aGQ0=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A simple CLI for fetching Plume Labs air quality info.";
|
description = "A simple CLI for fetching Plume Labs air quality info.";
|
||||||
|
|
|
@ -7,7 +7,7 @@ in
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# https://github.com/kovidgoyal/kitty-themes/blob/master/themes.json
|
# https://github.com/kovidgoyal/kitty-themes/blob/master/themes.json
|
||||||
themeFile = "${theme.kitty-theme}";
|
theme = "${theme.kitty-theme}";
|
||||||
font = {
|
font = {
|
||||||
name = "FiraCode Nerd Font Mono";
|
name = "FiraCode Nerd Font Mono";
|
||||||
size = 12;
|
size = 12;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
theme = "everforest";
|
theme = "everforest";
|
||||||
|
|
||||||
kitty-theme = "everforest_dark_hard";
|
kitty-theme = "Everforest Dark Hard";
|
||||||
gtkTheme = pkgs: {
|
gtkTheme = pkgs: {
|
||||||
package = pkgs.callPackage ./gtk.nix {};
|
package = pkgs.callPackage ./gtk.nix {};
|
||||||
name = "Everforest-Dark-BL";
|
name = "Everforest-Dark-BL";
|
||||||
|
|
Loading…
Add table
Reference in a new issue