From 379d4004aa2d6d100e5caf2d173da64a0707332b Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Mon, 9 May 2022 10:05:31 +0200 Subject: [PATCH 1/6] bump flake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'comma/naersk/nixpkgs': 'path:/nix/store/fj0r6l3gglr0k0b4dxn3hm8drcwclm36-source?lastModified=1651310835&narHash=sha256-MLk%2fzsLlbPhwFucxL64Fr+oIrvQC2%2f76Ap2F7ekbPNI=&rev=fd3e33d696b81e76b30160dfad2efb7ac1f19879' (2022-04-30) → follows 'comma/nixpkgs' • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/4e0481c777deab3f01cb5a6bdddffd49321ea1a3' (2022-05-05) → 'github:nix-community/emacs-overlay/ff6f93f4d156d7e9b48bb9cc986d119775e7df1f' (2022-05-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/dff5496b12817e3d019983827c4b7ba7beb96580' (2022-05-04) → 'github:NixOS/nixpkgs/3c5ae9be1f18c790ea890ef8decbd0946c0b4c04' (2022-05-08) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/cbe587c735b734405f56803e267820ee1559e6c1' (2022-05-03) → 'github:NixOS/nixpkgs/c777cdf5c564015d5f63b09cc93bef4178b19b01' (2022-05-05) --- flake.lock | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 2e5ee77..275f1a6 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1651750171, - "narHash": "sha256-IltysR3/0qLKrhbnUwdLbwFPv26Q9gvxuzqx1h/G/jQ=", + "lastModified": 1652072170, + "narHash": "sha256-7aWTXT+tM6yNYwq6HYzNmnFvkosygMMFy0QPiLgBt6M=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4e0481c777deab3f01cb5a6bdddffd49321ea1a3", + "rev": "ff6f93f4d156d7e9b48bb9cc986d119775e7df1f", "type": "github" }, "original": { @@ -93,7 +93,10 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "comma", + "nixpkgs" + ] }, "locked": { "lastModified": 1650101877, @@ -128,15 +131,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1651310835, - "narHash": "sha256-MLk/zsLlbPhwFucxL64Fr+oIrvQC2/76Ap2F7ekbPNI=", - "path": "/nix/store/fj0r6l3gglr0k0b4dxn3hm8drcwclm36-source", - "rev": "fd3e33d696b81e76b30160dfad2efb7ac1f19879", - "type": "path" + "lastModified": 1652020977, + "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-21_05": { @@ -171,11 +177,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1651558728, - "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=", + "lastModified": 1651726670, + "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbe587c735b734405f56803e267820ee1559e6c1", + "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", "type": "github" }, "original": { @@ -186,22 +192,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1651662302, - "narHash": "sha256-utlTjLa1s4ezdQIUvnBtmA9TBYFrPlXpAJnCXEiZFZI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dff5496b12817e3d019983827c4b7ba7beb96580", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1626852498, "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", @@ -222,7 +212,7 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" @@ -231,7 +221,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-21_05": "nixpkgs-21_05", "nixpkgs-21_11": "nixpkgs-21_11", "utils": "utils_2" From c7b5f65113ceb3749d69bfed2ac989c45a684f81 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Mon, 9 May 2022 10:12:33 +0200 Subject: [PATCH 2/6] Bump flake --- flake.lock | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 275f1a6..da99e8e 100644 --- a/flake.lock +++ b/flake.lock @@ -93,10 +93,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "comma", - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1650101877, @@ -131,18 +128,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652020977, - "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", - "type": "github" + "lastModified": 1651662302, + "narHash": "sha256-utlTjLa1s4ezdQIUvnBtmA9TBYFrPlXpAJnCXEiZFZI=", + "path": "/nix/store/0h8fb4p3gxpqsmw1sxfymvs6rxaask0f-source", + "rev": "dff5496b12817e3d019983827c4b7ba7beb96580", + "type": "path" }, "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-21_05": { @@ -192,6 +186,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1652020977, + "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1626852498, "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", @@ -212,7 +222,7 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" @@ -221,7 +231,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-21_05": "nixpkgs-21_05", "nixpkgs-21_11": "nixpkgs-21_11", "utils": "utils_2" From 76ffb4f2772dddee0d6c50214636cb4f86e5c213 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Tue, 17 May 2022 20:27:25 +0200 Subject: [PATCH 3/6] Add nix-direnv --- baseconfiguration.nix | 2 -- flake.lock | 77 ++++++++++++++++++++++++++++++---------- users/ellmau/default.nix | 6 ++++ 3 files changed, 64 insertions(+), 21 deletions(-) diff --git a/baseconfiguration.nix b/baseconfiguration.nix index 0ab099a..71f3ef4 100644 --- a/baseconfiguration.nix +++ b/baseconfiguration.nix @@ -62,8 +62,6 @@ enable = true; packages = with pkgs; [gnome3.dconf]; }; - - lorri.enable = true; }; environment = { diff --git a/flake.lock b/flake.lock index da99e8e..fc8164a 100644 --- a/flake.lock +++ b/flake.lock @@ -40,12 +40,16 @@ } }, "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1652072170, - "narHash": "sha256-7aWTXT+tM6yNYwq6HYzNmnFvkosygMMFy0QPiLgBt6M=", + "lastModified": 1652786163, + "narHash": "sha256-L75dzGAzNk+06wJBlkYCeqNTrSvwXfFZalRUlHn9tV0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ff6f93f4d156d7e9b48bb9cc986d119775e7df1f", + "rev": "dcbb707a85372909622b094eb193c4fb7a83a3a1", "type": "github" }, "original": { @@ -70,6 +74,21 @@ "type": "github" } }, + "flake-utils": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -93,7 +112,10 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "comma", + "nixpkgs" + ] }, "locked": { "lastModified": 1650101877, @@ -128,10 +150,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1651662302, - "narHash": "sha256-utlTjLa1s4ezdQIUvnBtmA9TBYFrPlXpAJnCXEiZFZI=", - "path": "/nix/store/0h8fb4p3gxpqsmw1sxfymvs6rxaask0f-source", - "rev": "dff5496b12817e3d019983827c4b7ba7beb96580", + "lastModified": 1652020977, + "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", + "path": "/nix/store/qakkvy6mm6vilawr284f8qwcz21wfl4d-source", + "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", "type": "path" }, "original": { @@ -169,13 +191,29 @@ "type": "indirect" } }, - "nixpkgs-unstable": { + "nixpkgs-21_11_2": { "locked": { - "lastModified": 1651726670, - "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", + "lastModified": 1652559422, + "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", + "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1652659998, + "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502", "type": "github" }, "original": { @@ -187,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1652020977, - "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", + "lastModified": 1652559422, + "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", + "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "type": "github" }, "original": { @@ -255,14 +293,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-21_11": "nixpkgs-21_11_2" }, "locked": { - "lastModified": 1649756291, - "narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=", + "lastModified": 1652596508, + "narHash": "sha256-hwqENSMkOm+OwE1t459I3ZJmZmf+X7242QGskyftnaQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8", + "rev": "9681f04fa3b6af5b7eff6b086e46aee2cc2bdde2", "type": "github" }, "original": { diff --git a/users/ellmau/default.nix b/users/ellmau/default.nix index 9068103..32ffd35 100644 --- a/users/ellmau/default.nix +++ b/users/ellmau/default.nix @@ -70,8 +70,14 @@ in programs.direnv = { enable = true; enableZshIntegration = true; + nix-direnv = { + enable = true; + enableFlakes = true; # TODO(mx): can be removed once updated to 22.05 + }; }; + + xsession = { numlock.enable = true; profileExtra = '' From de634db0b2f75eceb80521ba94f02e408a6acb0a Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Mon, 23 May 2022 14:08:47 +0200 Subject: [PATCH 4/6] Bump flake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/dcbb707a85372909622b094eb193c4fb7a83a3a1' (2022-05-17) → 'github:nix-community/emacs-overlay/cd6fbfa22bfd96967231515843fbdef3bda7966f' (2022-05-23) • Updated input 'emacs-overlay/nixpkgs': 'path:/nix/store/qakkvy6mm6vilawr284f8qwcz21wfl4d-source?lastModified=1652020977&narHash=sha256-9hDlNbrxzD%2fpLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=&rev=3c5ae9be1f18c790ea890ef8decbd0946c0b4c04' (2022-05-08) → 'path:/nix/store/fn03py5wi8d94hqg6m9wvs4672dqxzls-source?lastModified=1652559422&narHash=sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=&rev=8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1' (2022-05-14) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/6b4ebea9093c997c5f275c820e679108de4871ab' (2022-04-21) → 'github:NixOS/nixos-hardware/8b5e1bf2fd62adefff05ae67cd49440be93ea193' (2022-05-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1' (2022-05-14) → 'github:NixOS/nixpkgs/cbd40c72b2603ab54e7208f99f9b35fc158bc009' (2022-05-20) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502' (2022-05-16) → 'github:NixOS/nixpkgs/dfd82985c273aac6eced03625f454b334daae2e8' (2022-05-20) • Updated input 'sops-nix': 'github:Mic92/sops-nix/9681f04fa3b6af5b7eff6b086e46aee2cc2bdde2' (2022-05-15) → 'github:Mic92/sops-nix/13079f98ddfdc9e06e4b688332626ca954c14264' (2022-05-22) • Updated input 'sops-nix/nixpkgs-21_11': 'github:NixOS/nixpkgs/8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1' (2022-05-14) → 'github:NixOS/nixpkgs/b5991e4971523a5fcc9413b9003b58e5c15aa7d8' (2022-05-21) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index fc8164a..e6db719 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1652786163, - "narHash": "sha256-L75dzGAzNk+06wJBlkYCeqNTrSvwXfFZalRUlHn9tV0=", + "lastModified": 1653304500, + "narHash": "sha256-3x9Afa3L6rq/5YF7xjSZAynoLrz+nXF4tGen0CPp4Wk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "dcbb707a85372909622b094eb193c4fb7a83a3a1", + "rev": "cd6fbfa22bfd96967231515843fbdef3bda7966f", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1650522846, - "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=", + "lastModified": 1653145312, + "narHash": "sha256-affCuB0Boa8CDFykoJVPZfhHLBok7Sq+QEOJvo3Xf+k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6b4ebea9093c997c5f275c820e679108de4871ab", + "rev": "8b5e1bf2fd62adefff05ae67cd49440be93ea193", "type": "github" }, "original": { @@ -150,10 +150,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652020977, - "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", - "path": "/nix/store/qakkvy6mm6vilawr284f8qwcz21wfl4d-source", - "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", + "lastModified": 1652559422, + "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", + "path": "/nix/store/fn03py5wi8d94hqg6m9wvs4672dqxzls-source", + "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "type": "path" }, "original": { @@ -193,11 +193,11 @@ }, "nixpkgs-21_11_2": { "locked": { - "lastModified": 1652559422, - "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", + "lastModified": 1653132211, + "narHash": "sha256-5ugEYisGqixwarfn3BJvuWDnO6gT/AoxlsA6jnG8Fv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", + "rev": "b5991e4971523a5fcc9413b9003b58e5c15aa7d8", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1652659998, - "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=", + "lastModified": 1653060744, + "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502", + "rev": "dfd82985c273aac6eced03625f454b334daae2e8", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1652559422, - "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", + "lastModified": 1653087707, + "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", + "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "nixpkgs-21_11": "nixpkgs-21_11_2" }, "locked": { - "lastModified": 1652596508, - "narHash": "sha256-hwqENSMkOm+OwE1t459I3ZJmZmf+X7242QGskyftnaQ=", + "lastModified": 1653237221, + "narHash": "sha256-zMgangC+wDXvdAz/aP5jDg/Paw7icNFhQIZsJVACMc0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9681f04fa3b6af5b7eff6b086e46aee2cc2bdde2", + "rev": "13079f98ddfdc9e06e4b688332626ca954c14264", "type": "github" }, "original": { From dd10f39317884775eb1282cc89bb8c60e562b9a0 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Mon, 23 May 2022 14:14:06 +0200 Subject: [PATCH 5/6] Remove comma --- baseconfiguration.nix | 2 +- default.nix | 11 +++--- flake.lock | 79 +------------------------------------------ flake.nix | 8 ++--- 4 files changed, 13 insertions(+), 87 deletions(-) diff --git a/baseconfiguration.nix b/baseconfiguration.nix index 71f3ef4..3188e59 100644 --- a/baseconfiguration.nix +++ b/baseconfiguration.nix @@ -74,7 +74,7 @@ clang rnix-lsp procs - comma.comma + #comma.comma ]; sessionVariables = rec { XDG_CACHE_HOME = "\${HOME}/.cache"; diff --git a/default.nix b/default.nix index 5712ca4..4ed5330 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,10 @@ let name = if builtins.isString args then args else args.name; system = if args ? system then args.system else "x86_64-linux"; extraModules = if args ? extraModules then args.extraModules else [ ]; - extraOverlays = if args ? extraOverlays then args.extraOverlays else [ overlay-unstable overlay-comma ]; + extraOverlays = if args ? extraOverlays then args.extraOverlays else [ + overlay-unstable + # overlay-comma + ]; pkgs = flakes.nixpkgs; configuration = if args ? configuration then args.configuration else import ./baseconfiguration.nix {inherit extraOverlays system pkgs name flakes flakeOutputs;} ; overlay-unstable = final: prev: { @@ -15,9 +18,9 @@ let }; }; - overlay-comma = final: prev: { - comma = flakes.comma.packages."${system}"; - }; + # overlay-comma = final: prev: { + # comma = flakes.comma.packages."${system}"; + # }; in { inherit name; diff --git a/flake.lock b/flake.lock index e6db719..f900ce4 100644 --- a/flake.lock +++ b/flake.lock @@ -16,29 +16,6 @@ "type": "gitlab" } }, - "comma": { - "inputs": { - "flake-compat": "flake-compat", - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1650481854, - "narHash": "sha256-CZQLigKovJbMoTbPuWT3SBSMymjD58m72O/oy+HilQg=", - "owner": "nix-community", - "repo": "comma", - "rev": "034a9ca440370fc1eccbed43ff345fb6ea1f0d27", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "comma", - "type": "github" - } - }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", @@ -58,22 +35,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1652776076, @@ -110,28 +71,6 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": [ - "comma", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1650101877, - "narHash": "sha256-IYxYc5Z1ZHQDTQbTWsOZ9HlZepsVjgV5oZwmbKzxSJs=", - "owner": "nix-community", - "repo": "naersk", - "rev": "8cc379478819e6a22ce7595a761fe1e17c8d7458", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "naersk", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1653145312, @@ -256,7 +195,6 @@ }, "root": { "inputs": { - "comma": "comma", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", @@ -272,7 +210,7 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-21_05": "nixpkgs-21_05", "nixpkgs-21_11": "nixpkgs-21_11", - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1638911354, @@ -312,21 +250,6 @@ } }, "utils": { - "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { "locked": { "lastModified": 1605370193, "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", diff --git a/flake.nix b/flake.nix index 064fcb1..8a7d74b 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - comma = { - url = "github:nix-community/comma"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # comma = { + # url = "github:nix-community/comma"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; home-manager = { url = "github:nix-community/home-manager/release-21.11"; From e3b96f921dbedcd4ca038bde41d0922f493f51a5 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Mon, 23 May 2022 14:18:46 +0200 Subject: [PATCH 6/6] Disable BBDB for emacs --- programs/emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix index aea2586..4ba3f94 100644 --- a/programs/emacs/default.nix +++ b/programs/emacs/default.nix @@ -53,7 +53,7 @@ let free-keys highlight-indentation helm - helm-bbdb + #helm-bbdb helm-company helm-flx helm-descbinds