From 82c820b08668a3662a9f1cdb9606d6917d952bf4 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Wed, 6 Dec 2023 10:41:38 +0100 Subject: [PATCH] update x2100 --- flake.lock | 122 ++++++++++++++++++++++++++++----- flake.nix | 1 + lib/mkmachine.nix | 1 + machines/x2100/default.nix | 18 ----- machines/x2100/home-julien.nix | 3 +- 5 files changed, 108 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index ed9576a..9aeb961 100644 --- a/flake.lock +++ b/flake.lock @@ -170,6 +170,26 @@ } }, "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1701829164, + "narHash": "sha256-1b09sNIyYcUsXRR2rk3yxKDPCtnKrsM81d8FRXs96HU=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "384abdc7504cb95d3df0ea1f72f01f1b5b2b039f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "emacs-overlay_2": { "flake": false, "locked": { "lastModified": 1676366521, @@ -426,11 +446,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -475,6 +495,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "format-all": { "flake": false, "locked": { @@ -537,7 +575,7 @@ }, "home-manager-unstable": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1701071203, @@ -575,8 +613,8 @@ "crane": "crane_2", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, @@ -623,7 +661,7 @@ "inputs": { "doom-emacs": "doom-emacs", "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", + "emacs-overlay": "emacs-overlay_2", "emacs-so-long": "emacs-so-long", "evil-escape": "evil-escape", "evil-markdown": "evil-markdown", @@ -631,12 +669,12 @@ "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "format-all": "format-all", "nix-straight": [ "nix-straight" ], - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -756,6 +794,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1701540982, + "narHash": "sha256-5ajSy6ODgGmAbmymRdHnjfVnuVrACjI8wXoGVvrtvww=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6386d8aafc28b3a7ed03880a57bdc6eb4465491d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -788,6 +842,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1700794826, "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", @@ -803,7 +873,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1699354722, "narHash": "sha256-abmqUReg4PsyQSwv4d0zjcWpMHrd3IFJiTb2tZpfF04=", @@ -819,7 +889,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1695806987, "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", @@ -834,7 +904,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1701058557, "narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=", @@ -850,7 +920,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1700924682, "narHash": "sha256-7vP/KtJdKSWnghtPVDoE7MD+rCY3gFj68NwOMNdrGbs=", @@ -991,7 +1061,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1699271226, @@ -1028,7 +1098,8 @@ "attic": "attic", "buildbot-nix": "buildbot-nix", "colmena": "colmena", - "flake-utils": "flake-utils_2", + "emacs-overlay": "emacs-overlay", + "flake-utils": "flake-utils_3", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "homepage": "homepage", @@ -1038,7 +1109,7 @@ "nix-index-database": "nix-index-database", "nix-straight": "nix-straight", "nixd": "nixd", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nur": "nur", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", @@ -1258,6 +1329,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1329,7 +1415,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -1362,7 +1448,7 @@ }, "zotero-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "utils": "utils" }, "locked": { diff --git a/flake.nix b/flake.nix index 3378ef3..d87d7aa 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,7 @@ zotero-nix.url = "github:camillemndn/zotero-nix"; nur.url = "github:nix-community/NUR"; + emacs-overlay.url = "github:nix-community/emacs-overlay"; }; outputs = { self, nixpkgs, ... }@inputs: diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix index caebce9..395339e 100644 --- a/lib/mkmachine.nix +++ b/lib/mkmachine.nix @@ -40,6 +40,7 @@ nixpkgs.lib.nixosSystem { { home-manager.useGlobalPkgs = true; nixpkgs.overlays = [ + inputs.emacs-overlay.overlay inputs.nur.overlay (overlay-unstable system) (final: prev: diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix index 94bdab2..c68a56e 100644 --- a/machines/x2100/default.nix +++ b/machines/x2100/default.nix @@ -82,15 +82,11 @@ # for a WiFi printer services.avahi.openFirewall = true; - services.davfs2 = { - enable = true; - }; security.pam.services.swaylock = { }; programs.sway.enable = true; programs.sway.package = null; - programs.ssh.startAgent = true; services.gnome.gnome-keyring.enable = true; @@ -100,20 +96,6 @@ "zotero-6.0.27" ]; - services.autofs = { - enable = true; - debug = true; - autoMaster = - let - mapConf = pkgs.writeText "auto" '' - nuage -fstype=davfs,uid=1000,file_mode=600,dir_mode=700,conf=/home/julien/.davfs2/davfs2.conf,rw :https\://nuage.malka.family/remote.php/webdav/ - ''; - in - '' - /home/julien/clouds file:${mapConf} - ''; - }; - system.stateVersion = "23.05"; } diff --git a/machines/x2100/home-julien.nix b/machines/x2100/home-julien.nix index 4e2b255..ac3b63b 100644 --- a/machines/x2100/home-julien.nix +++ b/machines/x2100/home-julien.nix @@ -12,7 +12,6 @@ luj.programs.waybar.enable = true; luj.programs.waybar.interfaceName = "wlp3s0"; luj.programs.kitty.enable = true; - luj.programs.emacs.enable = true; luj.programs.zsh.enable = true; luj.emails.enable = true; luj.programs.firefox.enable = true; @@ -54,11 +53,13 @@ fira-code feh meld + emacsGit vlc jftui nerdfonts libreoffice font-awesome + cantarell-fonts nodejs neomutt htop