From 026f8d63d53ab2b61dd5d4048dbfc017c6eb3e17 Mon Sep 17 00:00:00 2001 From: Redyf Date: Fri, 3 May 2024 22:09:10 -0300 Subject: [PATCH 1/4] refactor: change tmux binds to switch windows It's more optimal this way, ALT + SHIFT + j/k feels good. --- home/redyf/cli-apps/tmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/redyf/cli-apps/tmux/default.nix b/home/redyf/cli-apps/tmux/default.nix index 163db7a5..46acea70 100644 --- a/home/redyf/cli-apps/tmux/default.nix +++ b/home/redyf/cli-apps/tmux/default.nix @@ -42,8 +42,8 @@ in { # Keybinds #-------------------------------------------------------------------------- # Shift Alt vim keys to switch windows - bind -n M-H previous-window - bind -n M-L next-window + bind -n M-J previous-window + bind -n M-K next-window # Open panes in current directory bind '"' split-window -v -c "#{pane_current_path}" From 92a64f5b45e775092691e9a05c6e2b098436ee7e Mon Sep 17 00:00:00 2001 From: Redyf Date: Sat, 4 May 2024 16:27:23 -0300 Subject: [PATCH 2/4] feat: update flake inputs --- flake.lock | 282 ++--------------------------------------------------- 1 file changed, 10 insertions(+), 272 deletions(-) diff --git a/flake.lock b/flake.lock index 165bf176..22739c3a 100644 --- a/flake.lock +++ b/flake.lock @@ -107,38 +107,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -161,48 +129,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -257,42 +183,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -316,28 +206,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713722610, - "narHash": "sha256-kcZsbH1PQTG+sS22u/igLq2SaBEHJgmU5hoKzrT2ukI=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "4615d28841e93f6f549fde9188caf493b3822668", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -595,7 +463,7 @@ "xdg-portal-hyprland", "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1713121246, @@ -677,52 +545,6 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1713809929, - "narHash": "sha256-0GB//RpezlOsI9+1/oT8PkEIO8I4DGfAfw3KotTSnzQ=", - "owner": "neovim", - "repo": "neovim", - "rev": "39fc340276a4fdbe1f1bb4bfbe7328267ad7f9d6", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1713830781, - "narHash": "sha256-Xizkp8EgHpLlUZOhN4PpwRlMaL0xcVxdQORS4eGaKmg=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "7b0a51e51c4c116e540ed01e668d17023900b518", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -745,26 +567,6 @@ "type": "github" } }, - "nix-ld-rs": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1713589173, - "narHash": "sha256-8LBvfDbnuPMrF43bmejUZwD9TuP081iuG1nLl8m0jM4=", - "owner": "nix-community", - "repo": "nix-ld-rs", - "rev": "c4f56b515ed0bf8c2cd4d6a13224067017a6dc39", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-ld-rs", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1713254108, @@ -828,38 +630,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1713714268, - "narHash": "sha256-ZJGnom7YthvNxUZLdUzy5VePTwYgDYcnnPpyHT4n9lY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "69ee1d82f1fa4c70a3dc9a64111e7eef3b8e4527", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1713714899, "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", @@ -875,7 +645,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1713537308, "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", @@ -891,7 +661,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1712963716, "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", @@ -984,9 +754,7 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "monolisa-script": "monolisa-script", - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nix-ld-rs": "nix-ld-rs", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "nur": "nur", "sf-mono-liga-src": "sf-mono-liga-src", "waybar-hyprland": "waybar-hyprland", @@ -1070,36 +838,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1114,7 +852,7 @@ "type": "github" } }, - "systems_8": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1129,7 +867,7 @@ "type": "github" } }, - "systems_9": { + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1150,8 +888,8 @@ "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_8", - "systems": "systems_7", + "nixpkgs": "nixpkgs_6", + "systems": "systems_5", "wlroots": "wlroots_2", "xdph": "xdph_2" }, @@ -1207,8 +945,8 @@ "inputs": { "hyprland-protocols": "hyprland-protocols_3", "hyprlang": "hyprlang_3", - "nixpkgs": "nixpkgs_9", - "systems": "systems_9" + "nixpkgs": "nixpkgs_7", + "systems": "systems_7" }, "locked": { "lastModified": 1713724432, From 7cd244e507f7d6f41e4b1b7f87d182fd8bb985b1 Mon Sep 17 00:00:00 2001 From: Redyf Date: Sat, 4 May 2024 16:28:23 -0300 Subject: [PATCH 3/4] chore: delete pom package Not needed anymore as my PR has been approved in nixpkgs, should be available soon. --- home/redyf/apps/default.nix | 1 - home/redyf/apps/pom/default.nix | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 home/redyf/apps/pom/default.nix diff --git a/home/redyf/apps/default.nix b/home/redyf/apps/default.nix index 4d556eaa..33214e3b 100644 --- a/home/redyf/apps/default.nix +++ b/home/redyf/apps/default.nix @@ -8,7 +8,6 @@ _: { ./insomnia ./misc ./obs - ./pom # ./vscode ]; } diff --git a/home/redyf/apps/pom/default.nix b/home/redyf/apps/pom/default.nix deleted file mode 100644 index 022bae35..00000000 --- a/home/redyf/apps/pom/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - (pkgs.callPackage ../../../../pkgs/pom.nix { - src = pom; # pkg source is passed as a `specialArgs` and injected into this module. - }) - ]; -} From 9847be72a83230a2aa7f8d6b453f24bf93297b69 Mon Sep 17 00:00:00 2001 From: Redyf Date: Sat, 4 May 2024 16:28:33 -0300 Subject: [PATCH 4/4] feat: add emacs override --- home/redyf/apps/emacs/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/redyf/apps/emacs/default.nix b/home/redyf/apps/emacs/default.nix index 5eaccf07..bb7ade9e 100644 --- a/home/redyf/apps/emacs/default.nix +++ b/home/redyf/apps/emacs/default.nix @@ -1,7 +1,13 @@ {pkgs, ...}: { programs.emacs = { enable = true; - package = pkgs.emacs; # replace with pkgs.emacs-gtk, or a version provided by the community overlay if desired. + package = pkgs.emacs.override { + withGTK3 = true; + withGTK2 = false; + withPgtk = true; # true on wayland + withNativeCompilation = true; + withTreeSitter = true; + }; }; services.emacs = { enable = true;