Compare commits

..

2 commits

Author SHA1 Message Date
9e3eefee6a
put win10vm in proper module 2024-06-03 10:30:27 -05:00
e1171c8f73
flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=df6ebe358b30ee7b49f296e05763e5e4b0edce98' (2024-05-31)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=358e59e69d27a69381bc0872b5b8d1184bc6b6a1' (2024-06-02)
• Updated input 'hyprman':
    'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=f698f2614e8cadbe0abf18b15f79182ede7f17e7' (2024-05-31)
  → 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=a32a141867476033bfb477966daef86a6126752c' (2024-06-01)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac' (2024-05-27)
  → 'github:nix-community/nix-index-database/972a52bee3991ae1f1899e6452e0d7c01ee566d9' (2024-06-02)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/29b0e679099147dd794ecff103078cd607147d70' (2024-05-31)
  → 'github:nix-community/nixpkgs-wayland/5862330fad43d7d2b973394d519b8d9263f2bb0b' (2024-06-03)
• Updated input 'nixpkgs-wayland/flake-compat':
    'github:nix-community/flake-compat/8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c' (2023-06-29)
  → 'github:nix-community/flake-compat/38fd3954cf65ce6faf3d0d45cd26059e059f07ea' (2024-06-02)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/dbc9130fe1455e0f6ee4d8f5f799f9be551f866b' (2024-05-26)
  → 'github:nix-community/lib-aggregate/64d43e2bbc6eab8d1cbdfba96d90a71e15a847d7' (2024-06-02)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/d0d27192931680482081aa1c38389da2af84a651' (2024-05-26)
  → 'github:nix-community/nixpkgs.lib/e090cb30ae82f4b4461aafdb808847c6c97b08c2' (2024-06-02)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b' (2024-05-29)
  → 'github:nixos/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8' (2024-05-31)
• Updated input 'stable':
    'github:nixos/nixpkgs/25cf937a30bf0801447f6bf544fc7486c6309234' (2024-05-29)
  → 'github:nixos/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446' (2024-05-31)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/50f279fd006c9da955755beb03a95acfe96d128c' (2024-05-31)
  → 'github:Cloudef/zig2nix/fdb81bd75a6ab5526aa2afbb79a91f7adcb79bbd' (2024-06-03)
• Updated input 'zls':
    'github:zigtools/zls/d2d5f43017e54e036df3c9cac365541ea5cabce9' (2024-05-30)
  → 'github:zigtools/zls/73e7db9cc92a10bfadacf060bb125b5f26a77db5' (2024-06-02)
• Updated input 'zls/langref':
    'https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in?narHash=sha256-Kz%2Bm9yeJgAsUfNwGG6ZDqZ3ElLZMeQmVYzgg0EEUzV4%3D'
  → 'https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in?narHash=sha256-O6p2tiKD8ZMhSX%2BDeA/o5hhAvcPkU2J9lFys/r11peY%3D'
• Updated input 'zls/zig-overlay':
    'github:mitchellh/zig-overlay/75299222cdd0680737fe8e556a259833386c42b9' (2024-05-30)
  → 'github:mitchellh/zig-overlay/a2933e55d939d4ce54dd1b2592b2d7e52f995943' (2024-06-01)
2024-06-03 10:17:36 -05:00
3 changed files with 59 additions and 58 deletions

View file

@ -36,11 +36,11 @@
}, },
"flake-compat_2": { "flake-compat_2": {
"locked": { "locked": {
"lastModified": 1688025799, "lastModified": 1717312683,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1717151932, "lastModified": 1717362715,
"narHash": "sha256-MwAAjC9AXaxxmvTMkgZZvdWaE/d7AfVd0L1NZtciRbY=", "narHash": "sha256-EnkKVUYqVfYqJso4t8ScuuMNEge7eybpdvtPCy4uwlc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "df6ebe358b30ee7b49f296e05763e5e4b0edce98", "rev": "358e59e69d27a69381bc0872b5b8d1184bc6b6a1",
"revCount": 4751, "revCount": 4756,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -362,11 +362,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717186228, "lastModified": 1717223303,
"narHash": "sha256-oRlJy5eEKikL9d92GbKNE5qMESB6amqxBaswxNJxjuE=", "narHash": "sha256-8i6f08zocjg9PUOxlhLksa5Ll63tqPS22aEEjk/YGPM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f698f2614e8cadbe0abf18b15f79182ede7f17e7", "rev": "a32a141867476033bfb477966daef86a6126752c",
"revCount": 6, "revCount": 9,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/hyprman.git" "url": "https://git.dayl.in/daylin/hyprman.git"
}, },
@ -403,13 +403,13 @@
"langref": { "langref": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-Kz+m9yeJgAsUfNwGG6ZDqZ3ElLZMeQmVYzgg0EEUzV4=", "narHash": "sha256-O6p2tiKD8ZMhSX+DeA/o5hhAvcPkU2J9lFys/r11peY=",
"type": "file", "type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
} }
}, },
"lib-aggregate": { "lib-aggregate": {
@ -418,11 +418,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1716725378, "lastModified": 1717330178,
"narHash": "sha256-bNTVDAVBLFSSTU+q54cJnntmFKBi+F/D8sSqlZwBGiM=", "narHash": "sha256-rRZjmC3xcPpHTJHnEy3T99O86Ecjao5YhakzaoNiRcs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "dbc9130fe1455e0f6ee4d8f5f799f9be551f866b", "rev": "64d43e2bbc6eab8d1cbdfba96d90a71e15a847d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716772633, "lastModified": 1717297675,
"narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -572,11 +572,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1716684580, "lastModified": 1717289404,
"narHash": "sha256-sIbMJWJr4hl2PWd9/iWlh89QfVzBn1NJ3u5RjeZADuM=", "narHash": "sha256-4q6ZO3BqHgdd3Aacb/xiQXB4g9TQKpQg/praTpD9vbI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "d0d27192931680482081aa1c38389da2af84a651", "rev": "e090cb30ae82f4b4461aafdb808847c6c97b08c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -593,11 +593,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1717161547, "lastModified": 1717396833,
"narHash": "sha256-tGy1fOl8X13md+FElOm/wjgeicNdgQeh3/WTZQro7uY=", "narHash": "sha256-vklpbXC62iKmpx63PRjQE+wqmencWZ7SICAuE6hy92M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "29b0e679099147dd794ecff103078cd607147d70", "rev": "5862330fad43d7d2b973394d519b8d9263f2bb0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -704,11 +704,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1716948383, "lastModified": 1717196966,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +791,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1716991068, "lastModified": 1717159533,
"narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -994,11 +994,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717070964, "lastModified": 1717201580,
"narHash": "sha256-lfaVbVY1Ckn/696ovjhDAIxE5U8evp0J/rMFnxnQpNE=", "narHash": "sha256-ZIg+6mVZouGoBXuoFO8/hnTwKHkFFSXoBV9xbqSrA0c=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "75299222cdd0680737fe8e556a259833386c42b9", "rev": "a2933e55d939d4ce54dd1b2592b2d7e52f995943",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1015,11 +1015,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717118232, "lastModified": 1717377184,
"narHash": "sha256-G/S0Ho6t6kJ9y0W3bDIquGPda3zcpbU1HNLjUzgkU30=", "narHash": "sha256-gQ7jfHipgl9ZJX9HLPiPi0JL6OckbPN4deBVp6vLJUg=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "50f279fd006c9da955755beb03a95acfe96d128c", "rev": "fdb81bd75a6ab5526aa2afbb79a91f7adcb79bbd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1039,11 +1039,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1717102432, "lastModified": 1717351634,
"narHash": "sha256-+mx8Mye0RO0wAuLEyZTuoyANK54XErDLDp5SVfkhE3E=", "narHash": "sha256-JDWL4gH1r2QnEbIqscmJ8DVk+nBBtXnFDNIGj1CwTVQ=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "d2d5f43017e54e036df3c9cac365541ea5cabce9", "rev": "73e7db9cc92a10bfadacf060bb125b5f26a77db5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,22 +4,7 @@
mkOizysModule, mkOizysModule,
... ...
}: }:
let
# TODO: polish this up
win10vm = pkgs.stdenvNoCC.mkDerivation {
name = "win10vm";
unpackPhase = "true";
buildPhase = "mkdir $out";
version = "unstable";
desktopItem = pkgs.makeDesktopItem {
name = "win10vm";
exec = "VBoxManage startvm win10";
# icon = ""; # TODO: add windows icon
desktopName = "Windows 10 VM";
};
};
in
mkOizysModule config "docker" { mkOizysModule config "docker" {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
environment.systemPackages = (with pkgs; [ lazydocker]) ++ [ win10vm]; environment.systemPackages = with pkgs; [ lazydocker];
} }

View file

@ -1,7 +1,23 @@
{ config, mkOizysModule, ... }: { config, mkOizysModule, pkgs,... }:
let
# TODO: polish this up
win10vm = pkgs.stdenvNoCC.mkDerivation {
name = "win10vm";
unpackPhase = "true";
buildPhase = "mkdir $out";
version = "unstable";
desktopItem = pkgs.makeDesktopItem {
name = "win10vm";
exec = "VBoxManage startvm win10";
# icon = ""; # TODO: add windows icon
desktopName = "Windows 10 VM";
};
};
in
mkOizysModule config "vbox" { mkOizysModule config "vbox" {
virtualisation.virtualbox = { virtualisation.virtualbox = {
host.enable = true; host.enable = true;
}; };
users.extraGroups.vboxusers.members = [ "daylin" ]; users.extraGroups.vboxusers.members = [ "daylin" ];
environment.systemPackages = [ win10vm ];
} }