From a42932d6f01db95d91e2b1a0bc25bf61b6270c74 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Sun, 3 Sep 2023 22:44:05 +0200 Subject: [PATCH 1/2] dregil: Set zsh as default shell --- hosts/dregil/configuration.nix | 3 +++ outputs/homeConfigurations/default.nix | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index ad00bf8..1a54eaa 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -104,6 +104,7 @@ in { "wheel" # Enable ‘sudo’ for the user. "input" ]; + shell = pkgs.zsh; }; # List packages installed in system profile. To search, run: @@ -132,6 +133,8 @@ in { programs.steam = { enable = true; }; + programs.zsh = { enable = true; }; + # List services that you want to enable: # Enable the OpenSSH daemon. diff --git a/outputs/homeConfigurations/default.nix b/outputs/homeConfigurations/default.nix index b12e670..ec43ba4 100644 --- a/outputs/homeConfigurations/default.nix +++ b/outputs/homeConfigurations/default.nix @@ -40,7 +40,7 @@ in { programs = { alacritty.enable = true; - autorandr.enable = true; + # autorandr.enable = true; browserpass = { enable = true; @@ -62,6 +62,13 @@ in { rofi.enable = true; rofi.pass.enable = true; zathura.enable = true; + + zsh = { + enable = true; + loginExtra = '' + export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)" + ''; + }; }; services.gpg-agent = { @@ -70,7 +77,7 @@ in { sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ]; }; - services.autorandr = { enable = true; }; + # services.autorandr = { enable = true; }; xsession.enable = true; } From 36c91c115f4f647ca8fc42b591c429274a04e186 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 4 Sep 2023 06:38:40 +0200 Subject: [PATCH 2/2] flake: Update inputs --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 995ec9e..4867227 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1684153753, - "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1687494897, - "narHash": "sha256-JnNX/aW8arJew41JYDs1JuZYQqW1C7kXXjo3Sblb3y8=", + "lastModified": 1693764991, + "narHash": "sha256-0YIkCKO29g5Rej4p3Dw9whXHaAsIqjOKPj9EHMKCKlk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1ceb43ef790d7676fa50c0085438e51c0b67e657", + "rev": "5b560c5fa73d718fb546404418a234e31d8bacf0", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1691312444, - "narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=", + "lastModified": 1693713564, + "narHash": "sha256-00w2uwb4O6Y1e2W5LG5UFyl1ZN3KFG7aoRdYEvT/BqA=", "owner": "nix-community", "repo": "home-manager", - "rev": "903e06d734bcae48efb79b9afd51b406d2744179", + "rev": "8e49b883890ccb52c059abb152b00a416342ec1c", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1687163790, - "narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=", + "lastModified": 1693208669, + "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337", + "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687379288, - "narHash": "sha256-cSuwfiqYfeVyqzCRkU9AvLTysmEuSal8nh6CYr+xWog=", + "lastModified": 1693636127, + "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef0bc3976340dab9a4e087a0bcff661a8b2e87f3", + "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1", "type": "github" }, "original": { @@ -281,11 +281,11 @@ }, "nixpkgs-droid": { "locked": { - "lastModified": 1690470004, - "narHash": "sha256-l57RmPhPz9r1LGDg/0v8bYgJO8R+GGTQZtkIxE7negU=", + "lastModified": 1693636127, + "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9462344318b376e157c94fa60c20a25b913b2381", + "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1", "type": "github" }, "original": { @@ -313,11 +313,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1687379288, - "narHash": "sha256-cSuwfiqYfeVyqzCRkU9AvLTysmEuSal8nh6CYr+xWog=", + "lastModified": 1693636127, + "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef0bc3976340dab9a4e087a0bcff661a8b2e87f3", + "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1", "type": "github" }, "original": { @@ -329,11 +329,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1691186842, - "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", + "lastModified": 1693663421, + "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", + "rev": "e56990880811a451abd32515698c712788be5720", "type": "github" }, "original": {