daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-01-09 06:27:31 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:a3b4ea2046fb887c85f24d01ea4de1a0fbe74f6b
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:bfb1811e26968dd3fd0183584966b7e5299fd25d
Branches Tags
daylin:main
daylin:flake-lock

No commits in common. "a3b4ea2046fb887c85f24d01ea4de1a0fbe74f6b" and "bfb1811e26968dd3fd0183584966b7e5299fd25d" have entirely different histories.
a3b4ea2046 ... bfb1811e26

6 changed files with 28 additions and 50 deletions
Show stats Expand all files Collapse all files

8
flake.lock
View file

@ -914,16 +914,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1734126203,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
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/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
stable.url = "github:nixos/nixpkgs/nixos-24.05"; stable.url = "github:nixos/nixpkgs/nixos-24.05";
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable"; my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";

21
hosts/othalan/virt/default.nix
View file

@ -15,21 +15,6 @@ let
} }
); );
}; };
windows10Logo = pkgs.fetchurl {
url = "https://upload.wikimedia.org/wikipedia/commons/c/c7/Windows_logo_-_2012.png";
hash = "sha256-uVNgGUo0NZN+mUmvMzyk0HKnhx64uqT4YWGSdeBz3T4=";
};
windows-desktopItem = pkgs.makeDesktopItem {
name = "win11-vm";
exec = ''
${pkgs.bash}/bin/sh -c "${pkgs.libvirt}/bin/virsh start win11 && ${pkgs.virt-viewer}/bin/virt-viewer --wait -c qemu:///system win11 && ${pkgs.libvirt}/bin/virsh shutdown win11"
'';
icon = "${windows10Logo}";
desktopName = "Windows 11 VM";
};
in in
{ {
imports = [ imports = [
@ -60,10 +45,4 @@ in
users.users.daylin = { users.users.daylin = {
extraGroups = [ "libvirtd" ]; extraGroups = [ "libvirtd" ];
}; };
environment.systemPackages = [
(pkgs.runCommand "windows-vm-desktop-item" { } ''
install -Dm444 -t $out/share/applications ${windows-desktopItem}/share/applications/*.desktop
'')
];
} }

41
modules/virtualization/virtualbox.nix
View file

@ -1,34 +1,35 @@
{ {
config, config,
mkOizysModule, mkOizysModule,
pkgs,
... ...
}: }:
let let
# win10vm = pkgs.stdenvNoCC.mkDerivation rec {
# name = "win10vm";
# unpackPhase = "true";
# version = "unstable";
# windows10Logo = pkgs.fetchurl {
# url = "https://upload.wikimedia.org/wikipedia/commons/c/c7/Windows_logo_-_2012.png";
# hash = "sha256-uVNgGUo0NZN+mUmvMzyk0HKnhx64uqT4YWGSdeBz3T4=";
# };
#
# desktopItem = pkgs.makeDesktopItem {
# name = "win10vm";
# exec = "VBoxManage startvm win10";
# icon = "${windows10Logo}";
# desktopName = "Windows 10 VM";
# };
# installPhase = ''
# install -Dm0644 {${desktopItem},$out}/share/applications/win10vm.desktop
# '';
# };
win10vm = pkgs.stdenvNoCC.mkDerivation rec {
name = "win10vm";
unpackPhase = "true";
version = "unstable";
windows10Logo = pkgs.fetchurl {
url = "https://upload.wikimedia.org/wikipedia/commons/c/c7/Windows_logo_-_2012.png";
hash = "sha256-uVNgGUo0NZN+mUmvMzyk0HKnhx64uqT4YWGSdeBz3T4=";
};
desktopItem = pkgs.makeDesktopItem {
name = "win10vm";
exec = "VBoxManage startvm win10";
icon = "${windows10Logo}";
desktopName = "Windows 10 VM";
};
installPhase = ''
install -Dm0644 {${desktopItem},$out}/share/applications/win10vm.desktop
'';
};
in in
mkOizysModule config "vbox" { mkOizysModule config "vbox" {
# environment.systemPackages = [ win10vm ];
virtualisation.virtualbox = { virtualisation.virtualbox = {
host.enable = true; host.enable = true;
}; };
users.extraGroups.vboxusers.members = [ "daylin" ]; users.extraGroups.vboxusers.members = [ "daylin" ];
environment.systemPackages = [ win10vm ];
} }

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

@ -10,12 +10,11 @@
}: }:
buildNimPackage (finalAttrs: { buildNimPackage (finalAttrs: {
pname = "nimble"; pname = "nimble";
version = "0.16.4-unstable"; version = "0.16.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nim-lang"; owner = "nim-lang";
repo = "nimble"; repo = "nimble";
rev = "30e7014c8ea865f3b9fc051824fe6dbc6b1d917c"; rev = "v${finalAttrs.version}";
# rev = "v${finalAttrs.version}";
hash = "sha256-ASodRov4rO/IhjQRRdqVnLWMG1voXWM9F6R6VJd9qkM="; hash = "sha256-ASodRov4rO/IhjQRRdqVnLWMG1voXWM9F6R6VJd9qkM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

1
todo.md
View file

@ -6,7 +6,6 @@
## software ## software
- [ ] switch systemd desktop file to libvirt VM
- [ ] why is my update ci always building llm and rofi? - [ ] why is my update ci always building llm and rofi?
- [ ] include langservers for enabled languages? - [ ] include langservers for enabled languages?
<!--[tracking issue](https://github.com/wez/wezterm/issues/5990)--> <!--[tracking issue](https://github.com/wez/wezterm/issues/5990)-->