summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-11-08 15:58:13 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2024-11-08 15:58:13 +0100
commit5440c73f19ae9bfac70c79da83241c158ceb7d4a (patch)
tree040aeff551fcb65d4978782d7485ec9210752307
parentdf7627ba7cf12da86325e97a941df335ccbf092e (diff)
downloadnixos-5440c73f19ae9bfac70c79da83241c158ceb7d4a.tar
nixos-5440c73f19ae9bfac70c79da83241c158ceb7d4a.tar.gz
nixos-5440c73f19ae9bfac70c79da83241c158ceb7d4a.tar.bz2
nixos-5440c73f19ae9bfac70c79da83241c158ceb7d4a.tar.xz
nixos-5440c73f19ae9bfac70c79da83241c158ceb7d4a.zip
...
-rw-r--r--_sources/generated.json14
-rw-r--r--_sources/generated.nix8
-rw-r--r--accounts/gkleen@sif/default.nix34
-rw-r--r--accounts/gkleen@sif/libvirt/default.nix34
-rw-r--r--accounts/gkleen@sif/libvirt/pool-default.xml18
-rw-r--r--accounts/gkleen@sif/libvirt/vol-lmmirzm-vmrz01.xml17
-rw-r--r--nvfetcher.toml5
-rw-r--r--overlays/spice-record.nix12
8 files changed, 95 insertions, 47 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index d27b0387..db7ecb25 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -345,6 +345,20 @@
345 }, 345 },
346 "version": "2.4.0" 346 "version": "2.4.0"
347 }, 347 },
348 "spice-record": {
349 "cargoLocks": null,
350 "date": null,
351 "extract": null,
352 "name": "spice-record",
353 "passthru": null,
354 "pinned": false,
355 "src": {
356 "sha256": "sha256-7d/0fepOvdswuBGJCCMULB2kXOFBLP78yqX4NmByCF8=",
357 "type": "tarball",
358 "url": "https://github.com/JonathonReinhart/spice-record/archive/refs/tags/v0.2.1.tar.gz"
359 },
360 "version": "0.2.1"
361 },
348 "tomorrow-night-paradise-theme": { 362 "tomorrow-night-paradise-theme": {
349 "cargoLocks": null, 363 "cargoLocks": null,
350 "date": "2012-06-04", 364 "date": "2012-06-04",
diff --git a/_sources/generated.nix b/_sources/generated.nix
index edd35298..99eb7367 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -210,6 +210,14 @@
210 sha256 = "sha256-X0dWvx/v/wGEgPE6Cu5MN5ocnJeUi0iutrz72L+55aU="; 210 sha256 = "sha256-X0dWvx/v/wGEgPE6Cu5MN5ocnJeUi0iutrz72L+55aU=";
211 }; 211 };
212 }; 212 };
213 spice-record = {
214 pname = "spice-record";
215 version = "0.2.1";
216 src = fetchTarball {
217 url = "https://github.com/JonathonReinhart/spice-record/archive/refs/tags/v0.2.1.tar.gz";
218 sha256 = "sha256-7d/0fepOvdswuBGJCCMULB2kXOFBLP78yqX4NmByCF8=";
219 };
220 };
213 tomorrow-night-paradise-theme = { 221 tomorrow-night-paradise-theme = {
214 pname = "tomorrow-night-paradise-theme"; 222 pname = "tomorrow-night-paradise-theme";
215 version = "70225a5bf90d495e13a9260bfdc268632ece0801"; 223 version = "70225a5bf90d495e13a9260bfdc268632ece0801";
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 5bdd1651..189fabfa 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -698,16 +698,16 @@ in {
698 packages = with pkgs; [ 698 packages = with pkgs; [
699 fira fira-code powerline-fonts nerdfonts pwvucontrol 699 fira fira-code powerline-fonts nerdfonts pwvucontrol
700 wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl 700 wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl
701 pamixer libnotify screen-message wrappedYTMDesktop qt5ct 701 pamixer libnotify screen-message wrappedYTMDesktop
702 playerctl evince thunderbird zoom-us steam steam-run 702 libsForQt5.qt5ct playerctl evince thunderbird zoom-us steam
703 wireshark virt-manager rclone cached-nix-shell worktime 703 steam-run wireshark virt-manager rclone cached-nix-shell
704 fira-code-symbols libreoffice xournalpp google-chrome 704 worktime fira-code-symbols libreoffice xournalpp
705 nixos-shell virt-viewer freerdp gnome-icon-theme 705 google-chrome nixos-shell virt-viewer freerdp
706 paper-icon-theme sshpassSecret weechat element-desktop 706 gnome-icon-theme paper-icon-theme sshpassSecret weechat
707 matrix-synapse-tools.synadm 707 element-desktop matrix-synapse-tools.synadm
708 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs 708 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
709 sieve-connect gimp inkscape udiskie glab nitrokey-app 709 sieve-connect gimp inkscape udiskie glab nitrokey-app
710 pynitrokey gtklock wlrctl remmina openscad 710 pynitrokey gtklock wlrctl remmina openscad spice-record
711 ]; 711 ];
712 712
713 file = { 713 file = {
@@ -886,6 +886,24 @@ in {
886 StartupWMClass = "Element"; 886 StartupWMClass = "Element";
887 }; 887 };
888 }; 888 };
889 rainbow = {
890 name = "Rainbow";
891 exec = toString (pkgs.writeShellScript "rainbow" ''
892 exec -- \
893 ${config.systemd.package}/bin/systemd-run --wait --user --slice-inherit \
894 --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
895 --property 'Environment=DSCP=46' \
896 -- ${pkgs.dscp}/bin/dscp ${pkgs.google-chrome}/bin/google-chrome-stable \
897 --force-device-scale-factor=1.5 \
898 --class=Rainbow \
899 --kiosk "https://web.openrainbow.com" \
900 --user-data-dir=''${HOME}/.config/google-chrome-rainbow
901 '');
902 icon = pkgs.fetchurl {
903 url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
904 hash = "sha256-5fmo8rDqVDpzkGaPjk4Y+SsSZpAsY7VUQSFW6WdHwuU=";
905 };
906 };
889 }; 907 };
890 908
891 fonts = { 909 fonts = {
diff --git a/accounts/gkleen@sif/libvirt/default.nix b/accounts/gkleen@sif/libvirt/default.nix
index 54d971c4..076a0d86 100644
--- a/accounts/gkleen@sif/libvirt/default.nix
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -15,11 +15,13 @@ with flakeInputs.nixVirt.lib;
15 memory = { count = 16; unit = "GiB"; }; 15 memory = { count = 16; unit = "GiB"; };
16 storage_vol = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2"; 16 storage_vol = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
17 nvram_path = "/home/gkleen/.local/share/libvirt/lmmirzm-vmrz01.nvram"; 17 nvram_path = "/home/gkleen/.local/share/libvirt/lmmirzm-vmrz01.nvram";
18 virtio_net = true;
19 virtio_drive = true; 18 virtio_drive = true;
20 virtio_video = false; 19 virtio_video = false;
21 install_virtio = true; 20 install_virtio = false;
22 }) { 21 }) {
22 qemu-commandline.env = [
23 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
24 ];
23 vcpu.count = 4; 25 vcpu.count = 4;
24 os.bootmenu.enable = true; 26 os.bootmenu.enable = true;
25 devices.graphics = { 27 devices.graphics = {
@@ -27,18 +29,42 @@ with flakeInputs.nixVirt.lib;
27 # gl.enable = true; 29 # gl.enable = true;
28 }; 30 };
29 devices.interface = { 31 devices.interface = {
32 model.type = "virtio";
30 type = "bridge"; 33 type = "bridge";
31 mac.address = "52:54:00:b9:f3:ed"; 34 mac.address = "52:54:00:b9:f3:ed";
32 source.bridge = "gre-0971"; 35 source.bridge = "gre-0971";
33 }; 36 };
37 devices.channel = [
38 {
39 type = "unix";
40 target = { type = "virtio"; name = "org.qemu.guest_agent.0"; };
41 }
42 ];
43 devices.tpm.model = "tpm-tis";
34 }); 44 });
35 } 45 }
36 ]; 46 ];
37 pools = [ 47 pools = [
38 { definition = ./pool-default.xml; 48 { definition = pool.writeXML {
49 type = "dir";
50 name = "default";
51 uuid = "ad899c92-02e3-45f9-bf49-195467aba2e2";
52 target = {
53 path = "/home/gkleen/.local/share/libvirt/images";
54 };
55 };
39 active = true; 56 active = true;
40 volumes = [ 57 volumes = [
41 { definition = ./vol-lmmirzm-vmrz01.xml; 58 { definition = volume.writeXML {
59 type = "file";
60 name = "lmmirzm-vmrz01.qcow2";
61 capacity = { count = 40; unit = "GB"; };
62 target = {
63 path = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
64 format.type = "qcow2";
65 features.lazy_refcounts = {};
66 };
67 };
42 } 68 }
43 ]; 69 ];
44 } 70 }
diff --git a/accounts/gkleen@sif/libvirt/pool-default.xml b/accounts/gkleen@sif/libvirt/pool-default.xml
deleted file mode 100644
index 7303830b..00000000
--- a/accounts/gkleen@sif/libvirt/pool-default.xml
+++ /dev/null
@@ -1,18 +0,0 @@
1<pool type='dir'>
2 <name>default</name>
3 <uuid>ad899c92-02e3-45f9-bf49-195467aba2e2</uuid>
4 <capacity unit='bytes'>1492738072064</capacity>
5 <allocation unit='bytes'>215387853312</allocation>
6 <available unit='bytes'>1277350218752</available>
7 <source>
8 </source>
9 <target>
10 <path>/home/gkleen/.local/share/libvirt/images</path>
11 <permissions>
12 <mode>0711</mode>
13 <owner>1000</owner>
14 <group>100</group>
15 </permissions>
16 </target>
17</pool>
18
diff --git a/accounts/gkleen@sif/libvirt/vol-lmmirzm-vmrz01.xml b/accounts/gkleen@sif/libvirt/vol-lmmirzm-vmrz01.xml
deleted file mode 100644
index e160ae4d..00000000
--- a/accounts/gkleen@sif/libvirt/vol-lmmirzm-vmrz01.xml
+++ /dev/null
@@ -1,17 +0,0 @@
1<volume type='file'>
2 <name>lmmirzm-vmrz01.qcow2</name>
3 <capacity unit='G'>40</capacity>
4 <target>
5 <path>/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2</path>
6 <format type='qcow2'/>
7 <permissions>
8 <mode>0600</mode>
9 <owner>1000</owner>
10 <group>100</group>
11 </permissions>
12 <features>
13 <lazy_refcounts/>
14 </features>
15 </target>
16</volume>
17
diff --git a/nvfetcher.toml b/nvfetcher.toml
index dcf5bd64..046290df 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -98,3 +98,8 @@ fetch.git = "https://github.com/jimeh/tomorrow-night-paradise-theme.el"
98src.github_tag = "Mange/emoji-data" 98src.github_tag = "Mange/emoji-data"
99fetch.github = "Mange/emoji-data" 99fetch.github = "Mange/emoji-data"
100git.fetchSubmodules = true 100git.fetchSubmodules = true
101
102[spice-record]
103src.github = "JonathonReinhart/spice-record"
104src.prefix = "v"
105fetch.tarball = "https://github.com/JonathonReinhart/spice-record/archive/refs/tags/v$ver.tar.gz"
diff --git a/overlays/spice-record.nix b/overlays/spice-record.nix
new file mode 100644
index 00000000..06a114da
--- /dev/null
+++ b/overlays/spice-record.nix
@@ -0,0 +1,12 @@
1{ final, prev, sources, ... }: {
2 spice-record = prev.python3Packages.buildPythonPackage rec {
3 inherit (sources.spice-record) src version pname;
4 propagatedBuildInputs = with prev.python3Packages; [ libvirt pygobject3 ];
5 buildInputs = with prev; [ spice-gtk gst_all_1.gst-plugins-base ];
6 nativeBuildInputs = with prev; [ gobject-introspection wrapGAppsHook3 makeWrapper ];
7 postInstall = ''
8 wrapProgram $out/bin/spice-record \
9 --prefix PATH : ${prev.lib.makeBinPath (with prev; [ ffmpeg-full ])}
10 '';
11 };
12}