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

Compare commits

base: daylin:0df4c078d7236432dd28bb24cc8af1d9398da860
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:194f86fdc295f8555490e5bd16f6ec0ae238aadd
Branches Tags
daylin:flake-lock
daylin:main

12 commits
0df4c078d7 ... 194f86fdc2

Author SHA1 Message Date
Daylin Morgan
194f86fdc2
showing build logs with nixos-rebuile 2024-05-22 11:46:32 -05:00
Daylin Morgan
4150669d29
add more verbose output support 2024-05-22 10:58:53 -05:00
Daylin Morgan
7e15843425
correct column generator 2024-05-22 10:56:43 -05:00
Daylin Morgan
2c6a0ca733
flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=f8857e6072bd85b95393499688872aaf7f088b5b' (2024-05-18)
  → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=93fea890433ec11d7a915f5e0466b2e8b513e895' (2024-05-22)
• Updated input 'hyprland/hyprwayland-scanner':
    'github:hyprwm/hyprwayland-scanner/f5181a068c1b06f2db51f6222e50a0c665a2b0c3' (2024-05-16)
  → 'github:hyprwm/hyprwayland-scanner/3afed4364790aebe0426077631af1e164a9650cc' (2024-05-18)
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15)
  → 'github:NixOS/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1' (2024-05-19)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/af7c87a32f5d67eb2ada908a6a700f4e74831943' (2024-05-15)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/91e48d6acd8a5a611d26f925e51559ab743bc438' (2024-05-21)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/46d2206858657d439792926958f52b037534de49' (2024-05-13)
  → 'github:hyprwm/contrib/33b38358559054d316eb605ccb733980dfa7dc63' (2024-05-20)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5a5ac83292c7842072318f57d68a48474f8bd34d' (2024-05-20)
  → 'github:nixos/nixpkgs/e381a1288138aceda0ac63db32c7be545b446921' (2024-05-21)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/1f8249e3f475ce6aa597c79288e90af929226dd7' (2024-05-20)
  → 'github:nix-community/nixpkgs-wayland/6be06ebfa6f821ef59fe0fb724683f2f5c40a217' (2024-05-22)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1' (2024-05-19)
  → 'github:nixos/nixpkgs/3eaeaeb6b1e08a016380c279f8846e0bd8808916' (2024-05-21)
• Updated input 'stable':
    'github:nixos/nixpkgs/e7cc61784ddf51c81487637b3031a6dd2d6673a2' (2024-05-18)
  → 'github:nixos/nixpkgs/a8695cbd09a7ecf3376bd62c798b9864d20f86ee' (2024-05-20)
• Updated input 'zls':
    'github:zigtools/zls/b9bf764be9320a00a1dc01059c67d4496648288b' (2024-05-20)
  → 'github:zigtools/zls/93b7bbd0d96ee7088c46d1373a2810e84f7d47be' (2024-05-22)
 2024-05-22 10:33:09 -05:00
Daylin Morgan
d5c40e5bb0
actually suppress direnv output 2024-05-22 10:32:47 -05:00
Daylin Morgan
9bdcd6bfec
wasn't working in alacritty anyways and hide_env_diff should work somehow... 2024-05-21 16:09:54 -05:00
Daylin Morgan
fbb6c7d56c
mako works like dunst *shrug* 2024-05-21 16:09:35 -05:00
Daylin Morgan
895ff4b62b
add eza to play around 2024-05-21 13:53:24 -05:00
Daylin Morgan
dc55710fc8
flake.lock: Update 
Flake lock file updates:

• Updated input 'f1multiviewer':
    'github:daylinmorgan/f1multiviewer-flake/7d3171782d6324844e38fa940d8d8a3e9193dacb' (2024-05-14)
  → 'github:daylinmorgan/f1multiviewer-flake/89653c7aa046dd23fd61b2ddae6c55725857b224' (2024-05-21)
 2024-05-21 13:43:30 -05:00
Daylin Morgan
f5f2e780d3
dunst -> mako 2024-05-20 11:58:50 -05:00
Daylin Morgan
0cb59f1211
flake.lock: Update 
Flake lock file updates:

• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/6b94c48c3bb22d5181333c3fb71beff44116e251' (2024-05-19)
  → 'github:nix-community/nix-index-database/e0638db3db43b582512a7de8c0f8363a162842b9' (2024-05-20)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/8535fb92661f37ff9f0da3007fbc942f7d134b41' (2024-05-19)
  → 'github:nixos/nixpkgs/5a5ac83292c7842072318f57d68a48474f8bd34d' (2024-05-20)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/6c12f5c0f7dc6d94c332233dbaf67ce1165eadcb' (2024-05-19)
  → 'github:nix-community/nixpkgs-wayland/1f8249e3f475ce6aa597c79288e90af929226dd7' (2024-05-20)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/4a6b83b05df1a8bd7d99095ec4b4d271f2956b64' (2024-05-17)
  → 'github:nixos/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1' (2024-05-19)
• Updated input 'zls':
    'github:zigtools/zls/ab928b51c6e48b2f4cca2e58c332cea75d683d17' (2024-05-15)
  → 'github:zigtools/zls/b9bf764be9320a00a1dc01059c67d4496648288b' (2024-05-20)
 2024-05-20 11:38:33 -05:00
Daylin Morgan
5edff594a8
add todo 2024-05-20 11:29:13 -05:00
5 changed files with 77 additions and 62 deletions
Show stats Expand all files Collapse all files

74
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1715708612,
"narHash": "sha256-HciqBFYFlNFT/dqoHrJRK0h99TeUEEYH33BQLiFEdSs=",
"lastModified": 1716316901,
"narHash": "sha256-AWzUBSlgPVszYMk611mHgoHCA/hXjzos50KvKJfHCs8=",
"owner": "daylinmorgan",
"repo": "f1multiviewer-flake",
"rev": "7d3171782d6324844e38fa940d8d8a3e9193dacb",
"rev": "89653c7aa046dd23fd61b2ddae6c55725857b224",
"type": "github"
},
"original": {
@ -233,11 +233,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1716063601,
"narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=",
"lastModified": 1716365376,
"narHash": "sha256-941FKboG8Wc/hb1wvrEEKnC4DwDlSLgrjRL+whgWwUU=",
"ref": "refs/heads/main",
"rev": "f8857e6072bd85b95393499688872aaf7f088b5b",
"revCount": 4719,
"rev": "93fea890433ec11d7a915f5e0466b2e8b513e895",
"revCount": 4724,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -253,11 +253,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1715621965,
"narHash": "sha256-S5Wzi3hhFOiCaeZqmx3zBdrv8KzaEafD5hCfY8ixz0A=",
"lastModified": 1716228712,
"narHash": "sha256-y+LOXuSRMfkR2Vfwl5K2NVrszi1h5MJpML+msLnVS8U=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "46d2206858657d439792926958f52b037534de49",
"rev": "33b38358559054d316eb605ccb733980dfa7dc63",
"type": "github"
},
"original": {
@ -330,11 +330,11 @@
]
},
"locked": {
"lastModified": 1715879663,
"narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=",
"lastModified": 1716058375,
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3",
"rev": "3afed4364790aebe0426077631af1e164a9650cc",
"type": "github"
},
"original": {
@ -464,11 +464,11 @@
]
},
"locked": {
"lastModified": 1716088072,
"narHash": "sha256-ZXzV39r4ShjS6lvhOX+oN0Vazg5A/zibJDzE2r1jlRM=",
"lastModified": 1716170277,
"narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "6b94c48c3bb22d5181333c3fb71beff44116e251",
"rev": "e0638db3db43b582512a7de8c0f8363a162842b9",
"type": "github"
},
"original": {
@ -516,11 +516,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1716128119,
"narHash": "sha256-APMa1xFnUIaYfZUaG8PyrHVlLP9ckm7S80k2TUnWjXg=",
"lastModified": 1716387383,
"narHash": "sha256-9QQMKCBlm4eDRHnI6B6gTQBfd6j1zjOBEgyvMFkAEKw=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "6c12f5c0f7dc6d94c332233dbaf67ce1165eadcb",
"rev": "6be06ebfa6f821ef59fe0fb724683f2f5c40a217",
"type": "github"
},
"original": {
@ -531,11 +531,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1715787315,
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github"
},
"original": {
@ -579,11 +579,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1716097317,
"narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=",
"lastModified": 1716312448,
"narHash": "sha256-PH3w5av8d+TdwCkiWN4UPBTxrD9MpxIQPDVWctlomVo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41",
"rev": "e381a1288138aceda0ac63db32c7be545b446921",
"type": "github"
},
"original": {
@ -611,11 +611,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1715961556,
"narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
"lastModified": 1716293225,
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
"rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
"type": "github"
},
"original": {
@ -643,11 +643,11 @@
},
"stable": {
"locked": {
"lastModified": 1716061101,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
"lastModified": 1716218643,
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
"type": "github"
},
"original": {
@ -793,11 +793,11 @@
]
},
"locked": {
"lastModified": 1715788457,
"narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=",
"lastModified": 1716290197,
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943",
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
"type": "github"
},
"original": {
@ -861,11 +861,11 @@
"zig-overlay": "zig-overlay"
},
"locked": {
"lastModified": 1715784956,
"narHash": "sha256-wERqpg+WOmqwQ9FfsYoQzZI/INbp3zD5otf+VeiXXtA=",
"lastModified": 1716388773,
"narHash": "sha256-SPljq7YPCRKYckkuCSKus17n1itEhu4nsw8YM+Jk0+A=",
"owner": "zigtools",
"repo": "zls",
"rev": "ab928b51c6e48b2f4cca2e58c332cea75d683d17",
"rev": "93b7bbd0d96ee7088c46d1373a2810e84f7d47be",
"type": "github"
},
"original": {

2
modules/desktop/window-managers/hyprland.nix
View file

@ -32,7 +32,7 @@ mkOizysModule config "hyprland" {
# notifications
libnotify
dunst
mako
# utils
grimblast

42
modules/development/cli.nix
View file

@ -2,29 +2,37 @@
inputs,
pkgs,
config,
enabled,
mkDefaultOizysModule,
...
}:
mkDefaultOizysModule config "cli" {
programs.direnv.enable = true;
environment.sessionVariables = {
DIRENV_LOG_FORMAT = "direnv: %s";
programs.direnv = enabled;
environment.etc = {
"direnv/direnv.toml".text = ''
[global]
hide_env_diff=true
'';
};
environment.systemPackages = with pkgs; [
chezmoi
zoxide
lsd
fzf
environment.systemPackages =
(with pkgs; [
chezmoi
zoxide
lsd
fzf
eza
# utils
fd
bat
delta
ripgrep
# utils
fd
bat
delta
ripgrep
glow
btop
inputs.tsm.packages.${pkgs.system}.tsm
];
glow
btop
])
++ [ inputs.tsm.packages.${pkgs.system}.tsm ];
}

17
pkgs/oizys/oizys-go/pkg/oizys.go
View file

@ -17,6 +17,7 @@ import (
"github.com/briandowns/spinner"
)
// verbose vs debug?
type Oizys struct {
flake string
host string
@ -117,7 +118,7 @@ func ellipsis(s string, maxLen int) string {
func (p *packages) show(verbose bool) {
p.summary()
if !verbose {
if !verbose || (len(p.names) == 0) {
return
}
@ -127,7 +128,7 @@ func (p *packages) show(verbose bool) {
fmt.Printf("%s\n", strings.Repeat("-", w))
for i, pkg := range pkgs {
fmt.Printf("%-*s", p.pad, pkg)
if i%nCols == 0 {
if (i+1)%nCols == 0 {
fmt.Println()
}
}
@ -189,17 +190,18 @@ func parseDryRun(buf string) (*packages, *packages) {
}
}
if len(parts[0]) + len(parts[1]) == 0 {
if len(parts[0])+len(parts[1]) == 0 {
log.Println("no changes...")
log.Println("or I failed to parse it into the expected number of parts")
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) {
toBuild, toFetch := parseDryRun(nixOutput)
toBuild, toFetch := parseDryRun(nixOutput)
toBuild.show(verbose)
toFetch.show(verbose)
}
@ -228,6 +230,10 @@ func (o *Oizys) NixosRebuild(subcmd string, rest ...string) {
o.flake,
}
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...)
runCommand(cmd)
}
@ -258,7 +264,6 @@ func (o *Oizys) CacheBuild(rest ...string) {
runCommand(cmd)
}
func (o *Oizys) CheckFlake() {
if _, err := os.Stat(o.flake); errors.Is(err, fs.ErrNotExist) {
log.Fatalln("path to flake:", o.flake, "does not exist")

4
todo.md
View file

@ -2,11 +2,13 @@
- [ ] go back to latest kernel when VirtualBox Upgrade is merged
- [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`,
possibly resolved with latest kernel, see above
| kernel: ucsi_acpi USBC000:00: possible UCSI driver bug 2
| 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 -->