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

Compare commits

base: daylin:e5b8a8e0ffc7a756291b1d99b443a94e1a1c050d
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:9ccd7d3f6df80d5eb0a7575a611dc287469c6922
Branches Tags
daylin:flake-lock
daylin:main

11 commits
e5b8a8e0ff ... 9ccd7d3f6d

Author SHA1 Message Date
github-actions[bot]
9ccd7d3f6d flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=bc6b0880dda2607a80f000c134f573c970452a0f&submodules=1' (2024-07-13)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=bd526822deb9ed47c0b51b534817aa8541fff07b&submodules=1' (2024-07-15)
• Updated input 'lix':
    'a8f443d960.tar.gz?narHash=sha256-YZ7043PFS6LalHAyGeO7qRLeZIevwjHRbbMkpixjwhM%3D' (2024-07-12)
  → '1eb5d22132.tar.gz?narHash=sha256-fueWQn/bzWcYeR01UWAhjMejgpQc2mjSPt3gb5tpoMs%3D' (2024-07-14)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/371b5076d718f7f637d3959d0203061f06af1263?narHash=sha256-U3IqoGmIzBKEJ0ihRQ10GRRtdoDBI6Oxl6aiGbUA59A%3D' (2024-07-12)
  → 'github:nix-community/NixOS-WSL/f6db2d325bdf57d39a3ae43376bdf2a020a6aad2?narHash=sha256-wuHiinPG5CzCUBr9I51g%2BIRhP/69Y9gRVh%2BQnEtFnyI%3D' (2024-07-15)
• Updated input 'nixos-wsl/nixpkgs':
    'github:NixOS/nixpkgs/49ee0e94463abada1de470c9c07bfc12b36dcf40?narHash=sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN%2BMXpA%3D' (2024-07-06)
  → 'github:NixOS/nixpkgs/f12ee5f64c6a09995e71c9626d88c4efa983b488?narHash=sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE%3D' (2024-07-12)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b729601a9e6c459fd8884dea513af143111bed54?narHash=sha256-1Al1qDC8Q/s4viPq4ln8jfHWZxYl%2BNb49dNFISFpqBY%3D' (2024-07-13)
  → 'github:nixos/nixpkgs/a14c5d651cee9ed70f9cd9e83f323f1e531002db?narHash=sha256-Cypl9ORr5UjtBsbjXMTJRepTe362yNVrPrntUvHiTaw%3D' (2024-07-15)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/09a28c6e377ae40c67d79f0a98c5bff3c59457b8?narHash=sha256-7tz2witA6mIxX3250WyhD8rvXQxlSzQFEDdVLYvzEU8%3D' (2024-07-14)
  → 'github:nix-community/nixpkgs-wayland/7421424feb2e68a173f6fd218bbf71eb352404e5?narHash=sha256-9%2Bv7DYzlQn0djo2j11Ges0uj5WzWajpob/Y3WcsEFks%3D' (2024-07-15)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/5865544e7c012ecaa952f5c6cf5878c1676b52b4?narHash=sha256-cyl6Cxqo4bNmwLXi8/qIc3U1vRJ9VyIBUL/j3is4x58%3D' (2024-07-07)
  → 'github:nix-community/lib-aggregate/6e56a6fd1d993eb02c991d449819f01340888e02?narHash=sha256-ggCV3etL7W1X9kxhLPZP35%2BBBh1LgQybene%2BL/aeQaQ%3D' (2024-07-14)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/770d42db0b8203bdd84ddbd707a49fe0a3638863?narHash=sha256-arht1SYnZ5hJl1COIuqbdRi8ibpnNtc9zUZLmU9xqTs%3D' (2024-07-07)
  → 'github:nix-community/nixpkgs.lib/3b0b1763c0f0931deaa2980b7b146f8ae7a6a952?narHash=sha256-z3Lp%2B%2B7k4l/3K4A%2B7v3cuHBNcm/vntGXgxElLH%2BINa4%3D' (2024-07-14)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9?narHash=sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y%3D' (2024-07-12)
  → 'github:nixos/nixpkgs/693bc46d169f5af9c992095736e82c3488bf7dbb?narHash=sha256-oedh2RwpjEa%2BTNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA%3D' (2024-07-14)
• Updated input 'roc':
    'github:roc-lang/roc/0284248320e1a72bb5823bd7005c6521c1c70857?narHash=sha256-P9yElKsIEk6rp2AK3wf2vQQIlPh%2BBQQkvE%2B9BKg5BWs%3D' (2024-07-14)
  → 'github:roc-lang/roc/cf06d2ba3578dbb3b7c4b3c36623c825e32ec62a?narHash=sha256-h3JuiB78SKuHFhp5E43pjNBX/GkOg8lfe2oHBlhBE7k%3D' (2024-07-15)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/b6655dcc31af1b20d4e112306c46c110ce5d967d?narHash=sha256-L6y1TI4caiJwKQBiBhU748F5Cv6563el0QOh6Zapk3s%3D' (2024-07-14)
  → 'github:Cloudef/zig2nix/26783d5f9c3edc01e14c80e260d1e81e53cd3ec9?narHash=sha256-cJQEx1PZUcuznnkQYgLOPCBrFrTUXwd9r%2Bj7eI80xNY%3D' (2024-07-15)
• Updated input 'zls':
    'github:zigtools/zls/ef50085f7b7136c1e1b26438141bb005743f38c1?narHash=sha256-JeQuI0LLjCdI1zgHQu9n0tA3CEz8EZ0qHUFAYqWURA0%3D' (2024-07-12)
  → 'github:zigtools/zls/e6f9242eeb2e3ad96653f444428fd7663976d775?narHash=sha256-6pIyqkMmVf4AqNCrH0ZA/RBbQdV6m/j7AVwyaw4dzoE%3D' (2024-07-15)
 2024-07-15 20:22:04 +00:00
Daylin Morgan
1c5e3bf419
add artifact step 2024-07-15 15:19:28 -05:00
Daylin Morgan
6706c562aa
flake-lock already exists 2024-07-15 15:15:12 -05:00
Daylin Morgan
82fa56ebcf
fix paths 2024-07-15 14:34:43 -05:00
Daylin Morgan
daa7ea3314
missing subcmd 2024-07-15 14:13:42 -05:00
Daylin Morgan
cfa3b363a0
start with apt-purge 2024-07-15 13:46:47 -05:00
Daylin Morgan
5156e5a61f
add pretty printer on system change 2024-07-15 13:34:05 -05:00
Daylin Morgan
9952a05d7d
check size at end 2024-07-15 13:31:08 -05:00
Daylin Morgan
afd15774c8
make links manually 2024-07-15 13:25:30 -05:00
Daylin Morgan
f96226a9c3
test double build 2024-07-15 12:52:21 -05:00
Daylin Morgan
b7c5798f84
add todo for logind 2024-07-15 10:49:27 -05:00
5 changed files with 76 additions and 52 deletions
Show stats Expand all files Collapse all files

8
.github/actions/clean-disk/action.yml vendored
View file

@ -34,17 +34,15 @@ runs:
echo "Removing unwanted software... " echo "Removing unwanted software... "
sudo rm -rf /opt &
sudo rm -rf "$AGENT_TOOLSDIRECTORY" &
if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then
sudo apt-get purge \ sudo apt-get purge \
--allow-remove-essential \ --allow-remove-essential \
-qq \ -qq \
$(non_manifest_packages) > /dev/null & $(non_manifest_packages) # > /dev/null
wait
fi fi
sudo rm -rf /opt &
sudo rm -rf "$AGENT_TOOLSDIRECTORY" &
sudo rm -rf /var/lib/docker & sudo rm -rf /var/lib/docker &
sudo rm -rf /usr/{local,share} & sudo rm -rf /usr/{local,share} &

37
.github/workflows/nightly.yml vendored
View file

@ -64,20 +64,13 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- run: git checkout -B flake-lock
# - name: Setup Git Bot
# run: |
# git --version
# git config user.name 'github-actions[bot]'
# git config user.email 'github-actions[bot]@users.noreply.github.com'
- uses: DeterminateSystems/nix-installer-action@v12 - uses: DeterminateSystems/nix-installer-action@v12
with: with:
extra-conf: | extra-conf: |
accept-flake-config = true accept-flake-config = true
# - uses: DeterminateSystems/magic-nix-cache-action@v7 - uses: DeterminateSystems/magic-nix-cache-action@v7
- uses: ./.github/actions/clean-disk - uses: ./.github/actions/clean-disk
with: with:
@ -93,4 +86,30 @@ jobs:
--verbose \ --verbose \
--debug \ --debug \
-- \ -- \
--print-build-logs --print-build-logs \
--out-link current
- run: git checkout flake-lock
- name: Build Updated
run: |
system_attr=$(nix run . -- output --host "othalan" --flake .)
nix run . \
-- \
build $system_attr \
--flake . \
--verbose \
--debug \
-- \
--print-build-logs \
--out-link updated
- run: nix run "nixpkgs#nvd" diff ./current ./updated
- run: df -h
# is this necessary?
- run: cat $GITHUB_STEP_SUMMARY > summary.md
- uses: actions/upload-artifact@v4
with:
name: summary
path: summary.md

76
flake.lock
View file

@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1720896272, "lastModified": 1721044084,
"narHash": "sha256-zo1lDMsxjEyko/P+KfCLNYZrCAWQOrX90/J31nqzpy4=", "narHash": "sha256-vO6wBIaInnyIQqmsKc28AsFSWeCFgnFilNhv2zoN/tU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "bc6b0880dda2607a80f000c134f573c970452a0f", "rev": "bd526822deb9ed47c0b51b534817aa8541fff07b",
"revCount": 4925, "revCount": 4927,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -482,11 +482,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1720354218, "lastModified": 1720958877,
"narHash": "sha256-cyl6Cxqo4bNmwLXi8/qIc3U1vRJ9VyIBUL/j3is4x58=", "narHash": "sha256-ggCV3etL7W1X9kxhLPZP35+BBh1LgQybene+L/aeQaQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "5865544e7c012ecaa952f5c6cf5878c1676b52b4", "rev": "6e56a6fd1d993eb02c991d449819f01340888e02",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720825173, "lastModified": 1720976034,
"narHash": "sha256-YZ7043PFS6LalHAyGeO7qRLeZIevwjHRbbMkpixjwhM=", "narHash": "sha256-fueWQn/bzWcYeR01UWAhjMejgpQc2mjSPt3gb5tpoMs=",
"rev": "a8f443d96011c11ad726c2a28a37752bd56c12cc", "rev": "1eb5d22132a57487e0cb84a65ecd35814624c0e5",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a8f443d96011c11ad726c2a28a37752bd56c12cc.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1eb5d22132a57487e0cb84a65ecd35814624c0e5.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -627,11 +627,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1720787015, "lastModified": 1721037029,
"narHash": "sha256-U3IqoGmIzBKEJ0ihRQ10GRRtdoDBI6Oxl6aiGbUA59A=", "narHash": "sha256-wuHiinPG5CzCUBr9I51g+IRhP/69Y9gRVh+QnEtFnyI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "371b5076d718f7f637d3959d0203061f06af1263", "rev": "f6db2d325bdf57d39a3ae43376bdf2a020a6aad2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +658,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1720313561, "lastModified": 1720918433,
"narHash": "sha256-arht1SYnZ5hJl1COIuqbdRi8ibpnNtc9zUZLmU9xqTs=", "narHash": "sha256-z3Lp++7k4l/3K4A+7v3cuHBNcm/vntGXgxElLH+INa4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "770d42db0b8203bdd84ddbd707a49fe0a3638863", "rev": "3b0b1763c0f0931deaa2980b7b146f8ae7a6a952",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -679,11 +679,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1720932034, "lastModified": 1721048083,
"narHash": "sha256-7tz2witA6mIxX3250WyhD8rvXQxlSzQFEDdVLYvzEU8=", "narHash": "sha256-9+v7DYzlQn0djo2j11Ges0uj5WzWajpob/Y3WcsEFks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "09a28c6e377ae40c67d79f0a98c5bff3c59457b8", "rev": "7421424feb2e68a173f6fd218bbf71eb352404e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -726,11 +726,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1720244366, "lastModified": 1720823163,
"narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1720875497, "lastModified": 1721016451,
"narHash": "sha256-1Al1qDC8Q/s4viPq4ln8jfHWZxYl+Nb49dNFISFpqBY=", "narHash": "sha256-Cypl9ORr5UjtBsbjXMTJRepTe362yNVrPrntUvHiTaw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b729601a9e6c459fd8884dea513af143111bed54", "rev": "a14c5d651cee9ed70f9cd9e83f323f1e531002db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -774,11 +774,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1720768451, "lastModified": 1720957393,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,11 +851,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1720924256, "lastModified": 1721066749,
"narHash": "sha256-P9yElKsIEk6rp2AK3wf2vQQIlPh+BQQkvE+9BKg5BWs=", "narHash": "sha256-h3JuiB78SKuHFhp5E43pjNBX/GkOg8lfe2oHBlhBE7k=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "0284248320e1a72bb5823bd7005c6521c1c70857", "rev": "cf06d2ba3578dbb3b7c4b3c36623c825e32ec62a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1150,11 +1150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720920089, "lastModified": 1721006597,
"narHash": "sha256-L6y1TI4caiJwKQBiBhU748F5Cv6563el0QOh6Zapk3s=", "narHash": "sha256-cJQEx1PZUcuznnkQYgLOPCBrFrTUXwd9r+j7eI80xNY=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "b6655dcc31af1b20d4e112306c46c110ce5d967d", "rev": "26783d5f9c3edc01e14c80e260d1e81e53cd3ec9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1174,11 +1174,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1720799773, "lastModified": 1721070024,
"narHash": "sha256-JeQuI0LLjCdI1zgHQu9n0tA3CEz8EZ0qHUFAYqWURA0=", "narHash": "sha256-6pIyqkMmVf4AqNCrH0ZA/RBbQdV6m/j7AVwyaw4dzoE=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "ef50085f7b7136c1e1b26438141bb005743f38c1", "rev": "e6f9242eeb2e3ad96653f444428fd7663976d775",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
modules/nix.nix
View file

@ -40,6 +40,12 @@
programs.nix-index.enableBashIntegration = false; programs.nix-index.enableBashIntegration = false;
programs.nix-index.enableFishIntegration = false; programs.nix-index.enableFishIntegration = false;
system.activationScripts.diff = ''
if [[ -e /run/current-system ]]; then
${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
fi
'';
nix.settings = { nix.settings = {
trusted-users = [ "@wheel" ]; trusted-users = [ "@wheel" ];
accept-flake-config = true; accept-flake-config = true;

1
todo.md
View file

@ -5,6 +5,7 @@
## software ## software
- [ ] lid closed does not engage hyprlock? - [ ] lid closed does not engage hyprlock?
> check the logind conf in Nixos
- [ ] include langservers for enabled languages? - [ ] include langservers for enabled languages?
## hardware ## hardware