From cc58835189ec12130d7da6e193d7dcdadc14c5e3 Mon Sep 17 00:00:00 2001 From: reo101 Date: Sat, 15 Apr 2023 18:09:55 +0300 Subject: [PATCH] chore!(homix): update `nixpkgs` Also rename `lib` to `util` to avoid confusion --- flake.lock | 124 +++++++++--------- flake.nix | 5 +- .../x86_64-linux/homix/configuration.nix | 24 +++- {lib => util}/default.nix | 0 4 files changed, 85 insertions(+), 68 deletions(-) rename {lib => util}/default.nix (100%) diff --git a/flake.lock b/flake.lock index 081d154..52d3a6a 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1665690101, - "narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=", + "lastModified": 1680729003, + "narHash": "sha256-M9LHTL24/W4oqgbYRkz0B2qpNrkefTs98pfj3MxIXnU=", "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced", + "rev": "dc048afa066287a719ddbab62b3e19e4b5110cf0", "type": "github" }, "original": { @@ -129,12 +129,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -197,11 +200,11 @@ }, "hardware": { "locked": { - "lastModified": 1678095239, - "narHash": "sha256-4F6jovFJcwh6OkMsY94ZrHdrvVqZi1FX5pYv6V9LIQw=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f6610997b0fc5ea5f9e142c348fca27497efe1c7", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -214,20 +217,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1677757546, - "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=", + "lastModified": 1681468923, + "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=", "owner": "nix-community", "repo": "home-manager", - "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a", + "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -254,11 +256,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1678060331, - "narHash": "sha256-JnKiZsG4MlNDNaSy9WvRJF2a6gaeiqtw0BmYNQ4DquQ=", + "lastModified": 1681541834, + "narHash": "sha256-LRAfvzWVTAbOKasVIVh4RJl8nhOq3uZ1DQGJleGsp6A=", "owner": "neovim", "repo": "neovim", - "rev": "e389b189021cb6b72cfd7583ce6fb5d8d3346d45", + "rev": "0a61cb60a633f05e3f05f8d5dae241910a92ee1f", "type": "github" }, "original": { @@ -277,11 +279,11 @@ ] }, "locked": { - "lastModified": 1678090567, - "narHash": "sha256-ZSKhaesPn2WHnqfshj6TDHO5ob1o+wgUjiP4oZ11eLc=", + "lastModified": 1681546346, + "narHash": "sha256-tANWXcsWGi78lWWtKvebIDSUpfzhNC4pyeHU/sj5a6g=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "13bcb7770ffa76e5e35a9dc1c12b146c22f10bdf", + "rev": "b0e4272a92496088bf58546ad05350174bb7fff2", "type": "github" }, "original": { @@ -296,11 +298,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1672236234, - "narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=", + "lastModified": 1680875144, + "narHash": "sha256-Ub/Y+/zoAoji+E7WCLbTykcTmfRiyzLJ5QEyR3NbHgY=", "owner": "misterio77", "repo": "nix-colors", - "rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1", + "rev": "41cc6c1086a4d26509f9fc80a538131d03a11234", "type": "github" }, "original": { @@ -316,11 +318,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1681154394, + "narHash": "sha256-avnu1K9AuouygBiwVKuDp6emiTET43az3rcpv0ctLjc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "025912529dd0b31dead95519e944ea05f1ad56f2", "type": "github" }, "original": { @@ -382,11 +384,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1681465517, + "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", "type": "github" }, "original": { @@ -414,11 +416,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1655599917, - "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=", + "lastModified": 1680397293, + "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb", + "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a", "type": "github" }, "original": { @@ -477,11 +479,11 @@ }, "nur": { "locked": { - "lastModified": 1679168785, - "narHash": "sha256-DQ79Ih7qhXdoePmLtf1pXVc+JZwpm+SVBkpsPkY8Y9k=", + "lastModified": 1681541221, + "narHash": "sha256-lt+iea1TlHzWGfbShveXj6FOE8FXC5nHnBOjz8ftfHM=", "owner": "nix-community", "repo": "NUR", - "rev": "04277085ab26a094f5eee2c0303e473bd1bc2ee0", + "rev": "425b65fc5dca82de0d628b43638ee93599660f57", "type": "github" }, "original": { @@ -505,6 +507,21 @@ "zls-overlay": "zls-overlay" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tres": { "flake": false, "locked": { @@ -518,21 +535,6 @@ } }, "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { "locked": { "lastModified": 1652776076, "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", @@ -553,7 +555,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1671338321, @@ -578,11 +580,11 @@ ] }, "locked": { - "lastModified": 1678104540, - "narHash": "sha256-djjTbyH31o70eeA4RouFn1Fau1/Xkt2+yNV0T+6uGg4=", + "lastModified": 1681560430, + "narHash": "sha256-HuU22HP2Ah2E5MWbQ9u6YoB6L1txnCM8nyCpax8flnA=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "5cb7ca6e5b70b11a0f1504736164b6fd34ec98c9", + "rev": "0ece65731201765d2c2c5078e7c29cefc00d4977", "type": "github" }, "original": { @@ -601,11 +603,11 @@ ] }, "locked": { - "lastModified": 1678018077, - "narHash": "sha256-Gwzyc99gdpi7m7i6pRQhtAjWcvJRvJT65s2E9CTjCg0=", + "lastModified": 1681474068, + "narHash": "sha256-Yo90j0o1+T6ab2XGK3Yjy0Sm+fAG9VswoANINgHAWfc=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "09cda6f73587dd4d5dfa8ab8490a94eff5651001", + "rev": "097485122ab0a997ed094a26c11d437a86f4cd93", "type": "github" }, "original": { @@ -627,11 +629,11 @@ "zig-overlay": "zig-overlay_2" }, "locked": { - "lastModified": 1678045107, - "narHash": "sha256-F5NICNfaxhZ0wzeFNvnivStYF5Fi8I6vO3y4F8s8WY4=", + "lastModified": 1681494644, + "narHash": "sha256-1VvQvIPaynMc/+bwXy46cSMlND2D6f+IKB4odOjaERo=", "owner": "zigtools", "repo": "zls", - "rev": "8edb8bcac34b53ad674470cc06f2ea2d9ad72be1", + "rev": "421ae86917127ac6050c3fdbb6b153d664bb04e8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3880b98..f42e050 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ # Home Manager home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -77,8 +77,9 @@ } @ inputs: let inherit (self) outputs; + util = import ./util { inherit inputs outputs; }; in - with (import ./lib { inherit inputs outputs; }); rec { + with util; rec { # Packages (`nix build`) packages = forEachPkgs (pkgs: import ./pkgs { inherit pkgs; } diff --git a/machines/nixos/x86_64-linux/homix/configuration.nix b/machines/nixos/x86_64-linux/homix/configuration.nix index b6451db..f3382e0 100644 --- a/machines/nixos/x86_64-linux/homix/configuration.nix +++ b/machines/nixos/x86_64-linux/homix/configuration.nix @@ -28,7 +28,9 @@ }; # Clean temporary directory on boot - cleanTmpDir = true; + tmp = { + cleanOnBoot = true; + }; # Enable support for nfs and ntfs supportedFilesystems = [ @@ -121,11 +123,13 @@ "__GLX_VENDOR_LIBRARY_NAME" = "nvidia"; "WLR_NO_HARDWARE_CURSORS" = "1"; "MOZ_DISABLE_RDD_SANDBOX" = "1"; + "MOZ_ENABLE_WAYLAND" = "1"; "EGL_PLATFORM" = "wayland"; "XDG_CURRENT_DESKTOP" = "sway"; # river "XKB_DEFAULT_LAYOUT" = "us,bg"; "XKB_DEFAULT_VARIANT" = ",phonetic"; "XKB_DEFAULT_OPTIONS" = "caps:escape,grp:lalt_lshift_toggle"; + # "WLR_RENDERER" = "vulkan"; # BUG: river crashes }; ### Wayland specific @@ -144,10 +148,16 @@ }; # Enable desktop portal - xdg.portal.extraPortals = [ - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-wlr - ]; + xdg.portal = { + enable = true; + wlr = { + enable = true; + }; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-wlr + ]; + }; ## X11 specific services.xserver = { @@ -195,6 +205,10 @@ extraGroups = [ "wheel" "docker" ]; }; + programs.zsh = { + enable = true; + }; + home-manager = { backupFileExtension = "hm-bak"; useUserPackages = true; diff --git a/lib/default.nix b/util/default.nix similarity index 100% rename from lib/default.nix rename to util/default.nix