diff --git a/flake.nix b/flake.nix index 2ffab80..e6d4455 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,8 @@ "steam" "steam-unwrapped" "cheatsheet.nvim" - "zoom-us" "zoom" + "zoom-us" + "zoom" ]; mkUnfreePredicate = pkg: builtins.elem (inputs.nixpkgs.lib.getName pkg) unfreePkgs; diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index d2c8261..22a465d 100644 --- a/modules/applications/hyprland.nix +++ b/modules/applications/hyprland.nix @@ -57,14 +57,13 @@ "if [ -e \"/home/tomasr/icloudSync.sh\" ]; then /home/tomasr/icloudSync.sh; else notify-send \"icloudSync.sh doesn't exist\" \"See ~/nixos/modules/applications/hyprland.nix for more information\"; fi" # my icloud account uses an email that I don't want to make public. So the script isnt pushed to github. The script looks like: /* - #!/etc/profiles/per-user/tomasr/bin/zsh - if ! icloudpd --auth-only --username tomas.rivera_2009@icloud.com --dry-run; then - notify-send "icloudpd is not logged in" "Please run icloudpd icloudpd --username my@email.address --password my_password --auth-only" - exit 1 - fi - icloudpd --directory ~/hdd/kdrive/Photo/IPhone/icloudpd-backup --username tomas.rivera_2009@icloud.com --watch-with-interval 3600 --no-progress-bar + #!/etc/profiles/per-user/tomasr/bin/zsh + if ! icloudpd --auth-only --username tomas.rivera_2009@icloud.com --dry-run; then + notify-send "icloudpd is not logged in" "Please run icloudpd icloudpd --username my@email.address --password my_password --auth-only" + exit 1 + fi + icloudpd --directory ~/hdd/kdrive/Photo/IPhone/icloudpd-backup --username tomas.rivera_2009@icloud.com --watch-with-interval 3600 --no-progress-bar */ - ]; }; }; diff --git a/modules/applications/kdrive.nix b/modules/applications/kdrive.nix index be4487a..ac84598 100644 --- a/modules/applications/kdrive.nix +++ b/modules/applications/kdrive.nix @@ -35,8 +35,8 @@ CPUWeight = 1; # minimum relative CPU share }; }; - systemd.user.timers.kdrive-sync = { - wantedBy = [ "timers.target" ]; + systemd.user.timers.kdrive-sync = { + wantedBy = ["timers.target"]; timerConfig = { OnBootSec = "10m"; OnUnitActiveSec = "1h"; diff --git a/modules/applications/zsh.nix b/modules/applications/zsh.nix index cc40343..0c8014c 100644 --- a/modules/applications/zsh.nix +++ b/modules/applications/zsh.nix @@ -50,7 +50,7 @@ _: { command cat "$@" fi } - + custom-eza() { # behaves differently if we just call it or if we pipe initContent if [[ -t 1 ]]; then eza -hlF -aa --color=always --hyperlink --group-directories-first --show-symlinks --icons=always --git --no-permissions "$@" diff --git a/modules/hardware/battery.nix b/modules/hardware/battery.nix index 096d37d..daa3e64 100644 --- a/modules/hardware/battery.nix +++ b/modules/hardware/battery.nix @@ -36,7 +36,8 @@ services.system76-scheduler.settings.cfsProfiles.enable = true; # Better scheduling for CPU cycles - thanks System76!!! services.thermald.enable = false; # Enable thermald, the temperature management daemon. (only necessary if on Intel CPUs) services.power-profiles-daemon.enable = true; # ppd is recommended over tlp for framework 16 - /*services.tlp = { + /* + services.tlp = { enable = true; # Enable TLP (better than gnomes internal power manager) settings = { CPU_BOOST_ON_AC = 1; @@ -51,7 +52,8 @@ PLATFORM_PROFILE_ON_BAT = "powersave"; STOP_CHARGE_THRESH_BAT1 = 80; }; - };*/ + }; + */ environment.systemPackages = [ self.packages.${pkgs.system}.custom-performance ]; diff --git a/modules/hardware/performance.nix b/modules/hardware/performance.nix index 868124f..c238e4b 100644 --- a/modules/hardware/performance.nix +++ b/modules/hardware/performance.nix @@ -1,5 +1,5 @@ {self, ...}: { - flake.nixosModules.performance-desktop = {pkgs,...}: { + flake.nixosModules.performance-desktop = {pkgs, ...}: { environment.systemPackages = [ self.packages.${pkgs.system}.custom-performance ]; diff --git a/modules/utilities/agenix.nix b/modules/utilities/agenix.nix index 0e22b1b..0e32703 100644 --- a/modules/utilities/agenix.nix +++ b/modules/utilities/agenix.nix @@ -4,9 +4,9 @@ inputs.agenix.packages.${pkgs.system}.default pkgs.age ]; - age.identityPaths = [ - "/etc/ssh/ssh_host_ed25519_key" - ]; + age.identityPaths = [ + "/etc/ssh/ssh_host_ed25519_key" + ]; age.secrets.ntfy = { file = ../../secrets/ntfy.age; owner = "tomasr"; diff --git a/modules/utilities/autoUpdate.nix b/modules/utilities/autoUpdate.nix index a0a26e0..9261cd0 100644 --- a/modules/utilities/autoUpdate.nix +++ b/modules/utilities/autoUpdate.nix @@ -1,5 +1,9 @@ {self, ...}: { - flake.nixosModules.autoUpdate-laptop = {pkgs, config, ...}: { + flake.nixosModules.autoUpdate-laptop = { + pkgs, + config, + ... + }: { age.secrets.ntfy = { file = ../../secrets/ntfy.age; }; @@ -52,7 +56,11 @@ }; ## desktop - flake.nixosModules.autoUpdate-desktop = {pkgs, config,...}: { + flake.nixosModules.autoUpdate-desktop = { + pkgs, + config, + ... + }: { age.secrets.ntfy = { file = ../../secrets/ntfy.age; }; diff --git a/modules/utilities/gitBackup.nix b/modules/utilities/gitBackup.nix index 9ef9e09..e469833 100644 --- a/modules/utilities/gitBackup.nix +++ b/modules/utilities/gitBackup.nix @@ -1,5 +1,9 @@ {self, ...}: { - flake.nixosModules.gitBackup = {pkgs, config, ...}: { + flake.nixosModules.gitBackup = { + pkgs, + config, + ... + }: { age.secrets.ntfy = { file = ../../secrets/ntfy.age; }; @@ -54,7 +58,7 @@ text = '' # shellcheck disable=SC1090 source "$NTFY_SECRET" - + # checks if kdrive is available custom-checkKdrive diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 3b02e39..852d9e9 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,8 +1,7 @@ let backupAgeKey = "age1y4lhpk7awhjyu42p46ulg5q2c49r2lnwu8tyyk4ejj6jztd64uksfhd670"; laptopHostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJCsewl8ZXXMjRyO20cBIiuW2gA4mGoMkxQ0dcMyNidR root@nixos"; -in -{ +in { "ntfy.age".publicKeys = [ backupAgeKey laptopHostKey