opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor: inject the username into the source path

Browse source
This commit is contained in:
Oliver Davies 2024-08-20 21:01:07 +01:00
parent ce5b4fa0a1
commit 4d4d65d812
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/nixos/home-manager/default.nix
View file

@ -25,7 +25,12 @@ let
; ;
}; };
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" { shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
inherit desktop inputs pkgs; inherit
desktop
inputs
pkgs
username
;
}; };
in in
{ {

3
lib/shared/home-manager-packages.nix
View file

@ -2,6 +2,7 @@
desktop, desktop,
inputs, inputs,
pkgs, pkgs,
username,
... ...
}: }:
let let
@ -12,7 +13,7 @@ let
_timer = writeShellApplication (import ./scripts/_timer.nix); _timer = writeShellApplication (import ./scripts/_timer.nix);
export-video-list = writeShellApplication ( export-video-list = writeShellApplication (
import ./scripts/export-video-list.nix { inherit pkgs; } import ./scripts/export-video-list.nix { inherit pkgs username; }
); );
notetaker = writeShellApplication (import ./scripts/notetaker.nix); notetaker = writeShellApplication (import ./scripts/notetaker.nix);
run = writeShellApplication (import ./scripts/run.nix { inherit pkgs; }); run = writeShellApplication (import ./scripts/run.nix { inherit pkgs; });

4
lib/shared/scripts/export-video-list.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, username, ... }:
{ {
name = "export-video-list"; name = "export-video-list";
@ -12,7 +12,7 @@
device_name="/dev/sda2" device_name="/dev/sda2"
device_label="UNTITLED" device_label="UNTITLED"
source_path="/run/media/opdavies/$device_label" source_path="/run/media/${username}/$device_label"
# If the source path doesn't exist, try mounting the device. # If the source path doesn't exist, try mounting the device.
if [[ ! -d "$source_path" ]]; then if [[ ! -d "$source_path" ]]; then

2
lib/wsl2/default.nix
View file

@ -18,7 +18,7 @@ let
}; };
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" { shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
inherit inputs pkgs; inherit inputs pkgs username;
desktop = false; desktop = false;
}; };
in in