mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-01-06 21:17:31 -06:00
Compare commits
6 commits
bfb1811e26
...
a3b4ea2046
| Author | SHA1 | Date | |
|---|---|---|---|
a3b4ea2046
|
|||
|
d7f3c7de3c
|
|||
|
d936ff9efa
|
|||
|
e3d0f01692
|
|||
|
a811930cd2
|
|||
|
8b435e6eea
|
6 changed files with 50 additions and 28 deletions
|
|
@ -914,16 +914,16 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1734126203,
|
||||
"narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
|
||||
"lastModified": 1734649271,
|
||||
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
|
||||
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
outputs = inputs: (import ./lib inputs).oizysFlake;
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,21 @@ 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
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -45,4 +60,10 @@ in
|
|||
users.users.daylin = {
|
||||
extraGroups = [ "libvirtd" ];
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.runCommand "windows-vm-desktop-item" { } ''
|
||||
install -Dm444 -t $out/share/applications ${windows-desktopItem}/share/applications/*.desktop
|
||||
'')
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,34 @@
|
|||
{
|
||||
config,
|
||||
mkOizysModule,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
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
|
||||
mkOizysModule config "vbox" {
|
||||
# environment.systemPackages = [ win10vm ];
|
||||
virtualisation.virtualbox = {
|
||||
host.enable = true;
|
||||
};
|
||||
users.extraGroups.vboxusers.members = [ "daylin" ];
|
||||
environment.systemPackages = [ win10vm ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,12 @@
|
|||
}:
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "nimble";
|
||||
version = "0.16.4";
|
||||
version = "0.16.4-unstable";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = "nimble";
|
||||
rev = "v${finalAttrs.version}";
|
||||
rev = "30e7014c8ea865f3b9fc051824fe6dbc6b1d917c";
|
||||
# rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ASodRov4rO/IhjQRRdqVnLWMG1voXWM9F6R6VJd9qkM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
|
|
|||
1
todo.md
1
todo.md
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
## software
|
||||
|
||||
- [ ] switch systemd desktop file to libvirt VM
|
||||
- [ ] why is my update ci always building llm and rofi?
|
||||
- [ ] include langservers for enabled languages?
|
||||
<!--[tracking issue](https://github.com/wez/wezterm/issues/5990)-->
|
||||
|
|
|
|||
Loading…
Reference in a new issue