From 21f682f819934c3fedace641b0cbc8087a32c719 Mon Sep 17 00:00:00 2001 From: Tim Keller Date: Mon, 15 Jun 2026 15:14:23 -0500 Subject: cleanup gtk bookmarks and nas --- users/timmy/home.nix | 10 +++++----- users/timmy/hosts.nix | 1 - users/timmy/nas.nix | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/users/timmy/home.nix b/users/timmy/home.nix index 8464296..4d61600 100644 --- a/users/timmy/home.nix +++ b/users/timmy/home.nix @@ -59,11 +59,11 @@ in { }; # Setup gtk bookmarks - gtk.gtk3.bookmarks = ( - lib.mapAttrsToList (name: dir: - lib.mkIf (dir != null) "file://${dir} ${lib.toUpper (lib.substring 0 1 name)}${lib.substring 1 (-1) name}" # Make first letter upper case - ) userDirs - ); + gtk.gtk3.bookmarks = let + mkBookmark = name: dir: ''file://${dir} ${lib.toUpper (lib.substring 0 1 name)}${lib.substring 1 (-1) name}''; # Make first letter upper case + attrsToBookmarks = attrs: lib.mapAttrsToList (name: dir: lib.mkIf (dir != null) (mkBookmark name dir)) attrs; + bookmarksUserDirs = attrsToBookmarks userDirs; + in bookmarksUserDirs; # Setup neovim programs._neovim = { diff --git a/users/timmy/hosts.nix b/users/timmy/hosts.nix index 970b9d8..4f0c0ac 100644 --- a/users/timmy/hosts.nix +++ b/users/timmy/hosts.nix @@ -1,6 +1,5 @@ { networking.hosts = { - "192.168.1.1" = [ "poweredge" ]; # TODO remove once poweredge serves this override correctly "192.168.77.11" = [ "truenas-office" ]; "192.168.77.8" = [ "publicgit" "tjkeller" ]; "192.168.77.3" = [ "devel" ]; diff --git a/users/timmy/nas.nix b/users/timmy/nas.nix index bacb0f0..d878ac9 100644 --- a/users/timmy/nas.nix +++ b/users/timmy/nas.nix @@ -20,6 +20,7 @@ in { }; config = lib.mkIf cfg.enable { + # TODO clean this up fileSystems = lib.optionalAttrs cfg.home.enable { "/media/ingens/backups" = mkNetworkFileSystem "poweredge:/media/ingens/backups" cfg.home.automount; "/media/ingens/tapes" = mkNetworkFileSystem "poweredge:/media/ingens/tapes" cfg.home.automount; -- cgit v1.2.3