set mpv config

configuration.nix

@@ -13,17 +13,6 @@
       ./user.nix
     ];
 
-  nixpkgs.overlays = [
-    (self: super: {
-      packageOverrides = self: super: {
-        penrose = self.callPackage /etc/nixos/penrose {
-          pname = "penrose";
-        };
-      };
-    })
-  ];
-
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

home.nix

@@ -10,5 +10,10 @@ in
       userName = "zoe";
       userEmail = "ZoeOosting@outlook.com";
     };
+    programs.mpv.config = {
+      ytdl-format = "bestvideo[height<=?720]+bestaudio";
+      ytdl-path = "yt-dlp";
+
+    };
   };
 }

packages.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    ];
+  ];
 }

penrose/Cargo.nix

@@ -1,5 +1,5 @@
 # This file was @generated by crate2nix 0.10.0 with the command:
-#   "generate" "-f" "Cargo.toml"
+#   "generate"
 # See https://github.com/kolloch/crate2nix for more info.
 
 { nixpkgs ? <nixpkgs>
@@ -33,7 +33,7 @@ rec {
   #
 
   rootCrate = rec {
-    packageId = "nixos";
+    packageId = "penrose-custom";
 
     # Use this attribute to refer to the derivation building your root crate package.
     # You can override the features with rootCrate.build.override { features = [ "default" "feature1" ... ]; }.
@@ -49,10 +49,10 @@ rec {
   # You can override the features with
   # workspaceMembers."${crateName}".build.override { features = [ "default" "feature1" ... ]; }.
   workspaceMembers = {
-    "nixos" = rec {
-      packageId = "nixos";
+    "penrose-custom" = rec {
+      packageId = "penrose-custom";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "nixos";
+        packageId = "penrose-custom";
       };
 
       # Debug support which might change between releases.
@@ -643,9 +643,9 @@ rec {
       };
       "libc" = rec {
         crateName = "libc";
-        version = "0.2.136";
+        version = "0.2.137";
         edition = "2015";
-        sha256 = "15zi66mi5wvgmd3fplz8sl7phqdlkpwjqww4x8nha6dk1dnczvam";
+        sha256 = "12dz2lk4a7lm03k079n2rkm1l6cpdhvy6nrngbfprzrv19icqzzw";
         authors = [
           "The Rust Project Developers"
         ];
@@ -712,22 +712,6 @@ rec {
           }
         ];
 
-      };
-      "nixos" = rec {
-        crateName = "nixos";
-        version = "0.1.0";
-        edition = "2021";
-        crateBin = [
-          { name = "nixos"; path = "src/main.rs"; }
-        ];
-        src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; };
-        dependencies = [
-          {
-            name = "penrose";
-            packageId = "penrose";
-          }
-        ];
-
       };
       "once_cell" = rec {
         crateName = "once_cell";
@@ -1011,6 +995,22 @@ rec {
         };
         resolvedDefaultFeatures = [ "cairo-rs" "cairo-sys-rs" "default" "keysyms" "pango" "pangocairo" "penrose_keysyms" "xcb" "xcb_draw" ];
       };
+      "penrose-custom" = rec {
+        crateName = "penrose-custom";
+        version = "0.1.0";
+        edition = "2021";
+        crateBin = [
+          { name = "penrose-custom"; path = "src/main.rs"; }
+        ];
+        src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; };
+        dependencies = [
+          {
+            name = "penrose";
+            packageId = "penrose";
+          }
+        ];
+
+      };
       "penrose_keysyms" = rec {
         crateName = "penrose_keysyms";
         version = "0.1.1";
@@ -1089,9 +1089,9 @@ rec {
       };
       "pkg-config" = rec {
         crateName = "pkg-config";
-        version = "0.3.25";
+        version = "0.3.26";
         edition = "2015";
-        sha256 = "1bh3vij79cshj884py4can1f8rvk52niaii1vwxya9q69gnc9y0x";
+        sha256 = "0q2i61dhqvawc51zfzl3jich57w0cjgfa894hn6ings7ffgsbjba";
         authors = [
           "Alex Crichton <alex@alexcrichton.com>"
         ];

penrose/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "penrose"
+name = "penrose-custom"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-penrose = "0.2"
+penrose="0.2"

penrose/default.nix

@@ -31,4 +31,3 @@ let
   };
 in
 generatedBuild.rootCrate.build
-

penrose/result

@@ -1 +1 @@
-/nix/store/1r0x8g3hjaf1ip1n7y29cjm6pkpl1vfg-rust_nixos-0.1.0
+/nix/store/ba1c87fw6ccs2a8gyhkbd3zbs7lysqcc-rust_penrose-custom-0.1.0

penrose/rust-toolchain

@@ -1 +0,0 @@
-stable

penrose/settings.nix

@@ -1 +0,0 @@
-

penrose/src/main.rs

@@ -1,3 +1,3 @@
 fn main() {
-    println!("Hewwo, world!");
+    println!("Hello, world!");
 }

sync.sh

@@ -13,9 +13,6 @@ cp -r /etc/nixos/ ./backup
 
 # copy over all the files to /etc/nixos/
 sudo cp -r ./configuration.nix ./nvim/ ./packages.nix ./home.nix ./user.nix /etc/nixos/ 
-## copy penrose stuff
-sudo mkdir /etc/nixos/penrose
-sudo cp -r ./penrose/Cargo.nix  ./penrose/src  ./penrose/default.nix ./penrose/rust-toolchain /etc/nixos/penrose
 
 # update and build my new config
 sudo nixos-rebuild switch --upgrade

user.nix

@@ -15,10 +15,15 @@
       wireguard-tools
       networkmanagerapplet
 
+
       # music / sound
       cmus
       pavucontrol
 
+      # video
+      mpv
+      yt-dlp
+
       # games
       steam
 
@@ -32,8 +37,6 @@
       rofi
 
       # dev
-      ## editors
-      vscodium
       ## js
       nodejs
       ## rust
@@ -46,15 +49,14 @@
       # help
       tldr
 
-
-
       # nix tools
       ## formatter for .nix files
       nixpkgs-fmt
       ## find nix packages containing certain files
       nix-index
 
-
+      # system tools
+      htop
     ];
   };