mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-01-06 21:17:31 -06:00
Compare commits
7 commits
82f8f5b8a4
...
a39ecfa546
Author | SHA1 | Date | |
---|---|---|---|
a39ecfa546 | |||
a3b4ea2046 | |||
d7f3c7de3c | |||
d936ff9efa | |||
e3d0f01692 | |||
a811930cd2 | |||
8b435e6eea |
6 changed files with 109 additions and 87 deletions
126
flake.lock
126
flake.lock
|
@ -41,11 +41,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734400729,
|
||||
"narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=",
|
||||
"lastModified": 1734906446,
|
||||
"narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "a132fa41be7ebe797ad758e84d9df068151a723b",
|
||||
"rev": "eecb74dc79bb6752a2a507e6edee3042390a6091",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -279,11 +279,11 @@
|
|||
"zig": "zig"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734447452,
|
||||
"narHash": "sha256-wVGyEbQfWACCiA1xVOFi6WRJbIIm/F5EjsdIekqWAqY=",
|
||||
"lastModified": 1735053980,
|
||||
"narHash": "sha256-SEaK0ZkIT+2+Z6naqAsCxTC49jAVgtWmllyz4yT+580=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "2725d5ecb3140ffcdc6700b58f70a89bf8d14a36",
|
||||
"revCount": 8315,
|
||||
"rev": "f46a67696ec8606681f38f559e80e5eb95e04c4a",
|
||||
"revCount": 8431,
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||
},
|
||||
|
@ -330,11 +330,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734364709,
|
||||
"narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=",
|
||||
"lastModified": 1734906540,
|
||||
"narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a",
|
||||
"rev": "69270ba8f057d55b0e6c2dca0e165d652856e613",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -359,11 +359,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733684019,
|
||||
"narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=",
|
||||
"lastModified": 1734906236,
|
||||
"narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d",
|
||||
"rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -388,11 +388,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734456362,
|
||||
"narHash": "sha256-vjAZEoZIZKGV/djEEBy3jj7GKcAXY2FuC5a4fB3fxOY=",
|
||||
"lastModified": 1734988658,
|
||||
"narHash": "sha256-L1qUns92rVum958hTKOJuU5wEYJdzZUCMGfYCHZ4fsU=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "5f1df55fcb45a72e92258113685aa9064f6ebf3e",
|
||||
"revCount": 5561,
|
||||
"rev": "2e2e2e2cad97eb017ab02f8a67b751e0abe3bb72",
|
||||
"revCount": 5584,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
@ -462,11 +462,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733940128,
|
||||
"narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=",
|
||||
"lastModified": 1734906472,
|
||||
"narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-qtutils",
|
||||
"rev": "3833097e50473a152dd614d4b468886840b4ea78",
|
||||
"rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -491,11 +491,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734364628,
|
||||
"narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=",
|
||||
"lastModified": 1734906259,
|
||||
"narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5",
|
||||
"rev": "0404833ea18d543df44df935ebf1b497310eb046",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -537,11 +537,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734384247,
|
||||
"narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=",
|
||||
"lastModified": 1734796073,
|
||||
"narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322",
|
||||
"rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -562,11 +562,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734384417,
|
||||
"narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=",
|
||||
"lastModified": 1734793513,
|
||||
"narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88",
|
||||
"rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -604,11 +604,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734264809,
|
||||
"narHash": "sha256-94fu5E0gM8aMY0bX/ix7BWGf/e/OfGjoCtNrJfwL0dM=",
|
||||
"lastModified": 1734869532,
|
||||
"narHash": "sha256-tMWJ1gDqNkCaH6jmZRXAUUhfhIrLMWJBiM+CtAtQqoY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "46bedda9e45f2735f41ec3c01cba2b8ce7ba9808",
|
||||
"rev": "1451a8a6902c85c90dae3c253df5401b7eb3581f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -779,11 +779,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734234111,
|
||||
"narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=",
|
||||
"lastModified": 1734838217,
|
||||
"narHash": "sha256-zvMLS8BGn+kMG7tLLT3PJ67/S9yqZ9B7V8hKBa9cRRY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d",
|
||||
"rev": "d583b2d142f0428313df099f4a2dcf2a0496aa78",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -814,11 +814,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1734119587,
|
||||
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
|
||||
"lastModified": 1734649271,
|
||||
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
|
||||
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -830,11 +830,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1734224914,
|
||||
"narHash": "sha256-hKWALzQ/RxxXdKWsLKXULru6XTag9Cc5exgVyS4a/AE=",
|
||||
"lastModified": 1734829460,
|
||||
"narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "538697b664a64fade8ce628d01f35d1f1fd82d77",
|
||||
"rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -867,11 +867,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734445283,
|
||||
"narHash": "sha256-EUiA7xmVzzc8BpGNltmtimACsK9+rM6w12ts3lPemII=",
|
||||
"lastModified": 1734896070,
|
||||
"narHash": "sha256-HECsyS551+KtffczDgx7w/xvruXHKoUf4JX7xW+Ecbo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "31b60284243f8b077894371f1ab3753dc26653c7",
|
||||
"rev": "8988b0603fed7e3d303718328cf4cd8dd137575e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -946,11 +946,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1734119587,
|
||||
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
|
||||
"lastModified": 1734649271,
|
||||
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
|
||||
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1007,11 +1007,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734379367,
|
||||
"narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=",
|
||||
"lastModified": 1734797603,
|
||||
"narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99",
|
||||
"rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1073,11 +1073,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733965552,
|
||||
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
|
||||
"lastModified": 1734546875,
|
||||
"narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
|
||||
"rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1088,11 +1088,11 @@
|
|||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1734202038,
|
||||
"narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=",
|
||||
"lastModified": 1734835170,
|
||||
"narHash": "sha256-JG6n9tQET7ZLjvwjH9BdYE6pES/Alcduxv2FDXliuBM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d",
|
||||
"rev": "6df924734e1b626efd70925545de844b1c25246f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1288,11 +1288,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734422917,
|
||||
"narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=",
|
||||
"lastModified": 1734907020,
|
||||
"narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87",
|
||||
"rev": "d7f18dda5e511749fa1511185db3536208fb1a63",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -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