From b58dc91ae574eb074ee5c57dc8cea11f1b1fa4eb Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sun, 17 Nov 2024 11:05:05 +0000 Subject: [PATCH] updates --- flake.lock | 6 ++-- home/common/programs/gpg.nix | 41 ++++++++++++++--------- home/common/programs/hyprland/default.nix | 16 +++++++-- home/common/programs/rust.nix | 7 ++++ home/common/programs/zsh.nix | 3 ++ hosts/arrakis/default.nix | 2 +- hosts/common/features/docker.nix | 7 +++- hosts/common/features/wayland.nix | 3 ++ hosts/common/global/default.nix | 2 ++ 9 files changed, 64 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 226c9f9..ff06e21 100644 --- a/flake.lock +++ b/flake.lock @@ -1002,11 +1002,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1730538333, - "narHash": "sha256-cG525DBXP+GJKZ0kzbqjLgbp8Otp+2sT9SsurQT6jWc=", + "lastModified": 1731410731, + "narHash": "sha256-g9rA4Sd6vXCPf0nMimq0eqSYbEy8suKbtJ7HwRBt2zQ=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "2aeb30f3880d2e0b666a681da6645e86cf295791", + "rev": "0c20f410afc8a2156488a7c7ae73a242bfa7e106", "type": "github" }, "original": { diff --git a/home/common/programs/gpg.nix b/home/common/programs/gpg.nix index 24368d3..3c94cb9 100644 --- a/home/common/programs/gpg.nix +++ b/home/common/programs/gpg.nix @@ -8,22 +8,31 @@ { programs.gpg = { enable = true; - agent = { - enable = true; - enableScDaemon = true; - }; - pinentry = { - enable = true; - pinentryFlavor = "gnome3"; - }; - settings = { - keyserver = "hkps://keys.openpgp.org"; - use-agent = true; - use-agent-extra = true; - no-greeting = true; - verbose = true; - }; }; - programs.password-store.enable = true; + home.packages = with pkgs; [ pinentry-gnome3 ]; + + services.gpg-agent = { + enable = true; + pinentryPackage = pkgs.pinentry-gnome3; + }; + # pinentry = { + # enable = true; + # pinentryFlavor = "gnome3"; + # }; + # settings = { + # keyserver = "hkps://keys.openpgp.org"; + # use-agent = true; + # use-agent-extra = true; + # no-greeting = true; + # verbose = true; + # }; + # }; + + programs.password-store = { + enable = true; + settings = { + PASSWORD_STORE_DIR = "~/sync/pass"; + }; + }; } diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 0462de0..d5fe280 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -151,6 +151,12 @@ in "$mod SHIFT, 5, movetoworkspace, 5" "$mod SHIFT, 6, movetoworkspace, 6" + # Move active window inside workspace + "$mod SHIFT, h, movewindow, l" + "$mod SHIFT, j, movewindow, d" + "$mod SHIFT, k, movewindow, u" + "$mod SHIFT, l, movewindow, r" + # Scroll through existing workspaces with mod + scroll "$mod, mouse_down, workspace, e+1" "$mod, mouse_up, workspace, e-1" @@ -163,8 +169,14 @@ in ", XF86AudioNext, exec, playerctl next" ", XF86AudioPrev, exec, playerctl previous" ", XF86AudioPlay, exec, playerctl play-pause" - ", XF86MonBrightnessUp, exec, lightctl up" - ", XF86MonBrightnessDown, exec, lightctl down" + ", XF86MonBrightnessUp, exec, brightnessctl set 5%+" + ", XF86MonBrightnessDown, exec, brightnessctl set 5%-" + ]; + + bindm = [ + # Move/resize windows with mod + LMB/RMB and dragging + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" ]; }; }; diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix index 9ea6885..1875b56 100644 --- a/home/common/programs/rust.nix +++ b/home/common/programs/rust.nix @@ -7,4 +7,11 @@ ]; home.sessionPath = [ "\${CARGO_HOME:-~/.cargo}/bin" ]; + + systemd.user.services.ra-multiplex = { + Service = { + ExecStart = "/home/naps62/.cargo/bin/ra-multiplex server"; + }; + Install.WantedBy = [ "multi-user.target" ]; + }; } diff --git a/home/common/programs/zsh.nix b/home/common/programs/zsh.nix index 5de553d..aca117c 100644 --- a/home/common/programs/zsh.nix +++ b/home/common/programs/zsh.nix @@ -26,6 +26,7 @@ ps = "procs"; open = "xdg-open"; o = "xdg-open"; + v = "nohup neovide &; disown"; # cd ".." = "cd .."; @@ -65,6 +66,8 @@ # asdf-vm . "$HOME/.nix-profile/share/asdf-vm/asdf.sh" + + [[ -f ~/.secrets.zsh ]] && source ~/.secrets.zsh ''; }; diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index d512557..3c732bc 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -51,7 +51,7 @@ in let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-Y3/sfaV0ZJDs7g0xllMSUjP+n/CxbBjDBMXX4VVecoE="; + sha256 = "sha256-rDWxVY9NqeMs/BhShf4a0++KCPCgPmy2QPFehBvsmnk="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); diff --git a/hosts/common/features/docker.nix b/hosts/common/features/docker.nix index 2182736..8017322 100644 --- a/hosts/common/features/docker.nix +++ b/hosts/common/features/docker.nix @@ -4,9 +4,14 @@ enable = true; rootless = { enable = true; - setSocketVariable = true; + setSocketVariable = false; }; }; users.groups.docker = { }; + + networking.firewall = { + enable = false; + # checkReversePath = false; + }; } diff --git a/hosts/common/features/wayland.nix b/hosts/common/features/wayland.nix index 7edda10..3ee00a6 100644 --- a/hosts/common/features/wayland.nix +++ b/hosts/common/features/wayland.nix @@ -5,6 +5,9 @@ let in { programs.hyprland.enable = true; + environment.systemPackages = [ + pkgs.wl-clipboard + ]; services.greetd = { enable = true; diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index 34209f0..c82babb 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -30,4 +30,6 @@ LC_TIME = "pt_PT.UTF-8"; }; }; + + services.dbus.packages = with pkgs; [ gcr ]; }