diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix index 0404a62..ac7eb37 100644 --- a/hosts/macbook/default.nix +++ b/hosts/macbook/default.nix @@ -19,6 +19,7 @@ darwin.lib.darwinSystem { ../../modules/applications/discord.nix ../../modules/programming/nix.nix ../../modules/programming/terraform.nix + ../../modules/programming/python.nix ../../modules/programming/lua.nix ../../modules/programming/kubernetes.nix ]; diff --git a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua index 7150cf4..6d546e0 100644 --- a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua +++ b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua @@ -31,9 +31,16 @@ function obj:init() -- get the focused window local win = hs.window.focusedWindow() -- maximize if possible - for i = 1, 8 do - win:maximize() - end + win:maximize() + win:maximize() + win:maximize() + win:maximize() + win:maximize() + win:maximize() + win:maximize() + -- for i = 1, 8 do + -- win:maximize() + -- end end) end diff --git a/modules/darwin/utilities.nix b/modules/darwin/utilities.nix index b082145..df9f35a 100644 --- a/modules/darwin/utilities.nix +++ b/modules/darwin/utilities.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ config, pkgs, lib, ... }: { home-manager.users.${config.user} = { @@ -16,6 +16,11 @@ noti # Create notifications programmatically ]; + programs.fish.shellAbbrs = { + # Add noti for ghpr in Darwin + ghpr = lib.mkForce "gh pr create && sleep 3 && noti gh run watch"; + }; + }; } diff --git a/modules/editor/neovim/keybinds.lua b/modules/editor/neovim/keybinds.lua index f430972..73cb615 100644 --- a/modules/editor/neovim/keybinds.lua +++ b/modules/editor/neovim/keybinds.lua @@ -24,8 +24,8 @@ key("n", "", ":noh", { silent = true }) -- Shuffle lines around key("n", "", ":m .+1==") key("n", "", ":m .-2==") -key("i", "", ":m .+1==gi") -key("i", "", ":m .-2==gi") +-- key("i", "", ":m .+1==gi") +-- key("i", "", ":m .-2==gi") key("v", "", ":m '>+1gv=gv") key("v", "", ":m '<-2gv=gv") diff --git a/modules/programming/python.nix b/modules/programming/python.nix new file mode 100644 index 0000000..7c467e7 --- /dev/null +++ b/modules/programming/python.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: { + + home-manager.users.${config.user}.home.packages = with pkgs; [ + python310 # Standard Python interpreter + nodePackages.pyright # Python language server + ]; + +} diff --git a/modules/shell/fzf.nix b/modules/shell/fzf.nix index 1f20dc9..ea41ffc 100644 --- a/modules/shell/fzf.nix +++ b/modules/shell/fzf.nix @@ -11,10 +11,9 @@ body = '' set projdir ( \ fd \ - --search-path $HOME \ + --search-path $HOME/dev \ --type directory \ --hidden \ - --exclude ".local/**" \ "^.git\$" \ | xargs dirname \ | fzf) diff --git a/modules/shell/github.nix b/modules/shell/github.nix index 1fbe9e4..85c002d 100644 --- a/modules/shell/github.nix +++ b/modules/shell/github.nix @@ -18,6 +18,7 @@ grw = "gh run watch"; grf = "gh run view --log-failed"; grl = "gh run view --log"; + ghpr = "gh pr create && sleep 3 && gh run watch"; }; functions = { repos = {