Compare commits

..

10 commits

Author SHA1 Message Date
b020fe0230
use cligen syntax 2024-09-04 14:21:02 -05:00
1f02f54ad1
don't remove git-templates
also don't remove anthing in /usr/share for now
2024-09-04 14:14:35 -05:00
739321c1b2
try this syntax 2024-09-04 14:04:08 -05:00
2f9b2d6841
update todos 2024-09-04 14:02:36 -05:00
8f9de113d3
add debug statement 2024-09-04 14:01:02 -05:00
036ca7b1e5
try not to delete /usr/share/git-core 2024-09-04 13:52:02 -05:00
7c37347ff3
switch to nixos-unstable 2024-09-04 13:45:59 -05:00
4fe095d087
don't mess with utils builders 2024-09-04 13:35:59 -05:00
1433aee6d3
actually proceed 2024-09-04 12:15:07 -05:00
745c91462b
try one more time 2024-09-04 12:09:11 -05:00
7 changed files with 58 additions and 29 deletions

View file

@ -41,18 +41,19 @@ runs:
$(non_manifest_packages) # > /dev/null $(non_manifest_packages) # > /dev/null
fi fi
GLOBIGNORE="/usr/share/git-core/**/*"
sudo rm -rf \ sudo rm -rf \
/var/lib/docker/ \ /var/lib/docker/ \
"$AGENT_TOOLSDIRECTORY" \ "$AGENT_TOOLSDIRECTORY" \
/opt \ /opt \
/usr/{local,share} & /usr/local/** &
# nix flake update wants to find git-core templates
# /usr/share/git-core/templates
# /usr/share/**
{ {
sudo swapoff -a sudo swapoff -a
sudo rm -f /mnt/swapfile sudo rm -f /mnt/swapfile
} & } &
wait wait
echo "... done" echo "... done"

View file

@ -6,7 +6,7 @@ on:
hosts: hosts:
description: 'list of hosts to build' description: 'list of hosts to build'
required: true required: true
default: 'othalan algiz' default: ',othalan,algiz'
type: string type: string
lockFile: lockFile:
description: 'flake.lock file' description: 'flake.lock file'
@ -16,7 +16,7 @@ on:
inputs: inputs:
hosts: hosts:
description: 'list of hosts to build' description: 'list of hosts to build'
default: 'othalan algiz' default: ',othalan,algiz'
type: string type: string
# concurrency: # concurrency:
@ -60,7 +60,7 @@ jobs:
nix run . \ nix run . \
-- \ -- \
build --minimal \ build --minimal \
--host "${{ inputs.hosts }}" \ --host,="${{ inputs.hosts }}" \
--flake . \ --flake . \
--debug \ --debug \
-- \ -- \

View file

@ -545,11 +545,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725465990, "lastModified": 1725469705,
"narHash": "sha256-+KN+E3B5lVxi5K0rrDC41l080n/r04LOpmfxK3ZJ058=", "narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "nim2nix", "repo": "nim2nix",
"rev": "cac4c7106ea09e04b4a555e4f957e38be65dfbb4", "rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
"type": "github"
},
"original": {
"owner": "daylinmorgan",
"repo": "nim2nix",
"type": "github"
}
},
"nim2nix_2": {
"inputs": {
"nixpkgs": [
"utils",
"nixpkgs"
]
},
"locked": {
"lastModified": 1725469705,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
"owner": "daylinmorgan",
"repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -752,16 +773,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1725194671, "lastModified": 1725103162,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -798,6 +819,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pixi": { "pixi": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1056,12 +1093,8 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"nim2nix": [ "nim2nix": "nim2nix_2",
"nim2nix" "nixpkgs": "nixpkgs_7"
],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1725378965, "lastModified": 1725378965,

View file

@ -4,7 +4,7 @@
outputs = inputs: (import ./lib inputs).oizysFlake; outputs = inputs: (import ./lib inputs).oizysFlake;
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
stable.url = "github:nixos/nixpkgs/nixos-23.11"; stable.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
@ -33,11 +33,6 @@
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
utils.url = "git+https://git.dayl.in/daylin/utils.git"; utils.url = "git+https://git.dayl.in/daylin/utils.git";
utils.inputs = {
nixpkgs.follows = "nixpkgs";
nim2nix.follows = "nim2nix";
};
nim2nix.inputs.nixpkgs.follows = "nixpkgs"; nim2nix.inputs.nixpkgs.follows = "nixpkgs";
hyprman.inputs.nixpkgs.follows = "nixpkgs"; hyprman.inputs.nixpkgs.follows = "nixpkgs";
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";

View file

@ -8,5 +8,5 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-n+K5hFiS1tEy2jDAoAoSgE75TCiqZK+al/0Mfc1d4kI="; nimbleDepsHash = "sha256-KErXGNNU5VVBHcvBmBhbagxZabHzajY5dF2OLHPmWf8=";
} }

View file

@ -53,6 +53,7 @@ proc cmpDrv(x, y: Derivation): int =
cmp(x.name, y.name) cmp(x.name, y.name)
proc parseDryRunOutput(err: string): DryRunOutput = proc parseDryRunOutput(err: string): DryRunOutput =
debug "parsing result of dry run"
let lines = err.strip().splitLines() let lines = err.strip().splitLines()
let theseLines = collect: let theseLines = collect:
for i, line in enumerate(lines): for i, line in enumerate(lines):
@ -238,8 +239,6 @@ proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) =
else: else:
cmd.addArgs nixosConfigAttrs() cmd.addArgs nixosConfigAttrs()
cmd.addArgs rest cmd.addArgs rest
debug cmd
quit QuitSuccess
let err = runCmd(cmd) let err = runCmd(cmd)
quit err quit err

View file

@ -3,10 +3,11 @@
## 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
## software ## software
- [ ] there seems tot be multiple version of mako - [ ] check if there are multiple version of mako?
- [ ] lid closed does not engage hyprlock? - [ ] lid closed does not engage hyprlock?
> check the logind conf in Nixos > check the logind conf in Nixos
- [ ] include langservers for enabled languages? - [ ] include langservers for enabled languages?