From 24891562a864004da84cf7274c9d5442a6e3365c Mon Sep 17 00:00:00 2001 From: greg-compass Date: Tue, 3 Jan 2023 11:29:40 -0600 Subject: [PATCH 1/4] Update ffmac and Darwin to non-dbus --- flake.lock | 6 +++--- home/default.nix | 10 +++++----- home/gui/chat.nix | 6 +++--- hosts/linode/synapse.nix.crypt | 28 ++++++++++++++++------------ 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 9b4372b..f4781c6 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1670028550, - "narHash": "sha256-jrCEzbRfcNBSy0YHYPLpMSeoluryej3EuqdMZsR1bhQ=", + "lastModified": 1672274978, + "narHash": "sha256-Ui3WNLr/WsXwZ/GM1RI9PuBJj8nKr0DZLkBX/BHpJT4=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "8f3697c4ea0b138255a30b65510a25d393c4ce4c", + "rev": "b147ba53ff19743066e4f8c7c15422e710164b9c", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 521f6d0..8c28d1e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -51,14 +51,14 @@ let gnome = false; }; - arch = { system = "aarch64-linux"; }; + arm = { system = "aarch64-linux"; }; x86 = { system = "x86_64-linux"; }; darwin = { system = "x86_64-darwin"; }; in { - "wsl" = mkhome (gui // arch); - "aarch64-gui" = mkhome (gdm // arch); - "aarch64-nogui" = mkhome (cli // arch); + "wsl" = mkhome (gui // arm); + "aarch64-gui" = mkhome (gdm // arm); + "aarch64-nogui" = mkhome (cli // arm); "x86_64-gui" = mkhome (gdm // x86); "x86_64-nogui" = mkhome (cli // x86); - "x86_64-darwin" = mkhome (gdm // darwin); + "x86_64-darwin" = mkhome (gui // darwin); } diff --git a/home/gui/chat.nix b/home/gui/chat.nix index f8eee62..d53ffe5 100644 --- a/home/gui/chat.nix +++ b/home/gui/chat.nix @@ -6,12 +6,12 @@ let element-desktop slack ]; - archPkgs = with pkgs; [ + armPkgs = with pkgs; [ element-desktop ]; in { - home.packages = ( if ( pkgs.stdenv.hostPlatform.isDarwin ) then darwinPkgs else - ( if ( lib.hasPrefix "aarch64" pkgs.system ) then archPkgs else + home.packages = ( if ( pkgs.stdenv.hostPlatform.isDarwin ) then darwinPkgs else + ( if ( lib.hasPrefix "aarch64" pkgs.system ) then armPkgs else ( if ( lib.hasPrefix "x86_64" pkgs.system ) then x86Pkgs else [] ) ) ); diff --git a/hosts/linode/synapse.nix.crypt b/hosts/linode/synapse.nix.crypt index d589708..d9021cd 100644 --- a/hosts/linode/synapse.nix.crypt +++ b/hosts/linode/synapse.nix.crypt @@ -1,12 +1,16 @@ -x6ns0UtbX6AcSBJfaW25BVEVRXmKdZW7bRPFJvCvkt/nWw/qZPwDzwOhORRooyJR -14MXmRGmL3nfhlnZahxblVrHkOwCje4ADrE/cNf4+V4AOMlnMbIwkH1a7y9jAsBF -LbiBgQ1NOE/TcLHwmnCByKO6VkZG03e53skydYITVa6uummPLcvZVeL97Cx+8gfy -QPXmyLFQ9DzR5vVDVkRIM1UK6eZWM5NyWdVoyhfiK4QP+KsPkmxsA3l/safrm8Qy -U3LlyXuk/wmfk9ZiPp1cWmruH4xdfaVbYPeGhAqRdwSdIgngpR2CJJVc7d/rve3l -86+9yM6TIH6EB09cmjvT+Luim8l/5qrG0eeK3d0iUGkrHRzLa/7VGnlxi8zZGn3m -9k4qyZjAPG27d5/4wp3KsLFWKpvjiNetpRDMpHYJfjptvYg7WrYxndeRIBLf7MJ7 -jN7oQhKJSQLR3QhIv5nH7T0wsKWIv4ua8jEPi+/sqdCvHN4kBiwpUHyRCuBO12+2 -EeuB8GnILRv0gh9hfQBnPVdv8A3grgfZElc3UkwharcrRIgBsb7a3I+4TbyQd9Bq -nVZgkl/5jRLd2SyRX68Ny1DYBzepH2nMh5v6Q6h+WFXsTC5INulitvLk1UUfnlvW -CbiJl1TsGlJwJLI53WS7lO/mUWe6KEIp33eqHgnaNTXWrCbq4jdqj5l6Im7B5ciz -WEbvkg+HFwOGLKdutk4fTyQucyPqEI/GP2uM9ZBLZKA= +x7fcaoUM3nYDlFoW+gcKfm9bkVaoftvoKrbrJm21OCR4tnrsWCey7tuN2DDvBnru +F54E4XT/TuU6cDg73FwXjQmkQo4lzP5USwwEHeXXz1w5s0fpfMiTT9TLlD47vCyQ +LeYHiILzav+UiJQmxORSXUbso/XKLKnhL486e6TMtsfLH7h0sziXPY5OAhIJd++3 +TiNZM+njgfQaPr9Ih1fuEbfH9/6PxIqMr2V4M/IQFqQ9FW4y8OMiiyk3wXcWzpBG +Y325MIboZHzLahgeHmnWJYJlpZQzjmsd9z3ApTgHdIELy2K2bgD1uS3qitFKqUpT +1y0ZBW0BRxsbBARHz+u132jG2Z+AcTOkKuk5oZYtatDP/V5kaemH3d1GZZUBrPHY +AXbfFP4Fswvdw8FxRX6QSZRmYBVfao1xwNEZf49QmabyxgZkuDzGPBxbfMiXETg/ +lw309msVld1QpHSVtn9aJIKmjkpNEReFoPyb0oRLUEZWb3ixVwulD9NpPijWhdZS +vg1JDtK3czt9mRX63hNYif/QEHIN0dlzNh90zuith2WMa4OWQM4E+j2d42KUjpJ9 +X+5zeu2v8LmzrI8X01SGj4eMWG0CvasrbHWkCL4S1kyL0Kx+izH8mP98w/XSgV5U +rOjkw8J40ExcTlWkNDPWnDXlxHzsl8s0DLHKE9MoucczJKXqcGQOQyZTdDDVY3ww +jdt48WvJyn7xFc4m0piorQyt+615kTL6Ac8AQJVSpep4hxLAdWMSTRpCDljA488X +z2Pz2nJG7OsPu3QUy959426hyYIaXSYovybwu8NSjhnKyaXhR98IAwYc92exW1JU +xaqpPCVSpDkbndEQ3hPTucursJUvWhVspXTV1P6egwW2UGwvmtiWYXwBoEx4zQZt +CDYgvJsa9tPbyQn88PgReJnAA6P+K9M3NQDFp62rVKcm5h465UlDDrXBPWLIwUrA +mrOsRqMWr9xmbHS2eI5Wt0C8+h1tj9ktGWbwaQ0orakMSHpNogXqIltsX8P4+VJU From a4a0843139706264fd6a4d1f9d70e806ee261aa5 Mon Sep 17 00:00:00 2001 From: greg-compass Date: Tue, 3 Jan 2023 15:51:16 -0600 Subject: [PATCH 2/4] Do not install FF on Darwin --- home/gui/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix index f3ea6b1..9156f6f 100644 --- a/home/gui/firefox.nix +++ b/home/gui/firefox.nix @@ -13,7 +13,7 @@ let in with lib; { programs.firefox = { - enable = true; + enable = (! pkgs.stdenv.hostPlatform.isDarwin); package = ffPkgs; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden From b5ecc6efb7c542e81e46e8e5157476a3939a6b07 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 14 Jan 2023 13:42:31 -0600 Subject: [PATCH 3/4] Latest WSL updates --- flake.lock | 12 ++++++------ flake.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index f4781c6..d90d484 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1671740841, - "narHash": "sha256-y9xl0aYI9uOJpNabIVja7aksDgV5nMgH8MsWaEOW2bM=", + "lastModified": 1673339198, + "narHash": "sha256-5EAIJq89sTFooJ5vhsnaw7mDtKVDICvCv2ul7+BXAgA=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "3ec8fafb7b5d1463cb166233cf18bf495dd8e944", + "rev": "217178edb1127fb41ac4fd534d8a513c3dd3d81b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4f43dfc..828e53c 100644 --- a/flake.nix +++ b/flake.nix @@ -82,9 +82,9 @@ "lappy" = machine { name = "lappy"; }; "iso" = machine { name = "iso"; }; # nix build '.#nixosConfigurations.wsl.config.system.build.installer' - "wsl" = machine { name = "wsl"; }; + "nixos" = machine { name = "wsl"; system = "aarch64-linux"; }; # nix build '.#nixosConfigurations.wsl-aarch.config.system.build.installer' - "wsl-aarch" = machine { name = "wsl"; system = "aarch64-linux"; }; + "nixos-arm" = machine { name = "wsl"; system = "aarch64-linux"; }; }; darwinConfigurations = From f42fad1bdf5871f85a956997f9821326d5ba8fce Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sun, 22 Jan 2023 00:00:51 -0600 Subject: [PATCH 4/4] Desktop updates --- home/gui/chat.nix | 1 + hosts/linode/synapse.nix.crypt | 38 ++++++++++++++++----------- modules-all/automatic/nix.nix | 11 ++++++++ modules-linux/automatic/syncthing.nix | 2 +- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/home/gui/chat.nix b/home/gui/chat.nix index d53ffe5..913e0e0 100644 --- a/home/gui/chat.nix +++ b/home/gui/chat.nix @@ -3,6 +3,7 @@ let darwinPkgs = []; x86Pkgs = with pkgs; [ + discord element-desktop slack ]; diff --git a/hosts/linode/synapse.nix.crypt b/hosts/linode/synapse.nix.crypt index d9021cd..62151fc 100644 --- a/hosts/linode/synapse.nix.crypt +++ b/hosts/linode/synapse.nix.crypt @@ -1,16 +1,22 @@ -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 diff --git a/modules-all/automatic/nix.nix b/modules-all/automatic/nix.nix index feb18e6..1026545 100644 --- a/modules-all/automatic/nix.nix +++ b/modules-all/automatic/nix.nix @@ -4,6 +4,17 @@ # Enable flakes nix = { package = pkgs.nixFlakes; + buildMachines = [ + { + hostName = "dns.me.ts"; + system = "aarch64-linux"; + } + + { + hostName = "jude.me.ts"; + system = "x86_64-linux"; + } + ]; settings = { experimental-features = "nix-command flakes"; diff --git a/modules-linux/automatic/syncthing.nix b/modules-linux/automatic/syncthing.nix index 1bd8471..1778dba 100644 --- a/modules-linux/automatic/syncthing.nix +++ b/modules-linux/automatic/syncthing.nix @@ -9,7 +9,7 @@ let in { services.syncthing = { - enable = true; + enable = false; user = "greg"; group = "users"; dataDir = "/home/greg/sync";