diff options
| -rw-r--r-- | flake.lock | 58 | ||||
| -rw-r--r-- | flake.nix | 32 | ||||
| -rw-r--r-- | gui/conf/email.el | 3 | ||||
| -rw-r--r-- | home.nix | 5 |
4 files changed, 58 insertions, 40 deletions
@@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1665202701, - "narHash": "sha256-iPA4NL4Dxh/qpJli/TY/PrFYlSBafFF0tDSBCdQ2gU8=", + "lastModified": 1670063780, + "narHash": "sha256-fbjH0DOJmR5AigMuWDC2wgglf7i4Xf3y+2XNWT4eztw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fa664e37c200b1ead93a0274d10ee25dc1e75eef", + "rev": "d39052346c5fbb66c8210c263b0c8db8afd9fed2", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -54,19 +54,20 @@ "inputs": { "nixpkgs": [ "stable" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1656169755, - "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", + "lastModified": 1670059602, + "narHash": "sha256-mtgVnAjlYYjJr2wDnfz94kIefLl61Ww7cjCpLVhN/6Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a3d01fb53f52ac83194081272795aa4612c2381", + "rev": "6b71989c0dc1c8d386086334290c094240d51798", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -93,11 +94,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "lastModified": 1670058159, + "narHash": "sha256-ERiP2JWanLuGV1PDyHTbcigFCfIi9oco5LFdMJHjREE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "rev": "49b8ad618e64d9fe9ab686817bfebe047860dcae", "type": "github" }, "original": { @@ -166,27 +167,27 @@ }, "stable": { "locked": { - "lastModified": 1665066044, - "narHash": "sha256-mkO0LMHVunMFRWLcJhHT0fBf2v6RlH3vg7EVpfSIAFc=", + "lastModified": 1670009809, + "narHash": "sha256-yt/dQ32Vz4WenDLu4XeHbnXFxiHbTcnU0WwiLW5Ce6c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed9b904c5eba055a6d6f5c1ccb89ba8f0a056dc6", + "rev": "660e7737851506374da39c0fa550c202c824a17c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "unstable": { "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "lastModified": 1670058159, + "narHash": "sha256-ERiP2JWanLuGV1PDyHTbcigFCfIi9oco5LFdMJHjREE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "rev": "49b8ad618e64d9fe9ab686817bfebe047860dcae", "type": "github" }, "original": { @@ -195,6 +196,21 @@ "repo": "nixpkgs", "type": "github" } + }, + "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" + } } }, "root": "root", @@ -2,11 +2,11 @@ description = "Computing environment of Adrian Kummerlaender"; inputs = { - stable.url = github:NixOS/nixpkgs/nixos-22.05; + stable.url = github:NixOS/nixpkgs/nixos-22.11; unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable; personal.url = github:KnairdA/pkgs; home-manager = { - url = github:nix-community/home-manager/release-22.05; + url = github:nix-community/home-manager/release-22.11; inputs = { nixpkgs.follows = "stable"; }; }; emacs.url = github:nix-community/emacs-overlay/master; @@ -18,6 +18,16 @@ }: let system = "x86_64-linux"; + jupyter-overlay = (final: prev: { + jupyterWith = jupyter.defaultPackage."${final.system}"; + }); + + pkgs = import stable { + inherit system; + config = { allowUnfree = true; }; + overlays = [ jupyter-overlay ]; + }; + pkgs-unstable = import unstable { inherit system; config = { allowUnfree = true; }; @@ -26,26 +36,16 @@ pkgs-personal = personal; - jupyter-overlay = (final: prev: { - jupyterWith = jupyter.defaultPackage."${final.system}"; - }); - config = hostname: home-manager.lib.homeManagerConfiguration { - system = system; - homeDirectory = "/home/common"; - username = "common"; + inherit pkgs; + extraSpecialArgs = { inherit pkgs-unstable; inherit pkgs-personal; inherit hostname; }; - configuration = { ... }: { - imports = [ ./home.nix ]; - nixpkgs = { - config = { allowUnfree = true; }; - overlays = [ jupyter-overlay ]; - }; - }; + + modules = [ ./home.nix ]; }; hostnames = builtins.map diff --git a/gui/conf/email.el b/gui/conf/email.el index 442540e..7010c9c 100644 --- a/gui/conf/email.el +++ b/gui/conf/email.el @@ -28,9 +28,6 @@ :config (require 'org-mu4e) (evil-collection-init 'mu4e) - (define-obsolete-function-alias 'mu4e-search-bookmark 'mu4e-headers-search-bookmark nil) - (define-obsolete-function-alias 'mu4e-search 'mu4e-headers-search nil) - (define-obsolete-function-alias 'mu4e-search-narrow 'mu4e-headers-search-narrow nil) (add-hook 'mu4e-compose-mode-hook #'(lambda () (auto-save-mode -1)))) (use-package mu4e-alert @@ -12,6 +12,11 @@ ]; home = { + stateVersion = "22.11"; + + username = "common"; + homeDirectory = "/home/common"; + keyboard = { layout = "de"; options = [ "caps:escape" ]; |