From 50c927fea3042415853a4b94a71c7c54dd1cc952 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 25 Jan 2022 15:42:32 +0100 Subject: [PATCH 1/4] flake: bump inputs Also change a removed package alias' name. --- flake.lock | 30 +++++++++++++++--------------- home/gtk/default.nix | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index cea0e05..6b8581e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1640802000, - "narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=", + "lastModified": 1641576265, + "narHash": "sha256-G4W39k5hdu2kS13pi/RhyTOySAo7rmrs7yMUZRH0OZI=", "owner": "ryantm", "repo": "agenix", - "rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629", + "rev": "08b9c96878b2f9974fc8bde048273265ad632357", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "futils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1641355100, - "narHash": "sha256-rg5VlPXjmmTxlHJllm3udjuMd2QjHPN1OuaAHn3fe1k=", + "lastModified": 1643066491, + "narHash": "sha256-wIgqFCJ6v7COpgNY0lMHDnU9RP2dJgasa2jKkB0zhWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "426ab2cf111fca61308bd86fe652e14aa12cc2d2", + "rev": "462d4a7abdfb8cb762584745a480ad01c207570e", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1641230035, - "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=", + "lastModified": 1642903813, + "narHash": "sha256-0lNfGW8sNfyTrixoQhVG00Drl/ECaf5GbfKAQ1ZDoyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78cd22c1b8604de423546cd49bfe264b786eca13", + "rev": "689b76bcf36055afdeb2e9852f5ecdd2bf483f87", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nur": { "locked": { - "lastModified": 1641355656, - "narHash": "sha256-8R99GoEDO34mKzS5b47pnmEOSZA9zEWppM+JbR0gouQ=", + "lastModified": 1643102027, + "narHash": "sha256-5kvpVU3SLdCLnX3OH1hBsNuwJiKZ3g3cNGpFhHF96NE=", "owner": "nix-community", "repo": "NUR", - "rev": "777c477c1dce9e5f2b47ca79b1db11a59207391a", + "rev": "124931ce061845fb0eb1c2a0f031f3fa9d4d6746", "type": "github" }, "original": { diff --git a/home/gtk/default.nix b/home/gtk/default.nix index 77ca477..62d3f81 100644 --- a/home/gtk/default.nix +++ b/home/gtk/default.nix @@ -21,12 +21,12 @@ in }; iconTheme = { - package = pkgs.gnome3.gnome_themes_standard; + package = pkgs.gnome.gnome-themes-extra; name = "Adwaita"; }; theme = { - package = pkgs.gnome3.gnome_themes_standard; + package = pkgs.gnome.gnome-themes-extra; name = "Adwaita"; }; }; From b0820571709a0ea3e3956859c2e4018fb29d5455 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 25 Jan 2022 15:44:12 +0100 Subject: [PATCH 2/4] home: firefox: add 'consent-o-matic' --- home/firefox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/firefox/default.nix b/home/firefox/default.nix index b161834..b0b624f 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -68,6 +68,7 @@ in extensions = with pkgs.nur.repos.rycee.firefox-addons; ([ bitwarden + consent-o-matic form-history-control https-everywhere i-dont-care-about-cookies From 633a422532a248e0b5c27ee0f36abed621409e4e Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 25 Jan 2022 15:45:02 +0100 Subject: [PATCH 3/4] home: firefox: remove 'i-dont-care-about-cookies' Should be superseded by Consent-O-Matic now. --- home/firefox/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/firefox/default.nix b/home/firefox/default.nix index b0b624f..41389b5 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -71,7 +71,6 @@ in consent-o-matic form-history-control https-everywhere - i-dont-care-about-cookies reddit-comment-collapser reddit-enhancement-suite refined-github From 9dd3dceb83e11f65d5c2d992d170a22675291411 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 25 Jan 2022 15:46:17 +0100 Subject: [PATCH 4/4] home: ssh: add 'work' host --- home/git/default.ignore | 4 ++++ home/ssh/default.nix | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/home/git/default.ignore b/home/git/default.ignore index a169a28..77aedcc 100644 --- a/home/git/default.ignore +++ b/home/git/default.ignore @@ -24,3 +24,7 @@ compile_commands.json # Swap and backup files *~ ~.swp + +# Direnv files +.envrc +.direnv/ diff --git a/home/ssh/default.nix b/home/ssh/default.nix index 3bd7f28..cbfd30c 100644 --- a/home/ssh/default.nix +++ b/home/ssh/default.nix @@ -40,6 +40,12 @@ in identityFile = "~/.ssh/shared_rsa"; user = "ambroisie"; }; + + work = { + hostname = "workspaces.dgexsol.fr"; + identityFile = "~/.ssh/shared_rsa"; + user = "bruno_belanyi"; + }; }; extraConfig = ''