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

general cleanup

Browse source
This commit is contained in:
Gerg-L 2023-06-18 09:29:08 -04:00
parent b602fc4ee0
commit 7fd4c88056
8 changed files with 44 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

35
systems/game-laptop/default.nix
View file

@ -23,27 +23,20 @@
"steam-original"
];
environment = {
systemPackages = [
pkgs.neovim
pkgs.heroic
pkgs.legendary-gl
pkgs.prismlauncher
pkgs.pcmanfm #file manager
pkgs.librewolf #best browser
pkgs.obs-studio
pkgs.vlc
# wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360
(pkgs.symlinkJoin {
name = "webcord-wrapper";
nativeBuildInputs = [pkgs.makeWrapper];
paths = [
pkgs.webcord
];
postBuild = ''
wrapProgram "$out/bin/webcord" --run 'rm -f $HOME/.config/WebCord/windowState.json'
'';
})
];
systemPackages = builtins.attrValues {
inherit
(pkgs)
neovim
heroic
legendary-gl
prismlauncher
pcmanfm #file manager
librewolf #best browser
obs-studio
vlc
webcord
;
};
etc = {
"jdks/17".source = pkgs.openjdk17 + /bin;
"jdks/8".source = pkgs.openjdk8 + /bin;

3
systems/gerg-desktop/parrot.nix
View file

@ -2,6 +2,7 @@
pkgs,
config,
self,
lib,
...
}: {
#discord bot stuff
@ -10,7 +11,7 @@
wantedBy = ["multi-user.target"];
wants = ["network-online.target"];
after = ["network-online.target"];
script = "${self.packages.${pkgs.system}.parrot}/bin/parrot";
script = lib.getExe self.packages.${pkgs.system}.parrot;
serviceConfig = {
EnvironmentFile = config.sops.secrets.discordenv.path;
Restart = "on-failure";

2
systems/gerg-desktop/spicetify.nix
View file

@ -9,8 +9,6 @@ in {
nixpkgs.allowedUnfree = ["spotify"];
imports = [inputs.spicetify-nix.nixosModule];
programs.spicetify = {
spotifyPackage = pkgs.spotify-unwrapped;
spicetifyPackage = pkgs.spicetify-cli;
enable = true;
enabledExtensions = [
ex.adblock

7
systems/gerg-desktop/vfio.nix
View file

@ -44,8 +44,8 @@ let
echo 'EndSection' >> $out
echo >> $out
'';
oneMonitor = pkgs.writeText "1-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/1-monitor.conf))]);
twoMonitor = pkgs.writeText "2-monitor.conf" (lib.strings.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/2-monitor.conf))]);
oneMonitor = pkgs.writeText "1-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/1-monitor.conf))]);
twoMonitor = pkgs.writeText "2-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/2-monitor.conf))]);
in {
####VM SOUND BORKED
services.pipewire.package = inputs.pipewire_fix.legacyPackages.${pkgs.system}.pipewire;
@ -114,7 +114,6 @@ in {
'';
systemd.tmpfiles.rules = let
xml = pkgs.writeText "Windows.xml" (builtins.readFile (self + /misc/Windows.xml));
qemuHook = pkgs.writeShellScript "qemu-hook" ''
GUEST_NAME="$1"
OPERATION="$2"
@ -150,6 +149,6 @@ in {
in [
"L /tmp/xorg.conf - - - - ${twoMonitor}"
"L+ /var/lib/libvirt/hooks/qemu - - - - ${qemuHook}"
"L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${xml}"
"L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${self + /misc/Windows.xml}"
];
}

1
systems/gerg-desktop/zfs.nix
View file

@ -7,7 +7,6 @@
systemd.tmpfiles.rules = [
"L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key"
"L+ /etc/ssh/ssh_host_ed25519_key.pub - - - - /persist/ssh/ssh_host_ed25519_key.pub"
"L+ /etc/nixos - - - - /persist/nixos"
];
#create machine-id for spotify
environment.etc = {