From 2444a0412ce4d321d18c6ba36f7554ddd67c5c8a Mon Sep 17 00:00:00 2001 From: AsciiMoth Date: Fri, 22 Sep 2023 11:21:57 +0400 Subject: [PATCH] Add WM combination to spawn terminal with path selection --- flake.lock | 152 +---------------------- flake.nix | 16 --- machines/pcLexell/awesome/awesome/rc.lua | 3 +- 3 files changed, 5 insertions(+), 166 deletions(-) diff --git a/flake.lock b/flake.lock index 883bc4c..1de7df0 100644 --- a/flake.lock +++ b/flake.lock @@ -50,60 +50,7 @@ "type": "github" } }, - "flake-compat_3": { - "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-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1674771137, - "narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -200,44 +147,6 @@ "type": "github" } }, - "lib-aggregate": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1675685461, - "narHash": "sha256-lQwiNxuM5fC5X35I/yV+ggk6qm5xF0NRxS3N9HMaSQA=", - "owner": "nix-community", - "repo": "lib-aggregate", - "rev": "9c45658966e2c3fc832ce5bcf3dffea875fe4614", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lib-aggregate", - "type": "github" - } - }, - "nix-eval-jobs": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1675758945, - "narHash": "sha256-Cu9AAimZvhWkuoM2zgEhzXwsYqyWtOyUMWkvCHKNQgc=", - "owner": "nix-community", - "repo": "nix-eval-jobs", - "rev": "c99b34d93d1c3427ced50f37b2a12747023644dd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-eval-jobs", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1690881714, @@ -254,21 +163,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1675558495, - "narHash": "sha256-7jwOfNefWeqUk5i8yOVRWrm4klglVOubtGXU11ZId2o=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "c8c50fd1c544dad4f590c3b91c5d65c5ba6aff77", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1685801374, @@ -301,45 +195,6 @@ "type": "github" } }, - "nixpkgs-wayland": { - "inputs": { - "flake-compat": "flake-compat", - "lib-aggregate": "lib-aggregate", - "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675801308, - "narHash": "sha256-NzhHyw1j7MIWjHEwC3hPyHQLDa0pPpPjGnEXvX71Vj4=", - "owner": "colemickens", - "repo": "nixpkgs-wayland", - "rev": "cff171e61aae4e2e7ce0e2cf3b099a5df19316b0", - "type": "github" - }, - "original": { - "owner": "colemickens", - "repo": "nixpkgs-wayland", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1675040521, - "narHash": "sha256-+YhT+lQT95qHcj5SNXdRFqIV/SvAezT90T8GzqQ94lE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "99f5676ba0a0c2d7605b63b2dd1b146c384f42dd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1691012695, @@ -357,8 +212,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -383,7 +238,6 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "sops-nix": "sops-nix", @@ -431,7 +285,7 @@ "stylix": { "inputs": { "base16": "base16", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index ddfacbf..c746573 100644 --- a/flake.nix +++ b/flake.nix @@ -19,14 +19,6 @@ url = "github:nix-community/NUR"; #inputs.nixpkgs.follows = "nixpkgs"; }; - #agenix = { - # url = "github:ryantm/agenix"; - # inputs.nixpkgs.follows = "nixpkgs"; - #}; - nixpkgs-wayland = { - url = "github:colemickens/nixpkgs-wayland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; stylix = { url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -35,11 +27,6 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - #systems.url = "github:nix-systems/x86_64-linux"; - #flake-utils = { - # url = "github:numtide/flake-utils"; - # inputs.systems.follows = "systems"; - #; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -51,8 +38,6 @@ home-manager, stable, nur, - #agenix, - nixpkgs-wayland, stylix, sops-nix, pre-commit-hooks, @@ -79,7 +64,6 @@ ./machines/pcLexell home-manager.nixosModules.home-manager nur.nixosModules.nur - #agenix.nixosModules stylix.nixosModules.stylix sops-nix.nixosModules.sops {nixpkgs.overlays = [nur.overlay];} diff --git a/machines/pcLexell/awesome/awesome/rc.lua b/machines/pcLexell/awesome/awesome/rc.lua index 10d9a0f..21a02c7 100644 --- a/machines/pcLexell/awesome/awesome/rc.lua +++ b/machines/pcLexell/awesome/awesome/rc.lua @@ -327,11 +327,12 @@ globalkeys = gears.table.join( -- Standard program awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, {description = "open a terminal", group = "launcher"}), + awful.key({ modkey, "Shift" }, "Return", function () awful.spawn(terminal .. " -e fish -C cdd") end, + {description = "open a terminal", group = "launcher"}), awful.key({ modkey, "Control" }, "r", awesome.restart, {description = "reload awesome", group = "awesome"}), awful.key({ modkey, "Shift" }, "q", awesome.quit, {description = "quit awesome", group = "awesome"}), - awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, {description = "increase master width factor", group = "layout"}), awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end,