diff --git a/modules/config/devices/config/ceres.nix b/modules/config/devices/config/ceres.nix index 78e4b1d..28056be 100755 --- a/modules/config/devices/config/ceres.nix +++ b/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 { diff --git a/modules/config/devices/config/charon.nix b/modules/config/devices/config/charon.nix index ce4fd6b..b9e1fd7 100755 --- a/modules/config/devices/config/charon.nix +++ b/modules/config/devices/config/charon.nix @@ -2,7 +2,6 @@ let inherit (devicesFunctions) ownerExclusiveReadWriteMask - charonIP ; in { @@ -12,7 +11,7 @@ in address0 = ""; }; ip = { - address0 = charonIP; + address0 = "192.168.50.42"; }; boot = { options = ownerExclusiveReadWriteMask; diff --git a/modules/config/devices/config/deimos.nix b/modules/config/devices/config/deimos.nix index 06ee8d4..7d4810d 100755 --- a/modules/config/devices/config/deimos.nix +++ b/modules/config/devices/config/deimos.nix @@ -2,17 +2,16 @@ let inherit (devicesFunctions) ownerWriteOthersReadMask - deimosIP ; in { label = "Deimos"; name = "deimos"; sync = { - address0 = deimosIP; + address0 = ""; }; ip = { - address0 = deimosIP; + address0 = "192.168.50.142"; }; boot = { options = ownerWriteOthersReadMask; diff --git a/modules/config/devices/config/mars.nix b/modules/config/devices/config/mars.nix index 532b5f1..4d13dda 100755 --- a/modules/config/devices/config/mars.nix +++ b/modules/config/devices/config/mars.nix @@ -3,7 +3,6 @@ let inherit (devicesFunctions) ownerWriteOthersReadMask readWritePermissions - marsIP ; in { @@ -13,7 +12,7 @@ in address0 = ""; }; ip = { - address0 = marsIP; + address0 = "192.168.50.196"; }; boot = { options = ownerWriteOthersReadMask; diff --git a/modules/config/devices/config/phone.nix b/modules/config/devices/config/phone.nix index 438398a..8a85e0c 100755 --- a/modules/config/devices/config/phone.nix +++ b/modules/config/devices/config/phone.nix @@ -1,7 +1,6 @@ { devicesFunctions }: let inherit (devicesFunctions) - phoneIP dummy ; in @@ -13,6 +12,6 @@ in address1 = "RUKSHY4-UCBYRVG-CVYFCMU-M3NLA3Q-JINRF5V-YPR5W32-TEIBJN6-DNQRCAR"; # User2 }; ip = { - address0 = phoneIP; + address0 = "192.168.50.243"; }; } diff --git a/modules/config/devices/config/printers/printer1.nix b/modules/config/devices/config/printers/printer1.nix index a5c5ff6..e1b1c97 100755 --- a/modules/config/devices/config/printers/printer1.nix +++ b/modules/config/devices/config/printers/printer1.nix @@ -1,7 +1,6 @@ { devicesFunctions }: let inherit (devicesFunctions) - brotherIP dummy ; in @@ -9,6 +8,6 @@ in name = dummy; label = "Brother-HL-2170W"; ip = { - address0 = brotherIP; + address0 = "192.168.50.195"; }; } diff --git a/modules/config/devices/config/synology.nix b/modules/config/devices/config/synology.nix index a704f92..42037fb 100755 --- a/modules/config/devices/config/synology.nix +++ b/modules/config/devices/config/synology.nix @@ -4,7 +4,6 @@ let sambaPermissions userIdForUser0 userIdForUser1 - synologyIP ; user0 = "nick"; @@ -12,6 +11,7 @@ let user0Name = "Nick"; user1Name = "Garnet"; synologyName = "synology"; + synologyIP = "192.168.50.209"; in { label = "Synology"; diff --git a/modules/config/devices/config/venus.nix b/modules/config/devices/config/venus.nix index 756476b..445f3a5 100755 --- a/modules/config/devices/config/venus.nix +++ b/modules/config/devices/config/venus.nix @@ -2,7 +2,6 @@ let inherit (devicesFunctions) readWritePermissions - venusIP ; drivePath = "/run/media"; byLabel = "/dev/disk/by-label"; @@ -12,7 +11,7 @@ in label = "Venus"; name = "venus"; ip = { - address0 = venusIP; + address0 = "192.168.58.104"; }; boot = { options = [ diff --git a/modules/config/devices/default.nix b/modules/config/devices/default.nix index b39f772..532b711 100755 --- a/modules/config/devices/default.nix +++ b/modules/config/devices/default.nix @@ -33,14 +33,6 @@ 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 ( diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index 6600e83..03c09ba 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -26,6 +26,7 @@ in "jellyfin" "libvirtd" "minecraft" + "navidrome" "netdev" "networkmanager" "nextcloud" @@ -48,22 +49,7 @@ in homeDirectory = "/home/${user0}"; file = { "./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} - ''; + source = ./files/justfile; }; "./Files/Scripts/list.sh" = { source = ./files/list.sh; @@ -73,6 +59,9 @@ 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; @@ -81,12 +70,6 @@ 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; diff --git a/profiles/user0/files/justfile b/profiles/user0/files/justfile new file mode 100755 index 0000000..3e7a82c --- /dev/null +++ b/profiles/user0/files/justfile @@ -0,0 +1,14 @@ +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