From 8f2751e8f6d429245cba3e8f98700771aab8e037 Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Mon, 13 May 2024 14:58:07 +0100 Subject: [PATCH] updates --- flake.lock | 276 ++++++++++++++++++++++++++++++++-- hosts/default/home.nix | 1 + modules/desktop/hyprland.nix | 5 +- modules/home-manager/tmux.nix | 20 +++ 4 files changed, 289 insertions(+), 13 deletions(-) create mode 100644 modules/home-manager/tmux.nix diff --git a/flake.lock b/flake.lock index 13c0ad7..bc8c56c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,128 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems" + }, + "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_3": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig", + "zls": "zls" + }, + "locked": { + "lastModified": 1715104037, + "narHash": "sha256-WHJUTRRCtmpTB32o8W30uLgLuVVI9j3hANhQcB1GXZk=", + "ref": "refs/heads/main", + "rev": "4dd3b107c67513d6642481eb648fd65ed5c080f7", + "revCount": 6069, + "type": "git", + "url": "ssh://git@github.com/mitchellh/ghostty.git" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/mitchellh/ghostty.git" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "ghostty", + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -55,7 +178,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1713472482, @@ -78,7 +201,7 @@ "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", - "systems": "systems_3", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, @@ -152,7 +275,7 @@ "hypridle", "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1713121246, @@ -199,7 +322,7 @@ "hyprlock", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1713121246, @@ -221,7 +344,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1714659497, @@ -262,6 +385,18 @@ "type": "github" } }, + "langref": { + "flake": false, + "locked": { + "narHash": "sha256-94broSBethRhPJr0G9no4TPyB8ee6BQ/hHK1QnLPln0=", + "type": "file", + "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + }, + "original": { + "type": "file", + "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + } + }, "nixpkgs": { "locked": { "lastModified": 1714253743, @@ -278,6 +413,38 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1702049175, + "narHash": "sha256-c/q2+tGHbmLgzT3sXyUKVJR98h1CTks2+nkVaoZPRM0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b15508bd65870620f1df5864e8e861dffbc4e428", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1713687659, + "narHash": "sha256-Yd8KuOBpZ0Slau/NxFhMPJI0gBxeax0vq/FD0rqKwuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1714635257, @@ -296,6 +463,7 @@ }, "root": { "inputs": { + "ghostty": "ghostty", "home-manager": "home-manager", "hypridle": "hypridle", "hyprland": "hyprland", @@ -306,16 +474,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -379,6 +547,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { @@ -428,6 +611,79 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1713659103, + "narHash": "sha256-WgWH0HPGsxd7Ov5M4Ug7qjmxbTeG8517xO6hY3198tU=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "a13735003a235a2e4e202b47277129f99bfc9294", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig-overlay": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "ghostty", + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711627798, + "narHash": "sha256-4BUZmgUFrrD5dRZbOUYRRQEDwLX/r7/ErLi+vHfB/+8=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "b01e0b81d1fa489e54362ea0a74f182eaa9a35bb", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zls": { + "inputs": { + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "langref": "langref", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ], + "zig-overlay": "zig-overlay" + }, + "locked": { + "lastModified": 1711925513, + "narHash": "sha256-DFgsGlEGsxLgtRrh7J+v8x4w+/cJatTCkrZP3/0Gb/o=", + "owner": "zigtools", + "repo": "zls", + "rev": "4e01c08f558ea07462aaa7b71d2a24f86f47a855", + "type": "github" + }, + "original": { + "owner": "zigtools", + "ref": "master", + "repo": "zls", + "type": "github" + } } }, "root": "root", diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 23680f2..ccf54d9 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -6,6 +6,7 @@ imports = [ ../../modules/home-manager/dunst.nix + ../../modules/home-manager/tmux.nix ../../modules/home-manager/terminals/alacritty.nix ../../modules/desktop/bluetooth.nix ../../modules/desktop/hyprland.nix diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 6c9ccc4..f721e77 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -123,7 +123,6 @@ gestures = { workspace_swipe = true; - workspace_swipe_numbered = true; }; windowrule = [ @@ -168,8 +167,8 @@ bind = [ # "$mainMod, grave, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable - "$altMod, Return, exec, $HOME/.local/bin/ghostty" - "$mainMod, Return, exec, $HOME/.local/bin/ghostty" # for apps that yoink alt- binds + "$altMod, Return, exec, ghostty" + "$mainMod, Return, exec, ghostty" # for apps that yoink alt- binds "$altMod SHIFT, Return, exec, alacritty" "$mainMod SHIFT, D, exec, discord --enable-blink-features=MiddleClickAutoscroll" "$mainMod SHIFT, E, exec, emacsclient -c -a 'emacs'" diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix new file mode 100644 index 0000000..e3f24e6 --- /dev/null +++ b/modules/home-manager/tmux.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: + +{ + programs.tmux = { + enable = true; + shell = "${pkgs.bash}/bin/bash"; + clock24 = true; + terminal = "tmux-256color"; + plugins = with pkgs; [ + tmuxPlugins.sensible + { + plugin = tmuxPlugins.catpuccin; + extraConfig = '' + set -g @catpuccin_flavour 'frappe' + set -g @catpuccin_date_time "%H:%M" + ''; + } + ]; + }; +}