diff --git a/flake.lock b/flake.lock index 11a55cc..aa0fca2 100644 --- a/flake.lock +++ b/flake.lock @@ -108,11 +108,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1750615580, - "narHash": "sha256-8ucRXBCG5vA1nHCH1agRDBZaiuPKuqb/RsPxQEsHeVk=", + "lastModified": 1750800495, + "narHash": "sha256-wBTGFNCx3Gr3BkNkEoFrKx9+d7otSdQesCDCPGDKZHk=", "owner": "cachix", "repo": "devenv", - "rev": "e5dfaa34eed24f1ec79e99624666b15f51c4be97", + "rev": "b33ab3610c084a7e3fabc5eefaeb437449f1efe7", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -417,11 +417,11 @@ ] }, "locked": { - "lastModified": 1750654717, - "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", "type": "github" }, "original": { @@ -514,11 +514,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750640498, - "narHash": "sha256-cT1xmlmS4DkfZQQfZ+ZimWxG39epZVhf3+bztjVwKHI=", + "lastModified": 1750826269, + "narHash": "sha256-jbSKrqzsXnyqiSv8PZF+dRts0BVGW+ay23szu8762ng=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "9e04eb8290c75bdf3e74d1371269966a63398f89", + "rev": "3dbc672d3c11a58be972df4af9026621743b8184", "type": "github" }, "original": { @@ -529,11 +529,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -561,11 +561,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1750357784, - "narHash": "sha256-x0Jghc0S9UqdXP5424EIt8ap4vIeM6OnOOFYbuoU9wU=", + "lastModified": 1750802210, + "narHash": "sha256-tblaE3vaQ+BkX0+TNn/H/npGWO6GRT0M4nTKO9wGgxU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da4640c92b11c8aab1587588734fcd76037d71fe", + "rev": "e3003c1464819fda468cf19dcb717e5c17f64d83", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750330365, - "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", "type": "github" }, "original": { @@ -593,11 +593,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750741721, + "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "4b1164c3215f018c4442463a27689d973cffd750", "type": "github" }, "original": { @@ -625,27 +625,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736320768, - "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", + "lastModified": 1750741721, + "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "4b1164c3215f018c4442463a27689d973cffd750", "type": "github" }, "original": { @@ -690,11 +674,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -712,7 +696,7 @@ "nix-darwin": "nix-darwin", "nix4vscode": "nix4vscode", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", @@ -723,14 +707,17 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nix4vscode", + "nixpkgs" + ] }, "locked": { - "lastModified": 1742178793, - "narHash": "sha256-S2onMdoDS4tIYd3/Jc5oFEZBr2dJOgPrh9KzSO/bfDw=", + "lastModified": 1750819193, + "narHash": "sha256-XvkupGPZqD54HuKhN/2WhbKjAHeTl1UEnWspzUzRFfA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "954582a766a50ebef5695a9616c93b5386418c08", + "rev": "1ba3b9c59b68a4b00156827ad46393127b51b808", "type": "github" }, "original": { @@ -763,11 +750,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750562714, - "narHash": "sha256-GEQdMsWrij7y1UjuONVZYWLBo1OPIt709KcyCxcDfxU=", + "lastModified": 1750810405, + "narHash": "sha256-7Aa6jLbbltPVBCz34UXjIXkmrV1qq+6TYhJ37fErQhg=", "owner": "danth", "repo": "stylix", - "rev": "100b968012804d6526c5f48a32c30680916bc474", + "rev": "1fc22894545f5adf915e245b3c3e92639fd70f64", "type": "github" }, "original": { @@ -920,11 +907,11 @@ ] }, "locked": { - "lastModified": 1750649182, - "narHash": "sha256-beNAQ63SY8HxBsFdMGv/fdLzjQMYgifMh1DcmaIzMjo=", + "lastModified": 1750825830, + "narHash": "sha256-XZPouU2n9BWp0d363eaIPLlxall3aTrNCgeba3MusXA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c0785a69fe3988b4ef44c74575f4a2f698f91f32", + "rev": "3273db752bf1a61a0b734e521aa6377fd2e9a942", "type": "github" }, "original": { diff --git a/home/panotaka/common/core/shell/common.nix b/home/panotaka/common/core/shell/common.nix new file mode 100644 index 0000000..cfa3de4 --- /dev/null +++ b/home/panotaka/common/core/shell/common.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + home.packages = builtins.attrValues { + inherit + (pkgs) + oterm + ; + }; +} diff --git a/home/panotaka/common/core/shell/default.nix b/home/panotaka/common/core/shell/default.nix index 340fca7..28bdf6e 100644 --- a/home/panotaka/common/core/shell/default.nix +++ b/home/panotaka/common/core/shell/default.nix @@ -7,6 +7,7 @@ ./bat.nix ./btop.nix ./carapace.nix + ./common.nix ./direnv.nix ./eza.nix ./fish.nix diff --git a/home/panotaka/common/core/shell/zellij.nix b/home/panotaka/common/core/shell/zellij.nix index 9a1f23f..820f32a 100644 --- a/home/panotaka/common/core/shell/zellij.nix +++ b/home/panotaka/common/core/shell/zellij.nix @@ -1,9 +1,9 @@ { programs.zellij = { enable = true; - enableBashIntegration = true; - enableZshIntegration = true; - enableFishIntegration = true; + enableBashIntegration = false; + enableZshIntegration = false; + enableFishIntegration = false; settings = { #simplified_ui = true; pane_frames = false;