From 7fd4c880561365280d94d39bc6a8e4e0bb67389d Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 18 Jun 2023 09:29:08 -0400 Subject: [PATCH] general cleanup --- flake.lock | 44 +++++++++++++++--------------- modules/nix.nix | 3 +- pkgs/parrot.nix | 2 +- systems/game-laptop/default.nix | 35 ++++++++++-------------- systems/gerg-desktop/parrot.nix | 3 +- systems/gerg-desktop/spicetify.nix | 2 -- systems/gerg-desktop/vfio.nix | 7 ++--- systems/gerg-desktop/zfs.nix | 1 - 8 files changed, 44 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index 65df824..c4e815d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1686222354, - "narHash": "sha256-dtqnAwzucKZv54dTrLetIXhOavUrCsdqOe+JtFH9riE=", + "lastModified": 1687028856, + "narHash": "sha256-vKV3I31tmXwaWHiUOgfDVd27cEHqaPBr1lt9+NKdIp8=", "owner": "nix-community", "repo": "disko", - "rev": "5d9f362aecd7a4c2e8a3bf2afddb49051988cab9", + "rev": "64c9c78c15fd4c899d857bf09dba88bda771b43a", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "master": { "locked": { - "lastModified": 1686446285, - "narHash": "sha256-CbNaKpvp6GxU4yVf924uCnwQgsW22cTGLd9amc+9tFk=", + "lastModified": 1687093833, + "narHash": "sha256-B+cXcBTpc9bsmPd59rKIcFG6hYCGgxbeIxA+OIIFjlU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "325207e8b0b900e2a36731086fd84cb6f4be6855", + "rev": "8f83962b34fe83520c0edf6320ebd05b06d4f65b", "type": "github" }, "original": { @@ -166,11 +166,11 @@ ] }, "locked": { - "lastModified": 1685943944, - "narHash": "sha256-GpaQwOkvwkmSWxvWaZqbMKyyOSaBAwgdEcHCqLW/240=", + "lastModified": 1686924781, + "narHash": "sha256-6r3Hm2Fxf4F7LIWRYKU9bsS/xJwlG6L2+/I/pdffvOs=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "122dcc32cadf14c5015aa021fae8882c5058263a", + "rev": "a54683aa7eff00ee5b33dec225525d0eb6ab02de", "type": "github" }, "original": { @@ -213,16 +213,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685758009, - "narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=", + "lastModified": 1687031877, + "narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb", + "rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -288,11 +288,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1685848844, - "narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=", + "lastModified": 1687058111, + "narHash": "sha256-xDSn/APfAdJinHV4reTfplX5XnLsJSGdVwHpmdgP9Mo=", "owner": "mic92", "repo": "sops-nix", - "rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b", + "rev": "1634d2da53f079e7f5924efa7a96511cd9596f81", "type": "github" }, "original": { @@ -324,11 +324,11 @@ }, "stable": { "locked": { - "lastModified": 1686392259, - "narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", + "lastModified": 1686929285, + "narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", + "rev": "93fddcf640ceca0be331210ba3101cee9d91c13d", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "unstable": { "locked": { - "lastModified": 1686412476, - "narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21951114383770f96ae528d0ae68824557768e81", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { diff --git a/modules/nix.nix b/modules/nix.nix index 077c7f7..d5c53c8 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -38,8 +38,9 @@ in { warn-dirty = false; #ignore global registry flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}''; - #become stable faster stupid use-xdg-base-directories = true; + #use for testing + #allow-import-from-derivation = false; trusted-users = [ "root" "@wheel" diff --git a/pkgs/parrot.nix b/pkgs/parrot.nix index cb0afc1..2c540a2 100644 --- a/pkgs/parrot.nix +++ b/pkgs/parrot.nix @@ -41,7 +41,7 @@ in ffmpeg ]}''; - cargoLock.lockFile = src + "/Cargo.lock"; + cargoLock.lockFile = src + /Cargo.lock; RUSTC_BOOTSTRAP = 1; } diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix index d535aaa..a236c8c 100644 --- a/systems/game-laptop/default.nix +++ b/systems/game-laptop/default.nix @@ -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; diff --git a/systems/gerg-desktop/parrot.nix b/systems/gerg-desktop/parrot.nix index 4c68337..e66acf9 100644 --- a/systems/gerg-desktop/parrot.nix +++ b/systems/gerg-desktop/parrot.nix @@ -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"; diff --git a/systems/gerg-desktop/spicetify.nix b/systems/gerg-desktop/spicetify.nix index 36394d0..8e0849c 100644 --- a/systems/gerg-desktop/spicetify.nix +++ b/systems/gerg-desktop/spicetify.nix @@ -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 diff --git a/systems/gerg-desktop/vfio.nix b/systems/gerg-desktop/vfio.nix index de6ebb5..14d3b59 100644 --- a/systems/gerg-desktop/vfio.nix +++ b/systems/gerg-desktop/vfio.nix @@ -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}" ]; } diff --git a/systems/gerg-desktop/zfs.nix b/systems/gerg-desktop/zfs.nix index b0c2943..7adf0f6 100644 --- a/systems/gerg-desktop/zfs.nix +++ b/systems/gerg-desktop/zfs.nix @@ -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 = {