mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-27 14:10:45 -06:00
Compare commits
12 commits
0df4c078d7
...
194f86fdc2
Author | SHA1 | Date | |
---|---|---|---|
194f86fdc2 | |||
4150669d29 | |||
7e15843425 | |||
2c6a0ca733 | |||
d5c40e5bb0 | |||
9bdcd6bfec | |||
fbb6c7d56c | |||
895ff4b62b | |||
dc55710fc8 | |||
f5f2e780d3 | |||
0cb59f1211 | |||
5edff594a8 |
5 changed files with 77 additions and 62 deletions
74
flake.lock
74
flake.lock
|
@ -5,11 +5,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715708612,
|
"lastModified": 1716316901,
|
||||||
"narHash": "sha256-HciqBFYFlNFT/dqoHrJRK0h99TeUEEYH33BQLiFEdSs=",
|
"narHash": "sha256-AWzUBSlgPVszYMk611mHgoHCA/hXjzos50KvKJfHCs8=",
|
||||||
"owner": "daylinmorgan",
|
"owner": "daylinmorgan",
|
||||||
"repo": "f1multiviewer-flake",
|
"repo": "f1multiviewer-flake",
|
||||||
"rev": "7d3171782d6324844e38fa940d8d8a3e9193dacb",
|
"rev": "89653c7aa046dd23fd61b2ddae6c55725857b224",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -233,11 +233,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716063601,
|
"lastModified": 1716365376,
|
||||||
"narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=",
|
"narHash": "sha256-941FKboG8Wc/hb1wvrEEKnC4DwDlSLgrjRL+whgWwUU=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "f8857e6072bd85b95393499688872aaf7f088b5b",
|
"rev": "93fea890433ec11d7a915f5e0466b2e8b513e895",
|
||||||
"revCount": 4719,
|
"revCount": 4724,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
@ -253,11 +253,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715621965,
|
"lastModified": 1716228712,
|
||||||
"narHash": "sha256-S5Wzi3hhFOiCaeZqmx3zBdrv8KzaEafD5hCfY8ixz0A=",
|
"narHash": "sha256-y+LOXuSRMfkR2Vfwl5K2NVrszi1h5MJpML+msLnVS8U=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "46d2206858657d439792926958f52b037534de49",
|
"rev": "33b38358559054d316eb605ccb733980dfa7dc63",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -330,11 +330,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715879663,
|
"lastModified": 1716058375,
|
||||||
"narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=",
|
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwayland-scanner",
|
"repo": "hyprwayland-scanner",
|
||||||
"rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3",
|
"rev": "3afed4364790aebe0426077631af1e164a9650cc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -464,11 +464,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716088072,
|
"lastModified": 1716170277,
|
||||||
"narHash": "sha256-ZXzV39r4ShjS6lvhOX+oN0Vazg5A/zibJDzE2r1jlRM=",
|
"narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "6b94c48c3bb22d5181333c3fb71beff44116e251",
|
"rev": "e0638db3db43b582512a7de8c0f8363a162842b9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -516,11 +516,11 @@
|
||||||
"nixpkgs": "nixpkgs_7"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716128119,
|
"lastModified": 1716387383,
|
||||||
"narHash": "sha256-APMa1xFnUIaYfZUaG8PyrHVlLP9ckm7S80k2TUnWjXg=",
|
"narHash": "sha256-9QQMKCBlm4eDRHnI6B6gTQBfd6j1zjOBEgyvMFkAEKw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "6c12f5c0f7dc6d94c332233dbaf67ce1165eadcb",
|
"rev": "6be06ebfa6f821ef59fe0fb724683f2f5c40a217",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -531,11 +531,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715787315,
|
"lastModified": 1716137900,
|
||||||
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
|
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
|
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -579,11 +579,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716097317,
|
"lastModified": 1716312448,
|
||||||
"narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=",
|
"narHash": "sha256-PH3w5av8d+TdwCkiWN4UPBTxrD9MpxIQPDVWctlomVo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41",
|
"rev": "e381a1288138aceda0ac63db32c7be545b446921",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -611,11 +611,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715961556,
|
"lastModified": 1716293225,
|
||||||
"narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
|
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
|
"rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -643,11 +643,11 @@
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716061101,
|
"lastModified": 1716218643,
|
||||||
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
|
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
|
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -793,11 +793,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715788457,
|
"lastModified": 1716290197,
|
||||||
"narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=",
|
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943",
|
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -861,11 +861,11 @@
|
||||||
"zig-overlay": "zig-overlay"
|
"zig-overlay": "zig-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715784956,
|
"lastModified": 1716388773,
|
||||||
"narHash": "sha256-wERqpg+WOmqwQ9FfsYoQzZI/INbp3zD5otf+VeiXXtA=",
|
"narHash": "sha256-SPljq7YPCRKYckkuCSKus17n1itEhu4nsw8YM+Jk0+A=",
|
||||||
"owner": "zigtools",
|
"owner": "zigtools",
|
||||||
"repo": "zls",
|
"repo": "zls",
|
||||||
"rev": "ab928b51c6e48b2f4cca2e58c332cea75d683d17",
|
"rev": "93b7bbd0d96ee7088c46d1373a2810e84f7d47be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -32,7 +32,7 @@ mkOizysModule config "hyprland" {
|
||||||
|
|
||||||
# notifications
|
# notifications
|
||||||
libnotify
|
libnotify
|
||||||
dunst
|
mako
|
||||||
|
|
||||||
# utils
|
# utils
|
||||||
grimblast
|
grimblast
|
||||||
|
|
|
@ -2,20 +2,28 @@
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
|
enabled,
|
||||||
mkDefaultOizysModule,
|
mkDefaultOizysModule,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
mkDefaultOizysModule config "cli" {
|
mkDefaultOizysModule config "cli" {
|
||||||
programs.direnv.enable = true;
|
|
||||||
environment.sessionVariables = {
|
programs.direnv = enabled;
|
||||||
DIRENV_LOG_FORMAT = "[2mdirenv: %s[0m";
|
|
||||||
|
environment.etc = {
|
||||||
|
"direnv/direnv.toml".text = ''
|
||||||
|
[global]
|
||||||
|
hide_env_diff=true
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages =
|
||||||
|
(with pkgs; [
|
||||||
chezmoi
|
chezmoi
|
||||||
zoxide
|
zoxide
|
||||||
lsd
|
lsd
|
||||||
fzf
|
fzf
|
||||||
|
eza
|
||||||
|
|
||||||
# utils
|
# utils
|
||||||
fd
|
fd
|
||||||
|
@ -25,6 +33,6 @@ mkDefaultOizysModule config "cli" {
|
||||||
|
|
||||||
glow
|
glow
|
||||||
btop
|
btop
|
||||||
inputs.tsm.packages.${pkgs.system}.tsm
|
])
|
||||||
];
|
++ [ inputs.tsm.packages.${pkgs.system}.tsm ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ import (
|
||||||
"github.com/briandowns/spinner"
|
"github.com/briandowns/spinner"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// verbose vs debug?
|
||||||
type Oizys struct {
|
type Oizys struct {
|
||||||
flake string
|
flake string
|
||||||
host string
|
host string
|
||||||
|
@ -117,7 +118,7 @@ func ellipsis(s string, maxLen int) string {
|
||||||
|
|
||||||
func (p *packages) show(verbose bool) {
|
func (p *packages) show(verbose bool) {
|
||||||
p.summary()
|
p.summary()
|
||||||
if !verbose {
|
if !verbose || (len(p.names) == 0) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,7 +128,7 @@ func (p *packages) show(verbose bool) {
|
||||||
fmt.Printf("%s\n", strings.Repeat("-", w))
|
fmt.Printf("%s\n", strings.Repeat("-", w))
|
||||||
for i, pkg := range pkgs {
|
for i, pkg := range pkgs {
|
||||||
fmt.Printf("%-*s", p.pad, pkg)
|
fmt.Printf("%-*s", p.pad, pkg)
|
||||||
if i%nCols == 0 {
|
if (i+1)%nCols == 0 {
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -195,7 +196,8 @@ func parseDryRun(buf string) (*packages, *packages) {
|
||||||
log.Fatalln("failed to parse nix build --dry-run output")
|
log.Fatalln("failed to parse nix build --dry-run output")
|
||||||
}
|
}
|
||||||
|
|
||||||
return parsePackages(parts[0], "packages to build"), parsePackages(parts[1], "packages to fetch")
|
return parsePackages(parts[0], "packages to build"),
|
||||||
|
parsePackages(parts[1], "packages to fetch")
|
||||||
}
|
}
|
||||||
|
|
||||||
func showDryRunResult(nixOutput string, verbose bool) {
|
func showDryRunResult(nixOutput string, verbose bool) {
|
||||||
|
@ -228,6 +230,10 @@ func (o *Oizys) NixosRebuild(subcmd string, rest ...string) {
|
||||||
o.flake,
|
o.flake,
|
||||||
}
|
}
|
||||||
args = append(args, rest...)
|
args = append(args, rest...)
|
||||||
|
if o.verbose {
|
||||||
|
args = append(args, "--print-build-logs")
|
||||||
|
fmt.Println("CMD:", "sudo", strings.Join(args, " "))
|
||||||
|
}
|
||||||
cmd := exec.Command("sudo", args...)
|
cmd := exec.Command("sudo", args...)
|
||||||
runCommand(cmd)
|
runCommand(cmd)
|
||||||
}
|
}
|
||||||
|
@ -258,7 +264,6 @@ func (o *Oizys) CacheBuild(rest ...string) {
|
||||||
runCommand(cmd)
|
runCommand(cmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func (o *Oizys) CheckFlake() {
|
func (o *Oizys) CheckFlake() {
|
||||||
if _, err := os.Stat(o.flake); errors.Is(err, fs.ErrNotExist) {
|
if _, err := os.Stat(o.flake); errors.Is(err, fs.ErrNotExist) {
|
||||||
log.Fatalln("path to flake:", o.flake, "does not exist")
|
log.Fatalln("path to flake:", o.flake, "does not exist")
|
||||||
|
|
4
todo.md
4
todo.md
|
@ -2,11 +2,13 @@
|
||||||
|
|
||||||
- [ ] go back to latest kernel when VirtualBox Upgrade is merged
|
- [ ] go back to latest kernel when VirtualBox Upgrade is merged
|
||||||
- [PR #311362](https://github.com/NixOS/nixpkgs/pull/311362)
|
- [PR #311362](https://github.com/NixOS/nixpkgs/pull/311362)
|
||||||
- [ ] figure out why dunst notifications are so large
|
|
||||||
|
|
||||||
- [ ] monitor the presence of these kernel messages on `othalan`,
|
- [ ] monitor the presence of these kernel messages on `othalan`,
|
||||||
possibly resolved with latest kernel, see above
|
possibly resolved with latest kernel, see above
|
||||||
| kernel: ucsi_acpi USBC000:00: possible UCSI driver bug 2
|
| kernel: ucsi_acpi USBC000:00: possible UCSI driver bug 2
|
||||||
| kernel: ucsi_acpi USBC000:00: error -EINVAL: PPM init failed
|
| kernel: ucsi_acpi USBC000:00: error -EINVAL: PPM init failed
|
||||||
|
|
||||||
|
- [ ] trackdown wezterm clipboard problem (wayland/wezterm/hyprland?)
|
||||||
|
- [ ] make desktop application file for win10 vm
|
||||||
|
|
||||||
<!-- generated with <3 by daylinmorgan/todo -->
|
<!-- generated with <3 by daylinmorgan/todo -->
|
||||||
|
|
Loading…
Reference in a new issue