feat: improved justfile

modules/config/devices/config/ceres.nix

@@ -6,9 +6,9 @@ let
     readWritePermissions
     sambaPermissions
     userIdForUser0
+    ceresIP
     ;
   ceresName = "ceres";
-  ceresIP = "192.168.50.140";
   ceresStorageDriveName = "NAS1";
 in
 {

modules/config/devices/config/charon.nix

@@ -2,6 +2,7 @@
 let
   inherit (devicesFunctions)
     ownerExclusiveReadWriteMask
+    charonIP
     ;
 in
 {
@@ -11,7 +12,7 @@ in
     address0 = "";
   };
   ip = {
-    address0 = "192.168.50.42";
+    address0 = charonIP;
   };
   boot = {
     options = ownerExclusiveReadWriteMask;

modules/config/devices/config/deimos.nix

@@ -2,16 +2,17 @@
 let
   inherit (devicesFunctions)
     ownerWriteOthersReadMask
+    deimosIP
     ;
 in
 {
   label = "Deimos";
   name = "deimos";
   sync = {
-    address0 = "";
+    address0 = deimosIP;
   };
   ip = {
-    address0 = "192.168.50.142";
+    address0 = deimosIP;
   };
   boot = {
     options = ownerWriteOthersReadMask;

modules/config/devices/config/mars.nix

@@ -3,6 +3,7 @@ let
   inherit (devicesFunctions)
     ownerWriteOthersReadMask
     readWritePermissions
+    marsIP
     ;
 in
 {
@@ -12,7 +13,7 @@ in
     address0 = "";
   };
   ip = {
-    address0 = "192.168.50.196";
+    address0 = marsIP;
   };
   boot = {
     options = ownerWriteOthersReadMask;

modules/config/devices/config/phone.nix

@@ -1,6 +1,7 @@
 { devicesFunctions }:
 let
   inherit (devicesFunctions)
+    phoneIP
     dummy
     ;
 in
@@ -12,6 +13,6 @@ in
     address1 = "RUKSHY4-UCBYRVG-CVYFCMU-M3NLA3Q-JINRF5V-YPR5W32-TEIBJN6-DNQRCAR"; # User2
   };
   ip = {
-    address0 = "192.168.50.243";
+    address0 = phoneIP;
   };
 }

modules/config/devices/config/printers/printer1.nix

@@ -1,6 +1,7 @@
 { devicesFunctions }:
 let
   inherit (devicesFunctions)
+    brotherIP
     dummy
     ;
 in
@@ -8,6 +9,6 @@ in
   name = dummy;
   label = "Brother-HL-2170W";
   ip = {
-    address0 = "192.168.50.195";
+    address0 = brotherIP;
   };
 }

modules/config/devices/config/synology.nix

@@ -4,6 +4,7 @@ let
     sambaPermissions
     userIdForUser0
     userIdForUser1
+    synologyIP
     ;
 
   user0 = "nick";
@@ -11,7 +12,6 @@ let
   user0Name = "Nick";
   user1Name = "Garnet";
   synologyName = "synology";
-  synologyIP = "192.168.50.209";
 in
 {
   label = "Synology";

modules/config/devices/config/venus.nix

@@ -2,6 +2,7 @@
 let
   inherit (devicesFunctions)
     readWritePermissions
+    venusIP
     ;
   drivePath = "/run/media";
   byLabel = "/dev/disk/by-label";
@@ -11,7 +12,7 @@ in
   label = "Venus";
   name = "venus";
   ip = {
-    address0 = "192.168.58.104";
+    address0 = venusIP;
   };
   boot = {
     options = [

modules/config/devices/default.nix

@@ -33,6 +33,14 @@ let
     ];
     dummy = [
     ];
+    ceresIP = "192.168.50.140";
+    charonIP = "192.168.50.42";
+    deimosIP = "192.168.50.142";
+    marsIP = "192.168.50.196";
+    phoneIP = "192.168.50.243";
+    synologyIP = "192.168.50.209";
+    venusIP = "192.168.58.104";
+    brotherIP = "192.168.50.195";
   };
 
   deviceswithFunctions = builtins.listToAttrs (

profiles/user0/default.nix

@@ -26,7 +26,6 @@ in
         "jellyfin"
         "libvirtd"
         "minecraft"
-        "navidrome"
         "netdev"
         "networkmanager"
         "nextcloud"
@@ -49,7 +48,22 @@ in
         homeDirectory = "/home/${user0}";
         file = {
           "./justfile" = {
-            source = ./files/justfile;
+            text = ''
+              vpn:
+                  sudo protonvpn c --c CA
+
+              vpnoff:
+                  sudo protonvpn d
+
+              rebuild:
+                  nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
+
+              elm:
+                  cd ~/Files/Projects/website/frontend ; elm-land server
+
+              server:
+                  ssh ${devices.ceres.ip.address0}
+            '';
           };
           "./Files/Scripts/list.sh" = {
             source = ./files/list.sh;
@@ -59,9 +73,6 @@ in
             source = ./files/loop.sh;
             executable = true;
           };
-          "./.config/vesktop/themes/macchiato-theme.css" = {
-            source = ./files/themes/vesktop/macchiato-theme.css;
-          };
           "./.config/scripts/get_weather.sh" = {
             source = ./files/get_weather.sh;
             executable = true;
@@ -70,6 +81,12 @@ in
             source = ./files/wallpaper;
             recursive = true;
           };
+          "./.config/vesktop/themes/macchiato-theme.css" = {
+            source = ./files/themes/vesktop/macchiato-theme.css;
+          };
+          "./.config/qBittorrent/themes/catppuccin-mocha.qbtheme" = {
+            source = ./files/themes/qbittorrent/macchiato.qbtheme;
+          };
         };
         sessionVariables = {
           VISUAL = lib.getExe pkgs.zed-editor;

profiles/user0/files/justfile

@@ -1,14 +0,0 @@
-vpn:
-    sudo protonvpn c --c CA
-
-vpnoff:
-    sudo protonvpn d
-
-rebuild:
-    nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#mars --show-trace
-
-elm:
-    cd ~/Files/Projects/website/frontend; elm-land server
-
-server:
-    ssh 192.168.50.140