edited mpv profiles, added musnix

had to fix conflicts between various files

flake.lock

@@ -273,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752814804,
+        "lastModified": 1753056897,
-        "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
+        "narHash": "sha256-AVVMBFcuOXqIgmShvRv9TED3fkiZhQ0ZvlhsPoFfkNE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
+        "rev": "13a83d1b6545b7f0e8f7689bad62e7a3b1d63771",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1753028704,
+        "lastModified": 1751825501,
-        "narHash": "sha256-kKueIZ35JZnEXPkRw/h0xXvZgBLSfFW1J9FfpCIz8WQ=",
+        "narHash": "sha256-6Jve3xCvRJGkz0A9D8dXH/DMWYE8MkFt+KJWQs9cLkw=",
-        "rev": "2fc47b65b848aa1c2752b7b4eeb112c2cf3a240f",
+        "rev": "378b360bf8e0d04e8dd3733acd20d7a9b70360f1",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2fc47b65b848aa1c2752b7b4eeb112c2cf3a240f.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/378b360bf8e0d04e8dd3733acd20d7a9b70360f1.tar.gz?rev=378b360bf8e0d04e8dd3733acd20d7a9b70360f1"
       },
       "original": {
         "type": "tarball",
@@ -365,7 +365,7 @@
         "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=",
         "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f"
       },
       "original": {
         "type": "tarball",
@@ -379,11 +379,11 @@
         "nixvim": "nixvim"
       },
       "locked": {
-        "lastModified": 1752136112,
+        "lastModified": 1753111006,
-        "narHash": "sha256-WsIw5Ehoz3j/UrgKjqlZZslGehSDeR0Pu0EDwI4nEps=",
+        "narHash": "sha256-2wt/EyOv171Knn2v90jUzWNO9mmHYa59ce4oUtlnI5E=",
         "ref": "refs/heads/main",
-        "rev": "0365f6f7cb427b9b2d5d85a4f12f2bb8c4dc8f09",
+        "rev": "64eb8715929c58fe6117ff6db3c8834881f5b2fc",
-        "revCount": 22,
+        "revCount": 23,
         "type": "git",
         "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git"
       },
@@ -403,11 +403,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1752753780,
+        "lastModified": 1752923485,
-        "narHash": "sha256-EiCUyqaoTdXDMBFb30hBKB9Sx3eY9mrqhgGriIsKuIU=",
+        "narHash": "sha256-AHKTY+vsJEGe/U3wmyspZR8G1Uf65pENHhWms0P3gQc=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "053ea16d7d94f21ee6ed0b70007cd4378c8e4825",
+        "rev": "c36cdca55cc9fc1ac964b4c9033e10c1a221bb19",
         "type": "github"
       },
       "original": {
@@ -419,11 +419,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1752707870,
+        "lastModified": 1752877898,
-        "narHash": "sha256-h/td8ApD44htLyMnue39Y882fs1VpV/oy21WiySmXDE=",
+        "narHash": "sha256-UmnzK7OWI+elWVf/xdvVWFXHs0kP5sNSROYrehLIj74=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "fcec1610e7ba501be812f636dabc7d9f4c8f436f",
+        "rev": "3a140ddbc62171451fb2f0b2f49bb38b1bc07f24",
         "type": "github"
       },
       "original": {
@@ -553,11 +553,11 @@
     },
     "nixpkgsSmall": {
       "locked": {
-        "lastModified": 1752805216,
+        "lastModified": 1753028336,
-        "narHash": "sha256-b1drYue1Ffd8ptj9JwXb8TpKcx4FWbGMTuGkHn2TO3c=",
+        "narHash": "sha256-n8h8fGBKvLq4MDvdBGqN0mcnnMkwTyzHbVe0HNkL+jU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "77b13cbf1248a6319c4b5a85d4e43cdd30fd3a07",
+        "rev": "0612748b970076a805ade087726cbf0295aacca5",
         "type": "github"
       },
       "original": {
@@ -569,11 +569,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1752687322,
+        "lastModified": 1752950548,
-        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
+        "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
+        "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
         "type": "github"
       },
       "original": {
@@ -617,11 +617,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1752596105,
+        "lastModified": 1752809442,
-        "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=",
+        "narHash": "sha256-7fALxZGWDspRe79LaDwIdmkDl568Cphfvr83PGCXUUQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708",
+        "rev": "e821e03193486359aa942372be2d9c1f377b7a18",
         "type": "github"
       },
       "original": {
@@ -633,11 +633,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1752620740,
+        "lastModified": 1752866191,
-        "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
+        "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
+        "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a",
         "type": "github"
       },
       "original": {
@@ -879,11 +879,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752809889,
+        "lastModified": 1753069499,
-        "narHash": "sha256-oTIVrw7Cy2McAVqE7GCot5Fb8Wh4JBsUDKMX8u3DFlU=",
+        "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "f19d2b6b18d4a2e8bf2d6a9f69c934d6726360c4",
+        "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -50,6 +50,9 @@
       url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
       inputs.nixpkgs.follows = "nixpkgsUnstable";
     };
+    musnix = {
+      url = "github:musnix/musnix";
+    };
   };
 
   outputs =
@@ -65,6 +68,7 @@
       nix-flatpak,
       home-manager,
       zen-browser,
+      musnix,
       lix-module,
       ...
     }@inputs:
@@ -106,6 +110,7 @@
             ./hosts/goober/configuration.nix
             lix-module.nixosModules.default
             nix-flatpak.nixosModules.nix-flatpak
+            musnix.nixosModules.musnix
             catppuccin.nixosModules.catppuccin
             home-manager.nixosModules.home-manager
             {
@@ -131,7 +136,7 @@
           specialArgs = specialArgs;
           modules = [
             ./hosts/workstation/configuration.nix
-            lix-module.nixosModules.default
+            # lix-module.nixosModules.default
             nix-flatpak.nixosModules.nix-flatpak
             catppuccin.nixosModules.catppuccin
             home-manager.nixosModules.home-manager

home-manager/dotfiles/foot/foot.ini

@@ -130,43 +130,43 @@ urgent=yes
 # search-box-match=<regular0> <regular3>     # black-on-yellow
 # urls=<regular3>
 
-[cursor]
+# [cursor]
-color=eff1f5 dc8a78
+# color=eff1f5 dc8a78
-
+#
-[colors]
+# [colors]
-alpha=0.9
+# alpha=0.9
-foreground=4c4f69
+# foreground=4c4f69
-background=eff1f5
+# background=eff1f5
-
+#
-regular0=5c5f77
+# regular0=5c5f77
-regular1=d20f39
+# regular1=d20f39
-regular2=40a02b
+# regular2=40a02b
-regular3=df8e1d
+# regular3=df8e1d
-regular4=1e66f5
+# regular4=1e66f5
-regular5=ea76cb
+# regular5=ea76cb
-regular6=179299
+# regular6=179299
-regular7=acb0be
+# regular7=acb0be
-
+#
-bright0=6c6f85
+# bright0=6c6f85
-bright1=d20f39
+# bright1=d20f39
-bright2=40a02b
+# bright2=40a02b
-bright3=df8e1d
+# bright3=df8e1d
-bright4=1e66f5
+# bright4=1e66f5
-bright5=ea76cb
+# bright5=ea76cb
-bright6=179299
+# bright6=179299
-bright7=bcc0cc
+# bright7=bcc0cc
-
+#
-16=fe640b
+# 16=fe640b
-17=dc8a78
+# 17=dc8a78
-
+#
-selection-foreground=4c4f69
+# selection-foreground=4c4f69
-selection-background=ccced7
+# selection-background=ccced7
-
+#
-search-box-no-match=dce0e8 d20f39
+# search-box-no-match=dce0e8 d20f39
-search-box-match=4c4f69 ccd0da
+# search-box-match=4c4f69 ccd0da
-
+#
-jump-labels=dce0e8 fe640b
+# jump-labels=dce0e8 fe640b
-urls=1e66f5
+# urls=1e66f5
 [csd]
 # preferred=server
 # size=26

home-manager/dotfiles/niri/config.kdl

@@ -337,7 +337,7 @@ binds {
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+Return { spawn "footclient"; }
     Mod+D { spawn "fuzzel"; }
-    Super+Alt+L { spawn "swaylock --screenshots --clock --indicator --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2"; }
+    Super+Alt+L { spawn "swaylock" "--screenshots" "--clock" "--indicator" "--effect-blur" "7x5" "--effect-vignette" "0.5:0.5" "--fade-in" "0.2"; }
 
     // You can also use a shell. Do this if you need pipes, multiple commands, etc.
     // Note: the entire command goes as a single argument in the end.
@@ -580,9 +580,9 @@ environment {
 
 // apps to launch at startup
 spawn-at-startup "zen-beta"
-spawn-at-startup "obsidian"
 spawn-at-startup "vesktop"
 spawn-at-startup "beeper"
+spawn-at-startup "cinny"
 
 clipboard {
   disable-primary
@@ -599,7 +599,19 @@ window-rule {
   open-on-workspace "chat"
 }
 
+window-rule {
+  match app-id=r#"^discord$"#
+  match is-active=true
+  open-maximized true
+}
+
 window-rule {
   match at-startup=true app-id=r#"zen-beta$"#
+  match at-startup=true app-id=r#"org.qutebrowser.qutebrowser$"#
   open-on-workspace "internet"
 }
+
+window-rule {
+  match app-id=r#"mpv$"#
+  open-floating true
+}

home-manager/home.nix

@@ -24,6 +24,7 @@
   home.packages =
     with pkgs;
     [
+      yt-dlp
       nerd-fonts.code-new-roman
       ffmpegthumbnailer
       xfce.tumbler
@@ -254,7 +255,7 @@
   };
 
   catppuccin = {
-    flavor = "latte";
+    flavor = "mocha";
     mpv.enable = true;
     mako.enable = true;
     lazygit.enable = true;
@@ -283,10 +284,14 @@
         };
       }
     );
-    config = {
+
-      profile = "high-quality";
+    profiles = {
-      ytdl-format = "bestvideo+bestaudio";
+      "high-quality" = {
-      cache-default = 4000000;
+        ytdl-format = "bestvideo+bestaudio";
+      };
+      "1080p" = {
+        ytdl-format = "bestvideo[height<=?1080]+bestaudio/best";
+      };
     };
   };
 
@@ -300,6 +305,9 @@
       ll = "ls -l";
       edit = "sudo -e";
       update = "sudo nixos-rebuild switch";
+      lg = "lazygit";
+      gpl = "git pull";
+      gpsh = "git push";
     };
 
     history.size = 10000;

hosts/goober/features/software/workstation.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, ... }:
+{
+  musnix,
+  pkgs,
+  lib,
+  ...
+}:
 {
   # for java development on vscode
   programs.nix-ld.enable = true;
@@ -11,13 +16,17 @@
       "tetrio-desktop"
       "beeper"
       "exact-audio-copy"
+      "cider-2"
     ];
 
+  musnix.enable = true;
+  musnix.rtcqs.enable = true;
   environment.systemPackages = with pkgs; [
     zathura
     # music editing software
     reaper
     surge
+    cider-2
 
     libreoffice-qt
     hunspell
@@ -44,9 +53,9 @@
     gvfs
     xfce.thunar
 
-    eclipses.eclipse-java # school wants us to use it...
+    # eclipses.eclipse-java # school wants us to use it...
     nil
-    jetbrains.idea-ultimate
+    # jetbrains.idea-ultimate
 
     # why3
     # alt-ergo