daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 06:00:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:97355460f1643a09535738b73f54571bec2bac57
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:290280f71478e89efeddae0e3f9b4c2ef59e8c29
Branches Tags
daylin:flake-lock
daylin:main

9 commits
97355460f1 ... 290280f714

Author SHA1 Message Date
Daylin Morgan
290280f714
integrate caddy with nixos instead of docker 2024-11-15 12:00:15 -06:00
Daylin Morgan
16e417c38e
add jujutsu to algiz 2024-11-15 10:41:24 -06:00
Daylin Morgan
805a4ba2f2
ignore todo 2024-11-15 10:36:53 -06:00
daylin-bot
0fe782bf7b flake.lock: Update 
Flake lock file updates:

• Updated input 'comin':
    'github:nlewo/comin/84ef9af404b9157eab2c5e3e44d7c29239329901' (2024-08-20)
  → 'github:nlewo/comin/9afca855518f79b5bff3d2a9663b2e6f81dd361a' (2024-11-13)
• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=523e3a6ae3e62463b309c1b3222bafd7b1fb11ef' (2024-11-13)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=4853597cd9829e622be2c3628dc748407c27c423' (2024-11-14)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=3fb47372b79265ebdabeeefdad10359d5b18377a' (2024-11-13)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=098e491a43e8b26f4382b48651a4131464bf6a2f' (2024-11-15)
• Updated input 'hyprman':
    'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=884cb9c68c3d28542e581be762b13dcc380a8135' (2024-11-11)
  → 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=888c8e4c9395e7abfcbfc044d575ff6cf955672a' (2024-11-15)
• Updated input 'hyprman/nim2nix':
    'github:daylinmorgan/nim2nix/42af12ca45025c7146bc24e27f5d8b65b003d663' (2024-09-04)
  → 'github:daylinmorgan/nim2nix/a9f1182dbe51675b9666d6a79bebded7d9839ad7' (2024-11-15)
• Updated input 'lix':
    '8a9094303b.tar.gz?narHash=sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8%3D&rev=8a9094303bc7873c979e54ea20b9f50464ee3965' (2024-11-11)
  → '43777939eb.tar.gz?narHash=sha256-1LGkwq9g/BfM0JuZmWPYwBX5RiqIpW/BxXcsLwkVcGg%3D&rev=43777939eb2253596ff822771929a8820916fb29' (2024-11-12)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/896019f04b22ce5db4c0ee4f89978694f44345c3' (2024-11-10)
  → 'github:nix-community/nix-index-database/40d882b55e89add1ded379cc99edaab24983d6d9' (2024-11-14)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/adb6bc4b661a43328752b4575be4968a4990c033' (2024-11-01)
  → 'github:nix-community/NixOS-WSL/a6b9cf0b7805e2c50829020a73e7bde683fd36dd' (2024-11-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
  → 'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/c2fa066bb9952469a5e01a08293f78d114c02f09' (2024-11-13)
  → 'github:nix-community/nixpkgs-wayland/3a7690c5fe0ecfceeddbf09f8642dca424d29793' (2024-11-15)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/807ab623e6d01e931269a28a07c59dcfd6474173' (2024-11-10)
  → 'github:nix-community/lib-aggregate/902e1bb3c2ae0f051ff98e4e3eac247f7e6ca392' (2024-11-14)
• Updated input 'nixpkgs-wayland/lib-aggregate/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/96902c4573cd03ea7e533634cb49861148f49a7a' (2024-11-10)
  → 'github:nix-community/nix-eval-jobs/f2ccb7e2d80601fb43807c36f14703f2342420f3' (2024-11-14)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
  → 'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
• Updated input 'stable':
    'github:nixos/nixpkgs/9256f7c71a195ebe7a218043d9f93390d49e6884' (2024-11-10)
  → 'github:nixos/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529' (2024-11-12)
 2024-11-15 09:58:15 -06:00
Daylin Morgan
2c0a9cf847
add todo 2024-11-15 09:33:08 -06:00
Daylin Morgan
5e029afdff
update nimble to v0.16.3 2024-11-15 09:30:34 -06:00
Daylin Morgan
76e48fc85e
flake.lock: Update 
Flake lock file updates:

• Updated input 'tsm':
    'github:daylinmorgan/tsm/5ca52175f6e2f410975a766019158d0794a096ca?dir=nix' (2024-11-13)
  → 'github:daylinmorgan/tsm/62ca20fd9b608adc0dbdb30a8d5bf65e451d8908?dir=nix' (2024-11-14)
 2024-11-14 17:19:28 -06:00
Daylin Morgan
a873608597
use nixpkgs nimble 2024-11-14 15:19:51 -06:00
Daylin Morgan
0534193e15
update pixi 2024-11-14 12:50:00 -06:00
10 changed files with 155 additions and 108 deletions
Show stats Expand all files Collapse all files

116
flake.lock
View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724145018, "lastModified": 1731534082,
"narHash": "sha256-6R5CeMgr3EGKhqWPkqtteOtix7hBaurfpjHepiq2OrU=", "narHash": "sha256-n8yVzBixxaj0Qn6SV655t6QUtKSOJ+sR4AEoq0Vqb/0=",
"owner": "nlewo", "owner": "nlewo",
"repo": "comin", "repo": "comin",
"rev": "84ef9af404b9157eab2c5e3e44d7c29239329901", "rev": "9afca855518f79b5bff3d2a9663b2e6f81dd361a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +201,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,11 +240,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1731469793, "lastModified": 1731606318,
"narHash": "sha256-ZewQYTlsysOt6orTIIKNR+y43iklehOzeBF/Gfy7fog=", "narHash": "sha256-JXgJTl6qK8b7+g9ORH94fZ0sLCwebn8tkpxy1ZG0agA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "523e3a6ae3e62463b309c1b3222bafd7b1fb11ef", "rev": "4853597cd9829e622be2c3628dc748407c27c423",
"revCount": 7949, "revCount": 7968,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@ -318,11 +318,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1731526492, "lastModified": 1731631654,
"narHash": "sha256-2Gob+eZEPpF225QrRLXyfeQ9L63YHFa/tNh15FW/Rzo=", "narHash": "sha256-a6gy39yki4mX/Oj83aG08nNntXxXhM1wjksNXGZ8x5c=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3fb47372b79265ebdabeeefdad10359d5b18377a", "rev": "098e491a43e8b26f4382b48651a4131464bf6a2f",
"revCount": 5451, "revCount": 5456,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -413,11 +413,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731363071, "lastModified": 1731684150,
"narHash": "sha256-FdB1uxTPgS7vcfVIsG720G2+t2l6uHksW3bp3fzz/Q8=", "narHash": "sha256-jY0bRx2SWuLU02nwDE8Q5bPuMMSiUISJYaH4GWfUFc4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "884cb9c68c3d28542e581be762b13dcc380a8135", "rev": "888c8e4c9395e7abfcbfc044d575ff6cf955672a",
"revCount": 19, "revCount": 21,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/hyprman.git" "url": "https://git.dayl.in/daylin/hyprman.git"
}, },
@ -482,11 +482,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1731240728, "lastModified": 1731586450,
"narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=", "narHash": "sha256-upNRIVk5PmBPJ307djkiowhHOx8Dqwb5bpM4XNJH4Ek=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "807ab623e6d01e931269a28a07c59dcfd6474173", "rev": "902e1bb3c2ae0f051ff98e4e3eac247f7e6ca392",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731334117, "lastModified": 1731416517,
"narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=", "narHash": "sha256-1LGkwq9g/BfM0JuZmWPYwBX5RiqIpW/BxXcsLwkVcGg=",
"rev": "8a9094303bc7873c979e54ea20b9f50464ee3965", "rev": "43777939eb2253596ff822771929a8820916fb29",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a9094303bc7873c979e54ea20b9f50464ee3965.tar.gz?rev=8a9094303bc7873c979e54ea20b9f50464ee3965" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/43777939eb2253596ff822771929a8820916fb29.tar.gz?rev=43777939eb2253596ff822771929a8820916fb29"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -556,11 +556,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725469705, "lastModified": 1731683943,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=", "narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "nim2nix", "repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663", "rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -576,11 +576,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725469705, "lastModified": 1731683943,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=", "narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "nim2nix", "repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663", "rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -615,11 +615,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1731250407, "lastModified": 1731565875,
"narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=", "narHash": "sha256-jN6HcMNVgWPE++8vNQIyerugFDRWG1ffFCORK/vpCUs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "96902c4573cd03ea7e533634cb49861148f49a7a", "rev": "f2ccb7e2d80601fb43807c36f14703f2342420f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,11 +657,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731209121, "lastModified": 1731593150,
"narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "rev": "40d882b55e89add1ded379cc99edaab24983d6d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -677,11 +677,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1730453870, "lastModified": 1731682434,
"narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "adb6bc4b661a43328752b4575be4968a4990c033", "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1731515670, "lastModified": 1731645556,
"narHash": "sha256-tY1C721VV87LfNdGBsdRwTXpskFlqEXxLokgNO1OnZA=", "narHash": "sha256-i27WZwS0f18v+5vODBDrnO5GVlzszseDBXcLQiYr5Yo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "c2fa066bb9952469a5e01a08293f78d114c02f09", "rev": "3a7690c5fe0ecfceeddbf09f8642dca424d29793",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -792,11 +792,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1731139594, "lastModified": 1731319897,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +824,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1731139594, "lastModified": 1731319897,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -877,11 +877,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729614871, "lastModified": 1731609704,
"narHash": "sha256-dSlXHzGlR4pxTGHioqyJoI5boDWwkAtNTPZo2Lsl4xU=", "narHash": "sha256-HSOQ5VyzXOfKLlwSg1pelbwf9hwj89V7rZMbv9ldA1E=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "pixi-flake", "repo": "pixi-flake",
"rev": "30c2903994e41cea1ea341fd041a78633e95e7b7", "rev": "e11d879dabad54ec0ef0218b48cea7f630fada78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -938,11 +938,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1731239293, "lastModified": 1731386116,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", "rev": "689fed12a013f56d4c4d3f612489634267d86529",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1058,11 +1058,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1731528486, "lastModified": 1731626313,
"narHash": "sha256-lKtPFzEKzFeNg6euQjmNjetddhWgaS3jjtV0c9zEehw=", "narHash": "sha256-IGKZTmiJPfKBPq8m1TTmMPTKUxrsPwlHLv5UB1px6iU=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "tsm", "repo": "tsm",
"rev": "5ca52175f6e2f410975a766019158d0794a096ca", "rev": "62ca20fd9b608adc0dbdb30a8d5bf65e451d8908",
"type": "github" "type": "github"
}, },
"original": { "original": {

74
hosts/algiz/Caddyfile Normal file
View file

@ -0,0 +1,74 @@
elizabeth-and-daylin.com {
reverse_proxy http://localhost:4321
}
elizabeth.dayl.in, www.elizabeth-and-daylin.com {
redir https://elizabeth-and-daylin.com{uri} permanent
}
attic.dayl.in {
reverse_proxy http://localhost:5656
}
git.dayl.in {
reverse_proxy http://localhost:3000
}
gts.dayl.in {
# Optional, but recommended, compress the traffic using proper protocols
encode zstd gzip
# TODO: change port?
# The actual proxy configuration to port 8080 (unless you've chosen another port number)
reverse_proxy * http://localhost:3758 {
# Flush immediatly, to prevent buffered response to the client
flush_interval -1
}
}
# not currently a running service on algiz
# (caddy-common) {
# encode gzip
# header {
# -Server
# Strict-Transport-Security "max-age=31536000; include-subdomains;"
# X-XSS-Protection "1; mode=block"
# X-Frame-Options "DENY"
# X-Content-Type-Options nosniff
# # Referrer-Policy no-referrer-when-downgrade
# X-Robots-Tag "none"
# }
# }
#
# lemmy.dayl.in {
# import caddy-common
# reverse_proxy http://lemmy-ui:1234
#
# @lemmy {
# path /api/*
# path /pictrs/*
# path /feeds/*
# path /nodeinfo/*
# path /.well-known/*
# }
#
# @lemmy-hdr {
# header Accept application/*
# }
#
# handle @lemmy {
# reverse_proxy http://lemmy:8536
# }
#
# handle @lemmy-hdr {
# reverse_proxy http://lemmy:8536
# }
#
# @lemmy-post {
# method POST
# }
#
# handle @lemmy-post {
# reverse_proxy http://lemmy:8536
# }
# }

1
hosts/algiz/pkgs.nix
View file

@ -4,5 +4,6 @@
(writeShellScriptBin "gitea" '' (writeShellScriptBin "gitea" ''
ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@" ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
'') '')
jujutsu
]; ];
} }

4
hosts/algiz/services.nix
View file

@ -65,4 +65,8 @@ in
} }
]; ];
}; };
services.caddy = enabled // {
extraConfig = builtins.readFile ./Caddyfile;
};
} }

3
lib/default.nix
View file

@ -43,10 +43,7 @@ let
rec { rec {
default = oizys; default = oizys;
oizys = pkgs.callPackage ../pkgs/oizys { }; oizys = pkgs.callPackage ../pkgs/oizys { };
# nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { };
nph = pkgs.callPackage ../pkgs/nph { };
iso = mkIso.config.system.build.isoImage; iso = mkIso.config.system.build.isoImage;
# roc = (pkgsFromSystem pkgs.system "roc").full;
} }
// (inheritFlakePkgs pkgs [ // (inheritFlakePkgs pkgs [
"pixi" "pixi"

15
modules/languages/nim.nix
View file

@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
flake,
... ...
}: }:
let let
@ -11,14 +10,10 @@ let
in in
{ {
config = mkIfIn "nim" cfg { config = mkIfIn "nim" cfg {
environment.systemPackages = environment.systemPackages = with pkgs; [
(with pkgs; [ nim
nim nimble
]) nimlangserver
++ (with (flake.pkgs "self"); [ ];
nimlangserver
# nph
nimble
]);
}; };
} }

4
pkgs/default.nix
View file

@ -2,8 +2,8 @@
let inherit (pkgs) python3Packages; let inherit (pkgs) python3Packages;
in in
{ {
nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/ # nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
nimlangserver = pkgs.callPackage ./nim/nimlangserver { }; # nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
nimble = pkgs.callPackage ./nim/nimble { }; nimble = pkgs.callPackage ./nim/nimble { };
distrobox = pkgs.callPackage ./distrobox {}; distrobox = pkgs.callPackage ./distrobox {};
llm = python3Packages.callPackage ./llm {}; llm = python3Packages.callPackage ./llm {};

11
pkgs/nim/nimble/default.nix
View file

@ -7,14 +7,19 @@
}: }:
buildNimPackage (finalAttrs: { buildNimPackage (finalAttrs: {
pname = "nimble"; pname = "nimble";
version = "0.16.2"; version = "0.16.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nim-lang"; owner = "nim-lang";
repo = "nimble"; repo = "nimble";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us="; hash = "sha256-1tO/6sKPjmu9B6/cF00DeY/mnUHi2Y+hTEZ3WCqKoGw=";
fetchSubmodules = true;
}; };
buildInputs = [ openssl ]; buildInputs = [ openssl ];
lockFile = ./lock.json;
doCheck = false; doCheck = false;
# localPassC needed from zippy since name mangling on nix is broken
nimFlags = [
''--passC:"-msse4.1 -mpclmul"''
];
}) })

28
pkgs/nim/nimble/lock.json
View file

@ -1,28 +0,0 @@
{
"depends": [
{
"method": "fetchzip",
"path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
"rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
"sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
"srcDir": "src",
"url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
"subDir": "",
"packages": [
"checksums"
]
},
{
"method": "fetchzip",
"path": "/nix/store/lwg9fm34h5xv0dvxij9r5m2y6pn1zsvx-source",
"rev": "faf1617f44d7632ee9601ebc13887644925dcc01",
"sha256": "1dxbc41wbvkpdp6q3qz1r38lpn32447qkkgyh2s12ym6bx4ynni4",
"srcDir": "src",
"url": "https://github.com/nim-lang/sat/archive/faf1617f44d7632ee9601ebc13887644925dcc01.tar.gz",
"subDir": "",
"packages": [
"sat"
]
}
]
}

7
todo.md
View file

@ -3,14 +3,13 @@
## oizys ## oizys
- [ ] write a flake template that includes the systems boilerplate - [ ] write a flake template that includes the systems boilerplate
- [ ] include all of the defined overlays from `./overlays` in the `forAllSystems` nixpkgs - [ ] get the running action url after `oizys ci {workflow}.yml`
## software ## software
- [ ] include langservers for enabled languages? - [ ] include langservers for enabled languages?
- [ ] wezterm is broken...something to do with fonts? <!--[tracking issue](https://github.com/wez/wezterm/issues/5990)-->
I tried used the nix flake and that didn't help - [ ] ~wezterm is broken...something to do with fonts?~ using ghostty
[tracking issue](https://github.com/wez/wezterm/issues/5990)
### Window Manager ### Window Manager