From 2f1e7eeb8bb611f261abc211fde429a144810634 Mon Sep 17 00:00:00 2001 From: joy Date: Fri, 21 Jun 2024 23:30:00 +0200 Subject: [PATCH] retro --- flake.lock | 42 +++++++++++++++++++-------------------- home/hyprland/default.nix | 10 +++++++--- modules/default.nix | 2 +- modules/ssh/default.nix | 19 +++++++++++++----- 4 files changed, 43 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 7e9742f..47252e1 100644 --- a/flake.lock +++ b/flake.lock @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1718983978, + "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902", "type": "github" }, "original": { @@ -347,11 +347,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718835324, - "narHash": "sha256-zv6txIqsHPlQfUUadu8QBKO/TprwWQpKs1LCoHm3iok=", + "lastModified": 1718990734, + "narHash": "sha256-kKcFWnov4eYXvG+ONoSqOgOwOYVk806GnMPqnyG0MOQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "fabc30df52ab5d2c369fc8acd4ff909a6ba3b8ac", + "rev": "4a8b13ea4f8e5111390471c9212d10d4d032e837", "type": "github" }, "original": { @@ -613,11 +613,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -657,11 +657,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718869672, - "narHash": "sha256-artyEBzWUsNXtYj7jBr816wRJj2Y3DYDHw6ECrQotX0=", + "lastModified": 1718979027, + "narHash": "sha256-xj33owEyv36Hm8w6B+v24CUN7OkHMDhHOjVMnNtHw/U=", "owner": "nix-community", "repo": "nixvim", - "rev": "744dfea48bdd331e66b9e874822559fa6fae98af", + "rev": "4e224d27ae0db889f92ef228ad6cb984b91777fb", "type": "github" }, "original": { @@ -696,11 +696,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1718789425, - "narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=", + "lastModified": 1718971834, + "narHash": "sha256-k+BjPJgjmG+u8VwyzjA6YxkoBn9tP1m19h0CQGc3iGM=", "owner": "danth", "repo": "stylix", - "rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4", + "rev": "97dcf3c216fe5fb19c406e39f265d3bc9b851377", "type": "github" }, "original": { diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 6aa2854..f53b211 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -19,7 +19,7 @@ wayland.windowManager.hyprland = { enable = true; - xwayland.enable = true; + #xwayland.enable = true; settings = { "$mod" = "SUPER"; @@ -36,7 +36,11 @@ "XCURSOR_THEME = Bibata-Modern-Ice " "XCURSOR_SIZE = 24 " "HYPRCURSOR_THEME = Bibata-Modern-Ice" - "HYPRCURSOR_SIZE = 24" + "HYPRCURSOR_SIZE = 24" + "XDG_CURRENT_DESKTOP,Hyprland" + "XDG_SESSION_TYPE,wayland" + "XDG_SESSION_DESKTOP,Hyprland" + "QT_QPA_PLATFORM,wayland" ]; exec-once = [ @@ -68,7 +72,7 @@ "$mod, Q, killactive" "$mod, W, togglefloating" "$mod, R, togglesplit" - "$mod, Y, exec, systemctl suspend" + "$mod+shift, Y, exec, systemctl suspend" "$mod+shift, M, exit, hyprland" "$mod, L, exec, amixer -q sset Master 5%+" "$mod, K, exec, amixer -q sset Master 5%-" diff --git a/modules/default.nix b/modules/default.nix index 652d996..d8f0715 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -4,10 +4,10 @@ ./yazi ./sound ./vm - ./retro ./packages ./misc ./gdm ./ssh + #./retro ]; } diff --git a/modules/ssh/default.nix b/modules/ssh/default.nix index 54ceb84..98d95b5 100644 --- a/modules/ssh/default.nix +++ b/modules/ssh/default.nix @@ -1,9 +1,18 @@ { config, inputs, pkgs, ... }: { -services.openssh = { - enable = true; - settings.PasswordAuthentication = false; - settings.KbdInteractiveAuthentication = false; -}; + services.openssh = { + enable = true; + # require public key authentication for better security + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = true; + #settings.PermitRootLogin = "yes"; + }; + + # users.users.joy.openssh.authorizedKeys.keys = [ + # "ssh-rsa AAAAB3Nz....6OWM= user" # content of authorized_keys file + # note: ssh-copy-id will add user@your-machine after the public key + # but we can remove the "@your-machine" part +#]; + }