diff --git a/flake.lock b/flake.lock index 66d031c..54350d5 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1671154105, - "narHash": "sha256-OI6M2/Kcd1bJuodxV6rV5KtDJMUeewsqKy1B2PLNVys=", + "lastModified": 1671758850, + "narHash": "sha256-B6us/CLIIPJRJgjn/hVp7N07j90kil4HmjUVj8TBhKE=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "2150fd40b2110bbd11dcb62fa5f307ec345b0fb0", + "rev": "85a48dbec84e9c26785b58fecdefa1cfc580aea7", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1671128331, - "narHash": "sha256-oa3HZNgyAWEx09eElSISpRCltgYqHshjphJ9eeTO6As=", + "lastModified": 1671729646, + "narHash": "sha256-crrTM9K1q8zGZ2gibEPJAudAnr0bMqPiLr1I8P+I5ls=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c873175c2f8d96cd77c5b6552f411ddd0959e483", + "rev": "9c95614e0b1a2f6a3f4cf9b99b17439887ea0373", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1671533088, - "narHash": "sha256-l4xY/ck8CyJUkx+od66OXoLB2iXzFqMmv6o4Cbj730E=", + "lastModified": 1672683054, + "narHash": "sha256-evGMoWB8dbgK2d4MB4J3fXeLRKCzkyfiTH7JrgYPYuk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "74a1e57fc7228d715c666172ffe11e38ab31e312", + "rev": "9ef42377c7985840cfb65b5b9403e518d7d97afb", "type": "github" }, "original": { @@ -453,11 +453,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1670253003, - "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1671459584, - "narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=", + "lastModified": 1672500394, + "narHash": "sha256-yzwBzCoeRBoRzm7ySHhm72kBG0QjgFalLz2FY48iLI4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "87b58217c9a05edcf7630b9be32570f889217aef", + "rev": "feda52be1d59f13b9aa02f064b4f14784b9a06c8", "type": "github" }, "original": { @@ -603,11 +603,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1671359686, - "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", + "lastModified": 1672350804, + "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", + "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1671313200, - "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", + "lastModified": 1672441588, + "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", + "rev": "6a0d2701705c3cf6f42c15aa92b7885f1f8a477f", "type": "github" }, "original": { @@ -664,11 +664,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", + "lastModified": 1672428209, + "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", + "rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "type": "github" }, "original": { @@ -833,11 +833,11 @@ "retiolum": { "flake": false, "locked": { - "lastModified": 1671456454, - "narHash": "sha256-UzNs+lOqrAOzMf9EdcEZsuvjZnBKgPmmoyiwM81EaTQ=", + "lastModified": 1672621870, + "narHash": "sha256-EU+b0u03WwN6n/LPkHN8TwICVNGf3dnm/HACcYJSKnU=", "owner": "krebs", "repo": "retiolum", - "rev": "20ad3544d80690791bed8a639d08848924a7aaa9", + "rev": "59fcb495053af151de132bd5854b8cabe0a3fa2d", "type": "github" }, "original": { @@ -955,11 +955,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1671472949, - "narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=", + "lastModified": 1672543202, + "narHash": "sha256-nlCUtcIZxaBqUBG1GyaXhZmfyG5WK4e6LqypP8llX9E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342", + "rev": "b35586cc5abacd4eba9ead138b53e2a60920f781", "type": "github" }, "original": { @@ -987,11 +987,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1670681486, - "narHash": "sha256-Ss1FWOq51+0FQpQWXPiSWHmNYU6NurUvI2wAjOGV/kA=", + "lastModified": 1671426601, + "narHash": "sha256-NrvSK+olbi4P+9q5KOomNHGgmrRtI9cW9ZqkdU4n0Sc=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "85db0117ead108213cc2a4210f72746d8ad8d20a", + "rev": "a64f5252a66253852bef1c627cea9e39928e6392", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7878094..5319449 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ }; cluster-module = { url = "github:mrvandalo/module.cluster"; + #url = "git+file:///home/palo/dev/nixos/module.cluster"; }; nixpkgs-fmt = { url = "github:nix-community/nixpkgs-fmt"; diff --git a/nixos/machines/bobi/configuration.nix b/nixos/machines/bobi/configuration.nix index 0464bce..0ea573b 100644 --- a/nixos/machines/bobi/configuration.nix +++ b/nixos/machines/bobi/configuration.nix @@ -66,7 +66,7 @@ services.openssh.enable = true; component.network.sshd.onlyTincAccess = false; - nix.maxJobs = lib.mkDefault 1; + nix.settings.max-jobs = lib.mkDefault 1; users.users.root.openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6uza62+Go9sBFs3XZE2OkugBv9PJ7Yv8ebCskE5WYPcahMZIKkQw+zkGI8EGzOPJhQEv2xk+XBf2VOzj0Fto4nh8X5+Llb1nM+YxQPk1SVlwbNAlhh24L1w2vKtBtMy277MF4EP+caGceYP6gki5+DzlPUSdFSAEFFWgN1WPkiyUii15Xi3QuCMR8F18dbwVUYbT11vwNhdiAXWphrQG+yPguALBGR+21JM6fffOln3BhoDUp2poVc5Qe2EBuUbRUV3/fOU4HwWVKZ7KCFvLZBSVFutXCj5HuNWJ5T3RuuxJSmY5lYuFZx9gD+n+DAEJt30iXWcaJlmUqQB5awcB1S2d9pJ141V4vjiCMKUJHIdspFrI23rFNYD9k2ZXDA8VOnQE33BzmgF9xOVh6qr4G0oEpsNqJoKybVTUeSyl4+ifzdQANouvySgLJV/pcqaxX1srSDIUlcM2vDMWAs3ryCa0aAlmAVZIHgRhh6wa+IXW8gIYt+5biPWUuihJ4zGBEwkyVXXf2xsecMWCAGPWPDL0/fBfY9krNfC5M2sqxey2ShFIq+R/wMdaI7yVjUCF2QIUNiIdFbJL6bDrDyHnEXJJN+rAo23jUoTZZRv7Jq3DB/A5H7a73VCcblZyUmwMSlpg3wos7pdw5Ctta3zQPoxoAKGS1uZ+yTeZbPMmdbw== contact@ingolf-wagner.de" ]; diff --git a/nixos/machines/pepe/hardware-configuration.nix b/nixos/machines/pepe/hardware-configuration.nix index 62a9b45..f4dfdcc 100644 --- a/nixos/machines/pepe/hardware-configuration.nix +++ b/nixos/machines/pepe/hardware-configuration.nix @@ -55,7 +55,7 @@ fsType = "tmpfs"; }; - nix.maxJobs = lib.mkDefault 2; + nix.settings.max-jobs = lib.mkDefault 2; # lvm volume group # ---------------- diff --git a/nixos/machines/sternchen/hardware-configuration.nix b/nixos/machines/sternchen/hardware-configuration.nix index 6aad588..269f20b 100644 --- a/nixos/machines/sternchen/hardware-configuration.nix +++ b/nixos/machines/sternchen/hardware-configuration.nix @@ -37,7 +37,7 @@ # fsType = "ext4"; #}; - nix.maxJobs = lib.mkDefault 4; + nix.setting.max-jobs = lib.mkDefault 4; # lvm volume group # ---------------- diff --git a/nixos/machines/sterni/hardware-configuration.nix b/nixos/machines/sterni/hardware-configuration.nix index 2232bf1..30fb6aa 100644 --- a/nixos/machines/sterni/hardware-configuration.nix +++ b/nixos/machines/sterni/hardware-configuration.nix @@ -38,7 +38,7 @@ fsType = "ext4"; }; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; # lvm volume group # ---------------- diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix index dc389db..7989c8a 100644 --- a/nixos/modules/programs/vim.nix +++ b/nixos/modules/programs/vim.nix @@ -131,7 +131,7 @@ let # active plugins # -------------- extra-runtimepath = with pkgs; - lib.concatMapStringsSep "," (pkg: "${pkg.rtp}") [ + lib.concatMapStringsSep "," (pkg: "${pkg.outPath}") [ vimPlugins.Syntastic vimPlugins.ack-vim vimPlugins.airline diff --git a/nixos/system/desktop/cachix.nix b/nixos/system/desktop/cachix.nix index b81b657..2d83364 100644 --- a/nixos/system/desktop/cachix.nix +++ b/nixos/system/desktop/cachix.nix @@ -10,5 +10,5 @@ let in { inherit imports; - nix.binaryCaches = [ "https://cache.nixos.org/" ]; + nix.settings.substituters = [ "https://cache.nixos.org/" ]; } diff --git a/nixos/system/desktop/cachix/all-hies.nix b/nixos/system/desktop/cachix/all-hies.nix index 2f89067..7c4f824 100644 --- a/nixos/system/desktop/cachix/all-hies.nix +++ b/nixos/system/desktop/cachix/all-hies.nix @@ -1,8 +1,7 @@ { - nix = { - binaryCaches = [ "https://all-hies.cachix.org" ]; - binaryCachePublicKeys = - [ "all-hies.cachix.org-1:JjrzAOEUsD9ZMt8fdFbzo3jNAyEWlPAwdVuHw4RD43k=" ]; + nix.settings = { + substituters = [ "https://all-hies.cachix.org" ]; + trusted-public-keys = [ "all-hies.cachix.org-1:JjrzAOEUsD9ZMt8fdFbzo3jNAyEWlPAwdVuHw4RD43k=" ]; }; } diff --git a/nixos/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix index f98f834..96a516b 100644 --- a/nixos/system/desktop/home-manager.nix +++ b/nixos/system/desktop/home-manager.nix @@ -77,7 +77,7 @@ in enable = true; keyScheme = "vim"; #enableLightTheme = true; - enableFuzzySearch = true; + fuzzySearchFactor = 3; enableZshIntegration = true; }; diff --git a/nixos/system/desktop/home-manager/i3.nix b/nixos/system/desktop/home-manager/i3.nix index 728c7f8..e31bab8 100644 --- a/nixos/system/desktop/home-manager/i3.nix +++ b/nixos/system/desktop/home-manager/i3.nix @@ -117,7 +117,11 @@ in workspaceButtons = true; workspaceNumbers = true; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.users.users.mainUser.home}/.config/i3status-rust/config-my.toml"; - fonts = [ "Terminus" ]; + #fonts = [ "Terminus" ]; + fonts = { + names = [ "Terminus" ]; + size = 9.0; + }; trayOutput = "primary"; colors = { background = background;