finally fixing the ups, plus tons of formatting

2024-08-23 12:00:51 -05:00
parent a8dfd2b7da
commit cd809e4156
59 changed files with 321 additions and 641 deletions
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -43,7 +43,10 @@ in

  apps.discover-wrapped.enable = lib.mkDefault false;

-  nix.settings.trusted-users = lib.mkDefault [ "root" user ];
+  nix.settings.trusted-users = lib.mkDefault [
+    "root"
+    user
+  ];

  services = {
    # Enable Desktop Environment.
@@ -132,7 +135,10 @@ in
    user.services = {
      rclone-home-proton = {
        enable = lib.mkDefault true;
-        path = [ pkgs.bash pkgs.rclone ];
+        path = [
+          pkgs.bash
+          pkgs.rclone
+        ];
        script = ''
          rclone sync /home/matt proton-drive:backup-nix --exclude '/home/matt/Games/**' --exclude '/home/matt/1TB/**' --exclude '/home/matt/Downloads/**'
        '';
@@ -140,7 +146,11 @@ in

      rsync-home = {
        enable = lib.mkDefault true;
-        path = [ pkgs.bash pkgs.rsync pkgs.openssh ];
+        path = [
+          pkgs.bash
+          pkgs.rsync
+          pkgs.openssh
+        ];
        script = ''
          rsync -rtpogvPlHzs --ignore-existing --exclude={'/home/matt/Games', '/home/matt/1TB', '/home/matt/Downloads/*', '/home/matt/.cache'} -e ssh /home/matt admin@10.0.1.18:/media/nas/main/backup/desktop-nix/home 
        '';
@@ -207,9 +217,7 @@ in
      wineWowPackages.waylandFull
    ];

-    sessionVariables = lib.mkDefault {
-      STEAM_FORCE_DESKTOPUI_SCALING = "1";
-    };
+    sessionVariables = lib.mkDefault { STEAM_FORCE_DESKTOPUI_SCALING = "1"; };

  };

--- a/hosts/desktop/cosmic/default.nix
+++ b/hosts/desktop/cosmic/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
  specialisation.cosmic.configuration = {
    services = {
@@ -10,4 +10,4 @@
      desktopManager.plasma6.enable = false;
    };
  };
-}
+}
--- a/hosts/desktop/filesystems.nix
+++ b/hosts/desktop/filesystems.nix
@@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-  outputs,
-  pkgs,
-  ...
-}:
+{ ... }:
 {
  fileSystems."/media/nas/backup" = {
    device = "//10.0.1.18/Backup";
--- a/hosts/desktop/gnome/default.nix
+++ b/hosts/desktop/gnome/default.nix
@@ -3,7 +3,7 @@
  specialisation.gnome.configuration = {

    home-manager.users.matt = import ./home.nix;
-    
+
    services = {
      xserver = {
        desktopManager.gnome.enable = true;
@@ -37,4 +37,4 @@

    # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
  };
-}
+}
--- a/hosts/desktop/gnome/home.nix
+++ b/hosts/desktop/gnome/home.nix
@@ -29,4 +29,4 @@
      "org/gtk/settings/file-chooser".clock-format = "12h";
    };
  };
-}
+}
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -4,11 +4,9 @@
 {
  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }:
-
 {
  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 let
  shellAliases = {
    ll = "ls -alh";
--- a/hosts/desktop/hyprland/config/btop/default.nix
+++ b/hosts/desktop/hyprland/config/btop/default.nix
@@ -7,7 +7,7 @@
      truecolor = true;
      force_tty = false;
      presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty";
-      vim_keys = true; 
+      vim_keys = true;
      rounded_corners = true;
      graph_symbol = "braille";
      graph_symbol_cpu = "default";
@@ -68,4 +68,4 @@
      log_level = "WARNING";
    };
  };
-}
+}
--- a/hosts/desktop/hyprland/config/hypr/default.nix
+++ b/hosts/desktop/hyprland/config/hypr/default.nix
@@ -35,8 +35,8 @@
        "$mod, E, exec, nautilus"
        "$mod, V, togglefloating, "
        "$mod, D, exec, nwg-drawer -fm nautilus -term kitty"
-        "$mod, P, pseudo, "# dwindle
-        "$mod, S, togglesplit, "# dwindle
+        "$mod, P, pseudo, " # dwindle
+        "$mod, S, togglesplit, " # dwindle
        "$mod SHIFT, Q, exec, hyprlock"
        ", PRINT, exec, hyprshot -m region --clipboard-only"
        "$mod,F,exec,hyprctl dispatch fullscreen active"
@@ -93,7 +93,7 @@
        ", mouse:274, movewindow"
      ];

-      bindel =[ 
+      bindel = [
        ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
        ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
      ];
@@ -123,11 +123,11 @@
      decoration = {
        rounding = 10;
        blur = {
-            enabled = true;
-            size = 2;
-            passes = 2;
-            new_optimizations = true;
-            xray = false;
+          enabled = true;
+          size = 2;
+          passes = 2;
+          new_optimizations = true;
+          xray = false;
        };
        drop_shadow = "yes";
        shadow_range = 4;
@@ -154,16 +154,16 @@
      };

      dwindle = {
-          pseudotile = "yes";
-          preserve_split = "yes";
+        pseudotile = "yes";
+        preserve_split = "yes";
      };

      gestures = {
-          workspace_swipe = "off";
+        workspace_swipe = "off";
      };

      misc = {
-          force_default_wallpaper = 0;
+        force_default_wallpaper = 0;
      };

      workspace = [
@@ -203,7 +203,8 @@
        "nodim, class:Remote Desktop Connection"
        "nomaxsize, class:Remote Desktop Connection"
        "minsize 3840 2160, class:Remote Desktop Connection"
-      ]; 
+      ];
+
      windowrulev2 = [
        "float, class:Vmware-view,title:VMware Horizon Client"
        "size 3840 2160, class:Remote Desktop Connection"
@@ -250,7 +251,7 @@
        follow_mouse = 1;

        touchpad = {
-            natural_scroll = "no";
+          natural_scroll = "no";
        };

        sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
@@ -268,4 +269,4 @@
      exec-once = [silent] steam
    '';
  };
-}
+}
--- a/hosts/desktop/hyprland/config/mako/default.nix
+++ b/hosts/desktop/hyprland/config/mako/default.nix
@@ -18,4 +18,4 @@
    borderColor = "#8aadf4";
    progressColor = "over #363a4f";
  };
-}
+}
--- a/hosts/desktop/hyprland/config/waybar/default.nix
+++ b/hosts/desktop/hyprland/config/waybar/default.nix
@@ -1,8 +1,8 @@
 {
  # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
-  
+
  programs.waybar = {
-    enable  = true;
+    enable = true;
    systemd.enable = true;
    settings = {
      mainBar = {
@@ -13,94 +13,94 @@
        passthrough = false;
        gtk-layer-shell = true;
        height = 0;
-        modules-left = [
-            "hyprland/workspaces"
-        ];
+        modules-left = [ "hyprland/workspaces" ];

-        modules-center = [
-          "hyprland/window"
-        ];
+        modules-center = [ "hyprland/window" ];

        modules-right = [
-            "tray"
-            "custom/updates"
-            "keyboard-state#capslock"
-            "keyboard-state#numlock"
-            "pulseaudio"
-            "pulseaudio#microphone"
-            "network"
-            "clock"
-            "custom/weather"
+          "tray"
+          "custom/updates"
+          "keyboard-state#capslock"
+          "keyboard-state#numlock"
+          "pulseaudio"
+          "pulseaudio#microphone"
+          "network"
+          "clock"
+          "custom/weather"
        ];

        "hyprland/window" = {
-            format = {};
+          format = { };
        };

        "hyprland/workspaces" = {
-            disable-scroll = true;
-            all-outputs = true;
-            on-click = "activate";
-            persistent_workspaces = {
-                "1" = [];
-            };
+          disable-scroll = true;
+          all-outputs = true;
+          on-click = "activate";
+          persistent_workspaces = {
+            "1" = [ ];
+          };
        };

        "custom/weather" = {
-            tooltip  = true;
-            format  = {};
-            interval  = 30;
-            exec  = "sudo waybar-weather";
-            return-type  = "json";
+          tooltip = true;
+          format = { };
+          interval = 30;
+          exec = "sudo waybar-weather";
+          return-type = "json";
        };

        "custom/updates" = {
-            tooltip  = true;
-            format  = {};
-            interval  = 60;
-            exec  = "sudo waybar-updates";
-            return-type  = "json";
+          tooltip = true;
+          format = { };
+          interval = 60;
+          exec = "sudo waybar-updates";
+          return-type = "json";
        };

        tray = {
-            icon-size = 16;
-            spacing = 10;
+          icon-size = 16;
+          spacing = 10;
        };

        clock = {
-            format = "{:%I:%M %p}";
-            tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          format = "{:%I:%M %p}";
+          tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
        };

        pulseaudio = {
-            format = "{icon} {volume}%";
-            tooltip = false;
-            format-muted = " Muted";
-            on-click = "pamixer -t";
-            on-click-right = "pavucontrol -t 1";
-            on-scroll-up = "pamixer -i 5";
-            on-scroll-down = "pamixer -d 5";
-            scroll-step = 5;
-            format-icons = {
-                headphone = "";
-                hands-free = "";
-                headset = "";
-                phone = "";
-                portable = "";
-                car = "";
-                default = ["" "" ""];
-            };
+          format = "{icon} {volume}%";
+          tooltip = false;
+          format-muted = " Muted";
+          on-click = "pamixer -t";
+          on-click-right = "pavucontrol -t 1";
+          on-scroll-up = "pamixer -i 5";
+          on-scroll-down = "pamixer -d 5";
+          scroll-step = 5;
+          format-icons = {
+            headphone = "";
+            hands-free = "";
+            headset = "";
+            phone = "";
+            portable = "";
+            car = "";
+            default = [
+              ""
+              ""
+              ""
+            ];
+          };
        };

        "pulseaudio#microphone" = {
-            format = "{format_source}";
-            format-source = "🎙{volume}%";
-            format-source-muted = "🎙Muted";
-            on-click = "pamixer --default-source -t";
-            on-click-right = "pavucontrol -t 2";
-            on-scroll-up = "pamixer --default-source -i 5";
-            on-scroll-down = "pamixer --default-source -d 5";
-            scroll-step = 5;
+          format = "{format_source}";
+          format-source = "🎙{volume}%";
+          format-source-muted = "🎙Muted";
+          on-click = "pamixer --default-source -t";
+          on-click-right = "pavucontrol -t 2";
+          on-scroll-up = "pamixer --default-source -i 5";
+          on-scroll-down = "pamixer --default-source -d 5";
+          scroll-step = 5;
        };

        network = {
@@ -299,4 +299,4 @@
      }
    '';
  };
-}
+}
--- a/hosts/desktop/hyprland/config/wofi/default.nix
+++ b/hosts/desktop/hyprland/config/wofi/default.nix
@@ -142,4 +142,4 @@
      }
    '';
  };
-}
+}
--- a/hosts/desktop/sops.nix
+++ b/hosts/desktop/sops.nix
@@ -1,12 +1,10 @@
-{
-  ...
-}:
+{ ... }:
 {
  sops.defaultSopsFile = ../../secrets/secrets.yaml;
  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];

-  sops.secrets."desktop/matt_password" = {};
+  sops.secrets."desktop/matt_password" = { };
  sops.secrets."desktop/matt_password".neededForUsers = true;

-  sops.secrets."wifi" = {};
-}
+  sops.secrets."wifi" = { };
+}