Migrate to flakes

modules/audio.nix

@@ -1,17 +1,6 @@
 { config, lib, pkgs, ... }:
 
-let
-  soundcloud_token =
-    builtins.readFile /home/coolneng/.config/mopidy/soundcloud-auth;
-
-  fixed-mopidy-youtube = pkgs.mopidy-youtube.overrideAttrs (old: rec {
-    patchPhase = ''
-      sed s/bs4/beautifulsoup4/ -i setup.cfg
-      sed s/"PREF=hl=en;"/"PREF=hl=en; CONSENT=YES+20210329;"/ -i mopidy_youtube/backend.py
-    '';
-  });
-
-in {
+{
   # Configure pipewire as sound server
   services.pipewire = {
     enable = true;
@@ -45,7 +34,7 @@ in {
     extensionPackages = with pkgs; [
       mopidy-mpd
       mopidy-soundcloud
-      fixed-mopidy-youtube
+      mopidy-youtube
       mopidy-somafm
       mopidy-local
     ];
@@ -75,7 +64,7 @@ in {
 
       [soundcloud]
       enabled = true
-      auth_token = ${soundcloud_token}
+      auth_token = PLACEHOLDER
       explore_songs = 100
 
       [m3u]

modules/gui.nix

@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
 
-let tmux_config = builtins.readFile /home/coolneng/.tmux.conf;
-
-in {
+{
   # Display manager
   services.xserver.enable = true;
   services.xserver.displayManager = {
@@ -86,7 +84,6 @@ in {
     shortcut = "x";
     terminal = "screen-256";
     baseIndex = 1;
-    extraConfig = tmux_config;
   };
 
   # Automount external storage

modules/software.nix

@@ -1,10 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 with pkgs;
 
 let
   emacs-vterm = ((emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages
-    (epkgs: with epkgs; [ vterm ]));
+    (epkgs: [ epkgs.vterm ]));
 
 in {
   environment.systemPackages = [
@@ -16,6 +16,7 @@ in {
     pass-wayland
     passff-host
     gitAndTools.pass-git-helper
+    inputs.agenix.defaultPackage.x86_64-linux
     # Browsers
     firefox
     ungoogled-chromium
@@ -83,7 +84,7 @@ in {
     shfmt
     ## Nix
     nixfmt
-    niv
+    rnix-lsp
     ## Python
     nodePackages.pyright
     black