gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

change vm sound

Browse source 
rollback lockfile (vm broke)
This commit is contained in:
Gerg-L 2024-02-03 16:15:19 -05:00
parent 87f75eb925
commit 4149443b66
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
8 changed files with 70 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

73
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706491084, "lastModified": 1705890365,
"narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=", "narHash": "sha256-MObB+fipA/2Ai3uMuNouxcwz0cqvELPpJ+hfnhSaUeA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9", "rev": "9fcdf3375e01e2938a49df103af9fd21bd0f89d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +168,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1706936543, "lastModified": 1705899308,
"narHash": "sha256-tPeXkJEyw3sbcoP9wS/JaJ3UDv4TFo0vYhS0UUliyT8=", "narHash": "sha256-hw6r6E3thdgoYH3UzboLfuUYJFg31hIXCe3jH01inzA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f2659f142636164b94165df1b396bbf92b23de0", "rev": "5836514c534568510e7c2f3ad358f70af0925088",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -185,11 +185,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706929538, "lastModified": 1705891177,
"narHash": "sha256-lznCAtYEWlGxHVS+Na/eIw+D1iXu9msOkPc4P/RWDS4=", "narHash": "sha256-N64FnQTTihcXoF8k2ZpNJDY1p7G0rwvZFj2Ezpag1EI=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "6709f7f8f130377f44c36b2150a167a2afcbdff9", "rev": "e68decab0352d553bd2463842d96379f56073a1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,11 +232,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1706876590, "lastModified": 1705351614,
"narHash": "sha256-XwvofzNSwW4ywlQEra0EeMxbG5wnbb/2kbl8wa2oitI=", "narHash": "sha256-A4lWuddBY2SI4AbQFT+/eP9LsrNarnkQ2AeikrU56N0=",
"owner": "piegamesde", "owner": "piegamesde",
"repo": "nixfmt", "repo": "nixfmt",
"rev": "c6417f77559570b099e5aa3a0f49a5c60ea17bac", "rev": "1eff7a84ac82fbebb5f586244f1c80e1fcc4f494",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,11 +257,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1706876590, "lastModified": 1705351614,
"narHash": "sha256-XwvofzNSwW4ywlQEra0EeMxbG5wnbb/2kbl8wa2oitI=", "narHash": "sha256-A4lWuddBY2SI4AbQFT+/eP9LsrNarnkQ2AeikrU56N0=",
"owner": "piegamesde", "owner": "piegamesde",
"repo": "nixfmt", "repo": "nixfmt",
"rev": "c6417f77559570b099e5aa3a0f49a5c60ea17bac", "rev": "1eff7a84ac82fbebb5f586244f1c80e1fcc4f494",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706085261, "lastModified": 1705400161,
"narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=", "narHash": "sha256-0MFaNIwwpVWB1N9m7cfHAM2pSVtYESQ7tlHxnDTOhM4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132", "rev": "521fb4cdd8a2e1a00d1adf0fea7135d1faf04234",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,11 +357,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1705957679, "lastModified": 1705033721,
"narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a333eaa80901efe01df07eade2c16d183761fa3", "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +381,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706933715, "lastModified": 1705897087,
"narHash": "sha256-f0hCymz4cgOIlekkxsjyI4CVKeFCJvMSMiqZ4gqRggo=", "narHash": "sha256-sIT6kqlAd1wgvIAz6Jc2j3FqoDEz/gO0gRto6r6MUbA=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "nvim-flake", "repo": "nvim-flake",
"rev": "7086681a48c72ce0e6a5b462ac625af69466f9f3", "rev": "95114c66df610514250a70a72d86de54ac702e28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -418,11 +418,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1706410821, "lastModified": 1705805983,
"narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", "rev": "ae171b54e76ced88d506245249609f8c87305752",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,11 +439,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706933357, "lastModified": 1705896688,
"narHash": "sha256-MB/jy3aWrTtxzHUQB8vH1YGH4ha24MrnMyGMeknhxrY=", "narHash": "sha256-gQyvT2v/0aHyDMIoWEr6jY/ILN20j30ABVaw9DTthfo=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "eafd15bf5fa3f69609a5a99bc4ed2a529952b1a1", "rev": "47cc7ad8f0db7883af86dc180e9456a392b80428",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +454,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1706718339, "lastModified": 1705774713,
"narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -490,11 +490,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1706732774, "lastModified": 1705677747,
"narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,3 +508,4 @@
"root": "root", "root": "root",
"version": 7 "version": 7
} }

22
hosts/gerg-desktop/Windows.xml
View file

@ -1,4 +1,4 @@
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <domain type='kvm'>
<name>Windows</name> <name>Windows</name>
<uuid>035e02d8-04d3-05e5-4706-900700080009</uuid> <uuid>035e02d8-04d3-05e5-4706-900700080009</uuid>
<memory unit='KiB'>16777216</memory> <memory unit='KiB'>16777216</memory>
@ -24,7 +24,7 @@
<emulatorpin cpuset='8-15,24-31'/> <emulatorpin cpuset='8-15,24-31'/>
</cputune> </cputune>
<os> <os>
<type arch='x86_64' machine='pc-q35-8.0'>hvm</type> <type arch='x86_64' machine='pc-q35-8.2'>hvm</type>
<loader readonly='yes' type='pflash'>/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader> <loader readonly='yes' type='pflash'>/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
<nvram template='/run/libvirt/nix-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/Windows_VARS.fd</nvram> <nvram template='/run/libvirt/nix-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/Windows_VARS.fd</nvram>
<boot dev='hd'/> <boot dev='hd'/>
@ -193,7 +193,13 @@
</input> </input>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/> <sound model='ich9'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
</sound>
<audio id='1' type='pipewire' runtimeDir='/run/user/1000'>
<input name='@DEFAULT_SINK@' streamName='win10-in'/>
<output name='@DEFAULT_SOURCE@' streamName='win10-out'/>
</audio>
<hostdev mode='subsystem' type='pci' managed='yes'> <hostdev mode='subsystem' type='pci' managed='yes'>
<source> <source>
<address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
@ -209,14 +215,4 @@
<watchdog model='itco' action='reset'/> <watchdog model='itco' action='reset'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>
<qemu:commandline>
<qemu:arg value='-audiodev'/>
<qemu:arg value='pipewire,id=audio0'/>
<qemu:arg value='-device'/>
<qemu:arg value='intel-hda,addr=0x1b'/>
<qemu:arg value='-device'/>
<qemu:arg value='hda-duplex,audiodev=audio0'/>
<qemu:env name='PIPEWIRE_RUNTIME_DIR' value='/run/user/1000'/>
</qemu:commandline>
</domain> </domain>

9
hosts/gerg-desktop/main.nix
View file

@ -13,7 +13,12 @@
enable = true; enable = true;
kmscon.enable = true; kmscon.enable = true;
}; };
allowedUnfree = [ "nvidia-x11" ]; allowedUnfree = [
"nvidia-x11"
"steam"
"steam-run"
"steam-original"
];
}; };
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
hardware.nvidia = { hardware.nvidia = {
@ -30,6 +35,8 @@
]; ];
}; };
programs.steam.enable = true;
programs.direnv = { programs.direnv = {
enable = true; enable = true;
loadInNixShell = false; loadInNixShell = false;

16
hosts/gerg-desktop/services/gitea.nix
View file

@ -1,15 +1,15 @@
_: _:
{config, ... }: {config, ... }:
{ {
users.users = { # users.users = {
${config.services.gitea.user} = { # ${config.services.gitea.user} = {
openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ]; # openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ];
extraGroups = [ "postgres" ]; # extraGroups = [ "postgres" ];
}; # };
${config.services.nginx.user}.extraGroups = [ config.services.gitea.group ]; # ${config.services.nginx.user}.extraGroups = [ config.services.gitea.group ];
}; # };
services.gitea = { services.gitea = {
enable = true; enable = false;
stateDir = "/persist/services/gitea"; stateDir = "/persist/services/gitea";
appName = "Powered by NixOS"; appName = "Powered by NixOS";
settings = { settings = {

2
hosts/gerg-desktop/services/miniflux.nix
View file

@ -10,6 +10,8 @@ _:
systemd.services = { systemd.services = {
miniflux = { miniflux = {
enable = false;
description = "Miniflux service"; description = "Miniflux service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "miniflux-dbsetup.service" ]; requires = [ "miniflux-dbsetup.service" ];

6
hosts/gerg-desktop/services/nextcloud.nix
View file

@ -1,12 +1,12 @@
_: _:
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
sops.secrets.nextcloud.owner = "nextcloud"; #sops.secrets.nextcloud.owner = "nextcloud";
users.users.nextcloud.extraGroups = [ "postgres" ]; #users.users.nextcloud.extraGroups = [ "postgres" ];
services.nextcloud = { services.nextcloud = {
enable = true; enable = false;
package = pkgs.nextcloud28; package = pkgs.nextcloud28;
datadir = "/persist/services/nextcloud"; datadir = "/persist/services/nextcloud";
hostName = "next.gerg-l.com"; hostName = "next.gerg-l.com";

2
hosts/gerg-desktop/services/parrot.nix
View file

@ -8,7 +8,7 @@ _:
{ {
sops.secrets.discordenv = { }; sops.secrets.discordenv = { };
systemd.services.parrot = { systemd.services.parrot = {
enable = true; enable = false;
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];

2
modules/X11.nix
View file

@ -4,7 +4,7 @@ _:
services.xserver = { services.xserver = {
tty = lib.mkDefault 1; tty = lib.mkDefault 1;
exportConfiguration = true; exportConfiguration = true;
layout = "us"; xkb.layout = "us";
libinput.enable = true; libinput.enable = true;
xautolock.enable = false; xautolock.enable = false;
excludePackages = [ pkgs.xterm ]; excludePackages = [ pkgs.xterm ];