diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 64872a7..87d3327 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -575,6 +575,10 @@ "org/gnome/desktop/wm/keybindings" = { minimize = ["h"]; show-desktop = ["d"]; + move-to-workspace-left = ["h"]; + move-to-workspace-right = ["l"]; + switch-to-workspace-left = ["h"]; + switch-to-workspace-right = ["l"]; # mouse-button-modifier = ''; # default }; "org/gnome/desktop/interface" = { @@ -599,6 +603,9 @@ "org/gnome/shell/extensions/tilingshell" = { inner-gaps = 8; + outer-gaps = 8; + window-border-width = 2; + window-border-color = "rgba(116,199,236,0.47)"; focus-window-right = ["l"]; focus-window-left = ["h"]; focus-window-up = ["k"]; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index b082664..1021d97 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -754,6 +754,7 @@ papirus-icon-theme adwaita-icon-theme adwaita-icon-theme-legacy + hydrapaper ]; }; diff --git a/templates/rust/nix/packages.nix b/templates/rust/nix/packages.nix index 72d06e2..43327bd 100644 --- a/templates/rust/nix/packages.nix +++ b/templates/rust/nix/packages.nix @@ -1,6 +1,7 @@ -{pkgs, ...}: rec { - my-package = pkgs.rustPlatform.buildRustPackage { - pname = "my-binary"; +{pkgs, ...}: let + pname = "my-package"; + main-package = pkgs.rustPlatform.buildRustPackage { + inherit pname; version = "0.1.0"; /* @@ -16,7 +17,9 @@ src = ./..; hash = pkgs.lib.fakeHash; cargoHash = pkgs.lib.fakeHash; + useFetchCargoVendor = true; }; - - default = my-package; +in { + ${pname} = main-package; + default = main-package; } diff --git a/templates/rust/nix/shells.nix b/templates/rust/nix/shells.nix index 85be850..7e4499c 100644 --- a/templates/rust/nix/shells.nix +++ b/templates/rust/nix/shells.nix @@ -4,10 +4,10 @@ ... }: let inherit (pkgs) system; -in rec { - my-package-dev = pkgs.mkShell { +in { + default = pkgs.mkShell { inherit (self.checks.${system}.git-hooks) shellHook; - inputsFrom = [self.packages.${system}.my-package]; + inputsFrom = [self.packages.${system}.default]; packages = with pkgs; [ convco rustPackages.clippy @@ -18,5 +18,4 @@ in rec { lldb ]; }; - default = my-package-dev; }