From ce6bbfdde0c793703730f985c19f1ed0aa19210c Mon Sep 17 00:00:00 2001 From: Daniel Meiburg Date: Wed, 27 Sep 2023 11:33:45 +0200 Subject: [PATCH] Good base install on desktop --- configuration.nix | 1 + dotfiles | 2 +- flake.lock | 12 ++++++------ home.nix | 20 +++++++++++++++++--- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/configuration.nix b/configuration.nix index 3b61d19..4507105 100644 --- a/configuration.nix +++ b/configuration.nix @@ -78,6 +78,7 @@ programs = { ssh.startAgent = false; gnupg.agent = { + pinentryFlavor = "qt"; enable = true; enableSSHSupport = true; }; diff --git a/dotfiles b/dotfiles index 64c3569..484242c 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 64c3569bb9ac13152785d4bfa17831dd4c5a8afb +Subproject commit 484242c9dcab97d89eba98f784615a4e6829772b diff --git a/flake.lock b/flake.lock index a7d4623..4950aa1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695224363, - "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", + "lastModified": 1695738267, + "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", + "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 4c5e3e0..77aabdd 100644 --- a/home.nix +++ b/home.nix @@ -8,18 +8,20 @@ htop ripgrep pavucontrol - fish pass kitty waybar - kanshi pulseaudio gcc fzf nnn + gnumake + tree-sitter + nodejs + pinentry-qt + kanshi # All of the below is for sway wl-clipboard - mako bemenu ]; home.stateVersion = "22.11"; @@ -57,4 +59,16 @@ programs.browserpass = { enable = true; }; + services.mako = { + enable = true; + }; + home.pointerCursor = { + name = "Adwaita"; + package = pkgs.gnome.adwaita-icon-theme; + size = 24; + x11 = { + enable = true; + defaultCursor = "Adwaita"; + }; + }; }