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

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

44
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686222354, "lastModified": 1687028856,
"narHash": "sha256-dtqnAwzucKZv54dTrLetIXhOavUrCsdqOe+JtFH9riE=", "narHash": "sha256-vKV3I31tmXwaWHiUOgfDVd27cEHqaPBr1lt9+NKdIp8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5d9f362aecd7a4c2e8a3bf2afddb49051988cab9", "rev": "64c9c78c15fd4c899d857bf09dba88bda771b43a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,11 +92,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1686446285, "lastModified": 1687093833,
"narHash": "sha256-CbNaKpvp6GxU4yVf924uCnwQgsW22cTGLd9amc+9tFk=", "narHash": "sha256-B+cXcBTpc9bsmPd59rKIcFG6hYCGgxbeIxA+OIIFjlU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "325207e8b0b900e2a36731086fd84cb6f4be6855", "rev": "8f83962b34fe83520c0edf6320ebd05b06d4f65b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685943944, "lastModified": 1686924781,
"narHash": "sha256-GpaQwOkvwkmSWxvWaZqbMKyyOSaBAwgdEcHCqLW/240=", "narHash": "sha256-6r3Hm2Fxf4F7LIWRYKU9bsS/xJwlG6L2+/I/pdffvOs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "122dcc32cadf14c5015aa021fae8882c5058263a", "rev": "a54683aa7eff00ee5b33dec225525d0eb6ab02de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,16 +213,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1685758009, "lastModified": 1687031877,
"narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=", "narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb", "rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -288,11 +288,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1685848844, "lastModified": 1687058111,
"narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=", "narHash": "sha256-xDSn/APfAdJinHV4reTfplX5XnLsJSGdVwHpmdgP9Mo=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b", "rev": "1634d2da53f079e7f5924efa7a96511cd9596f81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1686392259, "lastModified": 1686929285,
"narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", "narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", "rev": "93fddcf640ceca0be331210ba3101cee9d91c13d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -375,11 +375,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1686412476, "lastModified": 1686960236,
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "21951114383770f96ae528d0ae68824557768e81", "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
modules/nix.nix
View file

@ -38,8 +38,9 @@ in {
warn-dirty = false; warn-dirty = false;
#ignore global registry #ignore global registry
flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}''; flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
#become stable faster stupid
use-xdg-base-directories = true; use-xdg-base-directories = true;
#use for testing
#allow-import-from-derivation = false;
trusted-users = [ trusted-users = [
"root" "root"
"@wheel" "@wheel"

2
pkgs/parrot.nix
View file

@ -41,7 +41,7 @@ in
ffmpeg ffmpeg
]}''; ]}'';
cargoLock.lockFile = src + "/Cargo.lock"; cargoLock.lockFile = src + /Cargo.lock;
RUSTC_BOOTSTRAP = 1; RUSTC_BOOTSTRAP = 1;
} }

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

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

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

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

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

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

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

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