Merge branch 'main' into stylix

dot_config/flake/home/common.nix

@@ -1,25 +1,19 @@
 {
   inputs,
   outputs,
-  # lib,
-  # config,
   pkgs,
   ...
 }: {
-  nixpkgs.config.allowUnfree = true;
-
-  home.username = "tyler";
-  home.homeDirectory = "/home/tyler";
+  #nixpkgs.config.allowUnfree = true;
 
   home.enableNixpkgsReleaseCheck = false;
 
   xdg.enable = true;
 
   imports = [
+    ./shell.nix
     ./fish.nix
     ./nushell.nix
-    # ./nom.nix
-    # ./neovim.nix
   ];
 
   nixpkgs = {
@@ -32,10 +26,7 @@
   };
 
   home.packages = with pkgs; [
-    # Fonts
-    #(nerdfonts.override {fonts = ["JetBrainsMono"];})
-
-    unstable.nix-output-monitor
+    # unstable.nix-output-monitor
 
     # dotfiles
     age
@@ -57,7 +48,7 @@
     git
 
     fzf
-    zoxide
+    just
 
     # Software Dev
     tig
@@ -128,6 +119,8 @@
   programs.zellij = {
     enable = true;
     package = pkgs.unstable.zellij;
+    enableFishIntegration = false;
+    enableZshIntegration = false;
   };
 
   programs.starship = {
@@ -156,6 +149,10 @@
     shellWrapperName = "y";
   };
 
-  home.stateVersion = "23.11";
+  programs.zoxide = {
+    enable = true;
+  };
+
+  # home.stateVersion = "23.11";
   programs.home-manager.enable = true;
 }

dot_config/flake/home/empty_shell.nix

@@ -0,0 +1,21 @@
+{...}: {
+  home.shellAliases = {
+    # Git
+    gc = "git commit";
+    gcm = "git commit -m";
+    gac = "git add . and git commit";
+    gacp = "gac and git push";
+    gs = "git status";
+
+    # nix
+    flake = "nix flake";
+
+    # home-manager
+    hm-upgrade = "nix flake update --flake ~/.local/share/chezmoi/dot_config/flake#";
+    hm-update = "home-manager switch --flake ~/.config/flake";
+
+    # chezmoi
+    dot_apply = "chezmoi apply";
+    dot_pull = "chezmoi update";
+  };
+}

dot_config/flake/home/fish.nix

@@ -7,8 +7,8 @@
       set -gx DEBEMAIL "tyler@tylermayoff.com"
 
       fish_add_path $HOME/.local/bin
-      fish_add_path /opt/homebrew/bin
-      fish_add_path /opt/homebrew/opt/llvm@18/bin
+      # fish_add_path /opt/homebrew/bin
+      # fish_add_path /opt/homebrew/opt/llvm@18/bin
 
       if test -e $HOME/.config/fish/variables-$(hostname)fish
         source $HOME/.config/fish/variables-$(hostname).fish
@@ -39,36 +39,5 @@
         src = pkgs.fishPlugins.forgit.src;
       }
     ];
-
-    shellAliases = {
-      # ls
-      ls = "eza $eza_params";
-      l = "eza --git-ignore $eza_params";
-      ll = "eza --all --header --long $eza_params";
-      llm = "eza --all --header --long --sort=modified $eza_params";
-      la = "eza -lbhHigUmuSa";
-      lx = "eza -lbhHigUmuSa@";
-      lt = "eza --tree $eza_params";
-      tree = "eza --tree $eza_params";
-
-      # Git
-      gc = "git commit";
-      gcm = "git commit -m";
-      gac = "git add . && git commit";
-      gacp = "gac && git push";
-      gs = "git status";
-
-      # yac = "yadm add . && yadm commit";
-      # yacp = "yac && yadm push";
-      # yc = "pushd $HOME/.local/share/yadm/repo.git && git-forgit add && yadm commit && popd";
-      # yd = "pushd $HOME/.local/share/yadm/repo.git && git-forgit diff && popd";
-
-      # nix
-      flake = "nix flake";
-
-      # home-manager
-      hm-upgrade = "nix flake update --flake ~/.local/share/chezmoi/dot_config/flake#";
-      hm-update = "home-manager switch --flake ~/.config/flake";
-    };
   };
 }

dot_config/flake/home/gui.nix

@@ -21,6 +21,8 @@
     # Office
     libreoffice
     obsidian
+
+    (config.lib.nixGL.wrap unstable.onagre)
   ];
 
   # programs.vscode.enable = true;

dot_config/flake/home/guidebolt/guidebolt.nix

@@ -8,9 +8,14 @@
 }: {
   imports = [../common.nix];
 
-  home.packages = with pkgs; [
-    # clang_17
-    # clang-tools
-    just
-  ];
+  home = {
+    username = "tyler";
+    homeDirectory = "/home/tyler";
+
+    packages = with pkgs; [
+      # clang_17
+      # clang-tools
+      just
+    ];
+  };
 }

dot_config/flake/home/hinge/darwin.nix

@@ -1,8 +1,62 @@
 {
-  inputs,
   outputs,
+  pkgs,
   lib,
   ...
 }: {
   # services.aerospace.enable = true;
+
+  imports = [
+    # ../fish.nix
+    ./sketchybar.nix
+  ];
+
+  nixpkgs = {
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.unstable-packages
+    ];
+
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  nix.extraOptions =
+    ''
+      auto-optimise-store = true
+      experimental-features = nix-command flakes
+    ''
+    + lib.optionalString (pkgs.system == "aarch64-darwin") ''
+      extra-platforms = x86_64-darwin aarch64-darwin
+    '';
+
+  users.knownUsers = ["tyler.mayoff"];
+  users.users."tyler.mayoff" = {
+    uid = 502;
+    shell = pkgs.fish;
+  };
+
+  system.defaults.NSGlobalDomain._HIHideMenuBar = true;
+
+  security.pam.enableSudoTouchIdAuth = true;
+
+  environment.systemPackages = with pkgs; [
+    pinentry_mac
+    llvmPackages_19.clang-tools
+
+    sketchybar
+    sbarlua
+
+    lua
+
+    # android-tools
+    jdk17
+  ];
+
+  programs.fish.enable = true;
+  programs.zsh.enable = true;
+
+  system.stateVersion = 5;
 }

dot_config/flake/home/hinge/hinge.nix

@@ -1,24 +1,15 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  # mac-app-util-src = builtins.fetchTarball {
-  #   url = "https://github.com/hraban/mac-app-util/archive/master.tar.gz";
-  #   sha256 = "1w80vjcnaysjlzxsp3v4pxq4yswbjvxs8ann2bk0m7rkjljnzz6m";
-  # };
-  # mac-app-util = import mac-app-util-src {};
-in rec {
+{pkgs, ...}: {
   imports = [
     ../stylix.nix
     ../common.nix
     ../kitty.nix
-    # mac-app-util.homeManagerModules.default
   ];
 
+  # xdg.enable = lib.mkForce false;
+
   home = {
-    username = lib.mkForce "tyler.mayoff";
-    homeDirectory = lib.mkForce "/Users/tyler.mayoff";
+    username = "tyler.mayoff";
+    # homeDirectory = /Users/tyler.mayoff;
 
     packages = with pkgs; [
       bazel_7
@@ -26,10 +17,7 @@ in rec {
       conan
 
       black
-    
-      # clang
-      # biome
-      deno
+
       swiftlint
       unstable.helix-gpt
       unstable.lsp-ai
@@ -42,13 +30,17 @@ in rec {
       just
       yarn
       cocoapods
-      # android-tools
-      jdk17
     ];
 
     sessionVariables = {
       ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk";
       PATH = "$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools";
     };
+
+    file.".gnupg/gpg-agent.conf".text = ''
+      pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
+    '';
   };
+
+  home.stateVersion = "24.11";
 }

dot_config/flake/home/hinge/sketchybar.nix

@@ -0,0 +1,6 @@
+{...}: {
+  # services.sketchybar = {
+  #   enable = true;
+  #   extraPackages = [];
+  # };
+}

dot_config/flake/home/mal/mal.nix

@@ -1,3 +1,8 @@
 {pkgs, ...}: {
   imports = [../common.nix];
+
+  home = {
+    username = "tyler";
+    homeDirectory = "/home/tyler";
+  };
 }

dot_config/flake/home/nushell.nix

@@ -1,44 +1,48 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   programs.nushell = {
     enable = true;
 
-    envFile = {
-      text = ''
-        $env.EDITOR = hx
-        $env.GIT_EDITOR = $env.EDITOR
-        $env.DEBMAIL = "tyler@tylermayoff.com"
-        $env.XDG_CONFIG_HOME = "$HOME/.config"
-        $env.XDG_CACHE_HOME = "$HOME/.cache"
-        $env.XDG_DATA_HOME = "$HOME/.local/share"
-        $env.XDG_STATE_HOME = "$HOME/.local/state"
-
-        zoxide init nushell | save -f ~/.config/nushell/zoxide.nu
-      '';
-    };
-
     shellAliases = {
       # Git
       gc = "git commit";
-      gcm = "git commit -m";
       gac = "git add . and git commit";
       gacp = "gac and git push";
       gs = "git status";
 
-      yac = "yadm add --interactive and yadm commit";
-      yacp = "yac and yadm push";
-
       # nix
       flake = "nix flake";
 
       # home-manager
-      hm-upgrade = "nix flake update --flake ~/.config/home-manager/";
-      hm-update = "home-manager switch --impure";
+      hm-upgrade = "nix flake update --flake ~/.local/share/chezmoi/dot_config/flake#";
+      hm-update = "home-manager switch --flake ~/.config/flake";
+
+      # chezmoi
+      dot_apply = "chezmoi apply";
+      dot_pull = "chezmoi update";
     };
 
-    configFile = {
-      text = ''
-        source ~/.config/nushell/zoxide.nu
-      '';
-    };
+    extraConfig = ''
+      $env.PATH = ($env.PATH | split row (char esep) | append "~/.nix-profile/bin")
+      $env.PATH = ($env.PATH | split row (char esep) | append "/nix/var/nix/profiles/default/bin")
+
+      $env.config.show_banner = false
+
+      def gcm [message: string] {
+        gc -m $"($message)"
+      }
+
+      use ${pkgs.nu_scripts}/share/nu_scripts/nu-hooks/nu-hooks/direnv/direnv.nu *
+
+      use ${pkgs.nu_scripts}/share/nu_scripts/aliases/git/git-aliases.nu *
+      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
+      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
+      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/rg/rg-completions.nu *
+      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/zellij/zellij-completions.nu *
+    '';
   };
 }

dot_config/flake/home/wash/wash.nix

@@ -1,7 +1,348 @@
-{pkgs, ...}: {
-  imports = [../common.nix ../gnome.nix ../home-backup.nix ../gui.nix ../stylix.nix];
+{
+  config,
+  pkgs,
+  ...
+}: let
+  mod = "Mod4";
+  term = "kitty";
+  menu = "wmenu-run";
+in {
+  imports = [../common.nix ../gnome.nix ../home-backup.nix ../gui.nix];
 
-  home.packages = with pkgs; [
-    ventoy
-  ];
+  programs.feh.enable = true;
+  programs.waybar = {
+    enable = true;
+    style = ''
+      * {
+        font-size: 15px;
+        font-family: "CodeNewRoman Nerd Font Propo";
+      }
+
+      window#waybar {
+        all:unset;
+      }
+
+      .modules-left {
+        padding: 7px;
+        margin: 10 0 5 10;
+        border-radius: 10px;
+        background: alpha(@background, .6);
+        box-shadow: 0px 0px 2px rgba(0, 0, 0, .6);
+      }
+
+      .modules-center {
+        padding: 7px;
+        margin: 10 0 5 0;
+        border-radius: 10px;
+        background: alpha(@background, .6);
+        box-shadow: 0px 0px 2px rgab(0, 0, 0, .6);
+      }
+
+      .modules-right {
+        padding: 7px;
+        margin: 10 0 5 0;
+        border-radius: 10px;
+        background: alpha(@background, .6);
+        box-shadow: 0px 0px 2px rgab(0, 0, 0, .6);
+      }
+
+      tooltip {
+        background: @background
+      }
+    '';
+
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        reload_style_on_change = true;
+
+        modules-left = ["clock" "tray"];
+        modules-center = ["sway/workspaces"];
+        modules-right = ["battery"];
+
+        "sway/workspaces" = {
+          format = "{icon}";
+          format-icons = {
+            active = "";
+            default = "";
+            empty = "";
+          };
+        };
+
+        "clock" = {
+          format = "{:%I:%M:%S %p} ";
+          interval = 1;
+          tooltip-format = "<tt>{calendar}</tt>";
+          calendar = {
+            format = {
+              today = "<span color='#fAfBfC'><b>{}</b></span>";
+            };
+          };
+          actions = {
+            on-click-right = "shift_down";
+            on-clock = "shift_up";
+          };
+        };
+
+        battery = {
+          interval = 30;
+          states = {
+            good = 95;
+            warning = 30;
+            critical = 20;
+          };
+          format = "{capacity}% {icon}";
+          format-charging = "{capacicty}% 󰂄";
+          format-plugged = "{capacity}% 󰂄 ";
+          format-alt = "{time} {icon}";
+          format-icons = [
+            "󰁻"
+            "󰁼"
+            "󰁾"
+            "󰂀"
+            "󰂂"
+            "󰁹"
+          ];
+        };
+
+        tray = {
+          icon-size = 14;
+          spacing = 10;
+        };
+      };
+    };
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+    checkConfig = true;
+    config = {
+      output."*".scale = "1";
+
+      startup = [
+        {command = "feh .config/flake/wallpaper.jpp";}
+      ];
+
+
+      # Home row direction keys, like vim
+      up = "k";
+      left = "h";
+      down = "j";
+      right = "l";
+
+      ### Idle configuration
+      #
+      # Example configuration:
+      #
+      # exec swayidle -w \
+      #          timeout 300 'swaylock -f -c 000000' \
+      #          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+      #          before-sleep 'swaylock -f -c 000000'
+      #
+      # This will lock your screen after 300 seconds of inactivity, then turn off
+      # your displays after another 300 seconds, and turn your screens back on when
+      # resumed. It will also lock your screen before your computer goes to sleep.
+
+      ### Input configuration
+      #
+      # Example configuration:
+      #
+      #   input "2:14:SynPS/2_Synaptics_TouchPad" {
+      #       dwt enabled
+      #       tap enabled
+      #       natural_scroll enabled
+      #       middle_emulation enabled
+      #   }
+      #
+      # You can get the names of your inputs by running: swaymsg -t get_inputs
+      # Read `man 5 sway-input` for more information about this section.
+
+      input = {
+        "*" = {
+          tap = "enabled";
+          natural_scroll = "enabled";
+        };
+      };
+
+      ### Key bindings
+      #
+      # Basics:
+
+      keybindings = {
+        # Start a terminal
+        "${mod}+Return" = "exec ${term}";
+
+        # Kill focused window
+        "${mod}+Shift+q" = "kill";
+
+        # Start launcher
+        "${mod}+d" = "exec ${menu}";
+
+        # Reload the configuration file
+        "${mod}+Shift+c" = "reload";
+
+        "${mod}+r" = "mode resize";
+
+        # Moving around:
+
+        # Move your focus around
+        # "${mod}+$left" = "focus left";
+        # "${mod}+$down" = "focus down";
+        # "${mod}+$up" = "focus up";
+        # "${mod}+$right" = "focus right";
+        # Or use $mod+[up|down|left|right]
+        "${mod}+Left" = "focus left";
+        "${mod}+Down" = "focus down";
+        "${mod}+Up" = "focus up";
+        "${mod}+Right" = "focus right";
+      };
+
+      # Drag floating windows by holding down $mod and left mouse button.
+      # Resize them with right mouse button + $mod.
+      # Despite the name, also works for non-floating windows.
+      # Change normal to inverse to use left mouse button for resizing and right
+      # mouse button for dragging.
+      # floating_modifier $mod normal
+
+      # Exit sway (logs you out of your Wayland session)
+      # bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+
+      #     # Move the focused window with the same, but add Shift
+      #     bindsym $mod+Shift+$left move left
+      #     bindsym $mod+Shift+$down move down
+      #     bindsym $mod+Shift+$up move up
+      #     bindsym $mod+Shift+$right move right
+      #     # Ditto, with arrow keys
+      #     bindsym $mod+Shift+Left move left
+      #     bindsym $mod+Shift+Down move down
+      #     bindsym $mod+Shift+Up move up
+      #     bindsym $mod+Shift+Right move right
+      # #
+      # # Workspaces:
+      # #
+      #     # Switch to workspace
+      #     bindsym $mod+1 workspace number 1
+      #     bindsym $mod+2 workspace number 2
+      #     bindsym $mod+3 workspace number 3
+      #     bindsym $mod+4 workspace number 4
+      #     bindsym $mod+5 workspace number 5
+      #     bindsym $mod+6 workspace number 6
+      #     bindsym $mod+7 workspace number 7
+      #     bindsym $mod+8 workspace number 8
+      #     bindsym $mod+9 workspace number 9
+      #     bindsym $mod+0 workspace number 10
+      #     # Move focused container to workspace
+      #     bindsym $mod+Shift+1 move container to workspace number 1
+      #     bindsym $mod+Shift+2 move container to workspace number 2
+      #     bindsym $mod+Shift+3 move container to workspace number 3
+      #     bindsym $mod+Shift+4 move container to workspace number 4
+      #     bindsym $mod+Shift+5 move container to workspace number 5
+      #     bindsym $mod+Shift+6 move container to workspace number 6
+      #     bindsym $mod+Shift+7 move container to workspace number 7
+      #     bindsym $mod+Shift+8 move container to workspace number 8
+      #     bindsym $mod+Shift+9 move container to workspace number 9
+      #     bindsym $mod+Shift+0 move container to workspace number 10
+      #     # Note: workspaces can have any name you want, not just numbers.
+      #     # We just use 1-10 as the default.
+      # #
+      # # Layout stuff:
+      # #
+      #     # You can "split" the current object of your focus with
+      #     # $mod+b or $mod+v, for horizontal and vertical splits
+      #     # respectively.
+      #     bindsym $mod+b splith
+      #     bindsym $mod+v splitv
+
+      #     # Switch the current container between different layout styles
+      #     bindsym $mod+s layout stacking
+      #     bindsym $mod+w layout tabbed
+      #     bindsym $mod+e layout toggle split
+
+      #     # Make the current focus fullscreen
+      #     bindsym $mod+f fullscreen
+
+      #     # Toggle the current focus between tiling and floating mode
+      #     bindsym $mod+Shift+space floating toggle
+
+      #     # Swap focus between the tiling area and the floating area
+      #     bindsym $mod+space focus mode_toggle
+
+      #     # Move focus to the parent container
+      #     bindsym $mod+a focus parent
+      # #
+      # # Scratchpad:
+      # #
+      #     # Sway has a "scratchpad", which is a bag of holding for windows.
+      #     # You can send windows there and get them back later.
+
+      #     # Move the currently focused window to the scratchpad
+      #     bindsym $mod+Shift+minus move scratchpad
+
+      #     # Show the next scratchpad window or hide the focused scratchpad window.
+      #     # If there are multiple scratchpad windows, this command cycles through them.
+      #     bindsym $mod+minus scratchpad show
+      # #
+      # # Resizing containers:
+      # #
+      # mode "resize" {
+      #     # left will shrink the containers width
+      #     # right will grow the containers width
+      #     # up will shrink the containers height
+      #     # down will grow the containers height
+      #     bindsym $left resize shrink width 10px
+      #     bindsym $down resize grow height 10px
+      #     bindsym $up resize shrink height 10px
+      #     bindsym $right resize grow width 10px
+
+      #     # Ditto, with arrow keys
+      #     bindsym Left resize shrink width 10px
+      #     bindsym Down resize grow height 10px
+      #     bindsym Up resize shrink height 10px
+      #     bindsym Right resize grow width 10px
+
+      #     # Return to default mode
+      #     bindsym Return mode "default"
+      #     bindsym Escape mode "default"
+      # }
+
+      # #
+      # # Utilities:
+      # #
+      #     # Special keys to adjust volume via PulseAudio
+      #     bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+      #     bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+      #     bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+      #     bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+      #     # Special keys to adjust brightness via brightnessctl
+      #     bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+      #     bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+      #     # Special key to take a screenshot with grim
+      #     bindsym Print exec grim
+
+      #
+      # Status Bar:
+      #
+      # Read `man 5 sway-bar` for more information about this section.
+
+      bars = [
+        {
+          command = "waybar";
+          position = "top";
+        }
+      ];
+    };
+  };
+
+  home = {
+    username = "tyler";
+    homeDirectory = "/home/tyler";
+
+    packages = with pkgs; [
+      ventoy
+      (config.lib.nixGL.wrap renderdoc)
+    ];
+
+    stateVersion = "23.11";
+  };
 }