Compare commits

...

4 commits

Author SHA1 Message Date
7ffc03efe5 flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    'f84997cbef.tar.gz?narHash=sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo%3D' (2024-08-06)
  → '2c48460850.tar.gz?narHash=sha256-cmGUqAeZuiiRB3Ja10gFMM4cjrSjdDbeuKnFWExb%2B1c%3D' (2024-08-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d33cf80b603b3d0cddb48f9816cae707a59e2334' (2024-08-06)
  → 'github:nixos/nixpkgs/2a13929e1f191b3690dd2f2db13098b04adb9043' (2024-08-06)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/423d21c157c2a7b384ae9c766e25759576dceb87' (2024-08-06)
  → 'github:nix-community/nixpkgs-wayland/2c512b8dc9adc0ada535d23e6be30efafe09e81b' (2024-08-06)
• Updated input 'roc':
    'github:roc-lang/roc/13f60cde09ef01c003fe362bf46e592a0f4ae7c6' (2024-08-05)
  → 'github:roc-lang/roc/8032a988b3aa85f290a418f7e2d016175ebe8e1f' (2024-08-06)
• Updated input 'zls':
    'github:zigtools/zls/74b5a00f67ab4e5a848646411779221e6cc24b87' (2024-08-06)
  → 'github:zigtools/zls/d8084a342f40b444addf772fdef36a589299ebe6' (2024-08-06)
2024-08-07 00:37:25 +00:00
3bc01c9143
add overkill rune generator 2024-08-06 13:45:28 -05:00
7fe4f7bd55
spread out lix source url 2024-08-06 12:43:56 -05:00
a329763cba
enable sane for scanning 2024-08-06 12:38:20 -05:00
10 changed files with 146 additions and 85 deletions

View file

@ -34,6 +34,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v13 - uses: DeterminateSystems/nix-installer-action@v13
with: with:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: | extra-conf: |
accept-flake-config = true accept-flake-config = true
@ -59,4 +60,5 @@ jobs:
--flake . \ --flake . \
--debug \ --debug \
-- \ -- \
--keep-going \
--print-build-logs --print-build-logs

View file

@ -71,6 +71,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v13 - uses: DeterminateSystems/nix-installer-action@v13
with: with:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: | extra-conf: |
accept-flake-config = true accept-flake-config = true

View file

@ -534,11 +534,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722957485, "lastModified": 1722964233,
"narHash": "sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo=", "narHash": "sha256-cmGUqAeZuiiRB3Ja10gFMM4cjrSjdDbeuKnFWExb+1c=",
"rev": "f84997cbefb2f2dd99e48f0ad39f747ed83d69e9", "rev": "2c48460850186e5fb8152e7882baf9e29bb5e884",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f84997cbefb2f2dd99e48f0ad39f747ed83d69e9.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2c48460850186e5fb8152e7882baf9e29bb5e884.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -715,11 +715,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1722928655, "lastModified": 1722986309,
"narHash": "sha256-2BAfUaRzrhHwT/JodTq++DUf/nljgoFEc5A79SS8ydU=", "narHash": "sha256-Veppi3c8c9XJ1CmgkOc5/oipPB/J8JPHbh3SHkMov3A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "423d21c157c2a7b384ae9c766e25759576dceb87", "rev": "2c512b8dc9adc0ada535d23e6be30efafe09e81b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1722926584, "lastModified": 1722957468,
"narHash": "sha256-sLA+lfCxTkXf4o3JVxcfe+w9kAzauGfEnJ9roNbNng8=", "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d33cf80b603b3d0cddb48f9816cae707a59e2334", "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -857,11 +857,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722856566, "lastModified": 1722987403,
"narHash": "sha256-Yr9P/TyxgVVwgXIiu96up2hgWjMR0zWPbaihyNXp+r0=", "narHash": "sha256-olYGUCzNttIJblgG5l+xH5VaBrEBYK0si4c1VpBjxxA=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "13f60cde09ef01c003fe362bf46e592a0f4ae7c6", "rev": "8032a988b3aa85f290a418f7e2d016175ebe8e1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1180,11 +1180,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722919037, "lastModified": 1722987529,
"narHash": "sha256-h8BG+XOCli8++tCojSo/cF39AIixVj3mO94b4cuqT94=", "narHash": "sha256-r7tnq70psZQXfLlDj+XzidBj352vfQFrICC7hfKHw7M=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "74b5a00f67ab4e5a848646411779221e6cc24b87", "rev": "d8084a342f40b444addf772fdef36a589299ebe6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,12 +1,17 @@
{ pkgs, enabled, ... }: { pkgs, enabled, ... }:
{ {
networking.networkmanager = enabled; networking.networkmanager = enabled;
services.printing = enabled;
services.fwupd = enabled; services.fwupd = enabled;
hardware.bluetooth = enabled // { hardware.bluetooth = enabled // {
powerOnBoot = true; powerOnBoot = true;
}; };
services.printing = enabled;
hardware.sane = enabled // {
extraBackends = [ pkgs.hplipWithPlugin ];
};
users.users.daylin.extraGroups = ["scanner" "lp"];
# https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix
# https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix
services.fstrim = enabled; services.fstrim = enabled;

View file

@ -1,22 +1,3 @@
# Runes # Runes
<table><tr><td><img src="https://upload.wikimedia.org/wikipedia/commons/1/14/Runic_letter_algiz.png"></td><td><img src="https://upload.wikimedia.org/wikipedia/commons/1/16/Runic_letter_othalan.png"></td></tr><tr><td><img src="https://upload.wikimedia.org/wikipedia/commons/0/0c/Runic_letter_mannaz.png"></td><td><img src="https://upload.wikimedia.org/wikipedia/commons/b/b9/Runic_letter_naudiz.png"></td></tr></table>
<table>
<tr>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/1/16/Runic_letter_othalan.png">
</td>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/1/14/Runic_letter_algiz.png">
</td>
</tr>
<tr>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/0/0c/Runic_letter_mannaz.png">
</td>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/b/b9/Runic_letter_naudiz.png">
</td>
</tr>
</table>

View file

@ -1,6 +1,6 @@
{ {
braille = '' braille = ''
@ -14,8 +14,10 @@
''; '';
ascii = '' ascii = ''
:%+ ## +%: :%+ ## +%:
-%@+ @@ +@%- -%@+ @@ +@%-
-%@=%%=@%- -%@=%%=@%-
@ -29,5 +31,6 @@
@% @%
@@ @@
## ##
''; '';
} }

62
modules/runes/generate.nu Executable file
View file

@ -0,0 +1,62 @@
#!/usr/bin/env nix-shell
#!nix-shell -p nushell ascii-image-converter -i nu
let runes = [
{name: "algiz" url: "https://upload.wikimedia.org/wikipedia/commons/1/14/Runic_letter_algiz.png" },
{name: "othalan" url: "https://upload.wikimedia.org/wikipedia/commons/1/16/Runic_letter_othalan.png" },
{name: "mannaz" url: "https://upload.wikimedia.org/wikipedia/commons/0/0c/Runic_letter_mannaz.png" },
{name: "naudiz" url: "https://upload.wikimedia.org/wikipedia/commons/b/b9/Runic_letter_naudiz.png" },
]
def convert [] {
let rune = $in
let image = http get $rune.url
let flags = [--height 15 --negative]
{
name: $rune.name
braille: ( $image | ascii-image-converter - --braille ...$flags)
ascii: ( $image | ascii-image-converter - ...$flags)
}
}
def nix [] {
let rune = $in | convert
$"{
braille = ''
($rune.braille)
'';
ascii = ''
($rune.ascii)
'';
}
" | save -f $"($rune.name).nix"
}
def col [] {
$in
| reduce --fold "" {|it, acc|
$acc + $'<td><img src="($it.url)"></td>'
}
}
def row [] { $"<tr>($in)</tr>" }
def readme [] {
let runes = $in
let dims = { rows: 2 cols: 2 }
let cells = ($runes | chunks $dims.rows | each { $in | col | row})
let table = [ "<table>" ...$cells "</table>" ] | str join
$"# Runes\n\n($table)\n"
}
$runes
| readme
| save -f "README.md"
$runes
| each {|rune| $rune | nix }
print "don't forget to run `nix fmt`!"

View file

@ -1,7 +1,7 @@
{ {
braille = '' braille = ''
@ -14,8 +14,10 @@
''; '';
ascii = '' ascii = ''
:%*: :+%= :%*: :+%=
-@%%%*- -*%%#@+ -@%%%*- -*%%#@+
-@- .=#@##@#=: .@+ -@- .=#@##@#=: .@+
@ -29,5 +31,6 @@
-@= :@+ -@= :@+
-@= :@+ -@= :@+
-%- :%= -%- :%=
''; '';
} }

View file

@ -1,6 +1,7 @@
{ {
braille = '' braille = ''
@ -13,9 +14,10 @@
''; '';
ascii = '' ascii = ''
+%. +%.
*@. *@.
*@. *@.
@ -29,5 +31,6 @@
*@. *@.
*@. *@.
+%. +%.
''; '';
} }

View file

@ -1,22 +1,6 @@
{ {
ascii = ''
.+.
.*@@@*.
.+@@- -%@*.
.+@@= -%@*.
.+@%= -%@+.
+@@- :@@*
.*@%- :#@*:
.#@%: :#@#:
:#@#-*@#:
=@@@+
.*@#-#@#:
.*@%- :#@#:
.*@%- :%@*.
+@%- -%@+
:- -:
'';
braille = '' braille = ''
@ -32,4 +16,21 @@
''; '';
ascii = ''
=+
-%@@@=
:%@+ =@%-
.#@*. +@#:
*@#. *@#.
+@%: :#@+
+@#: .#@*.
.*@*..*@#.
.#@@%.
=%##@=
-%@= -@@=
:%@+ =@%-
.#@+ +@#.
=. .=
'';
} }