From f0a403bd0bdf5590489b108b4d672c4a35bfe9e3 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 20 Dec 2023 13:32:18 +0100 Subject: [PATCH] 23.11 upgrade --- dashy.yaml | 111 -------------------- emacs/emacs.org | 2 + fixups.nix | 4 - flake.lock | 161 +++++++++++++++++++----------- flake.nix | 11 +- home-manager/emacs.nix | 9 +- home-manager/home.nix | 4 +- nixos/machines/frumar/default.nix | 5 - nixos/modules/dashy.nix | 39 -------- nixos/roles/default.nix | 3 +- nixos/roles/server.nix | 2 +- pkgs/dashy.nix | 22 ---- pkgs/default.nix | 31 ++---- pkgs/notion-desktop/default.nix | 10 +- 14 files changed, 131 insertions(+), 283 deletions(-) delete mode 100644 dashy.yaml delete mode 100644 nixos/modules/dashy.nix delete mode 100644 pkgs/dashy.nix diff --git a/dashy.yaml b/dashy.yaml deleted file mode 100644 index d0dc588..0000000 --- a/dashy.yaml +++ /dev/null @@ -1,111 +0,0 @@ -pageInfo: - title: Dashy - navLinks: - - title: Documentation - path: https://dashy.to/docs -appConfig: - theme: nord - layout: auto - iconSize: medium - language: en - defaultOpeningMethod: sametab - webSearch: - searchEngine: google - openingMethod: sametab -sections: - - name: Local Devices - icon: fas fa-network-wired - items: - - title: EdgeRouter 4 - icon: fas fa-router - url: https://router.home.yori.cc - - title: Unifi - icon: hl-unifi-controller - url: https://unifi.yori.cc/ - - title: EdgeSwitch 8 - icon: fas fa-ethernet - url: https://192.168.2.62/ - - title: Scanner - url: http://192.168.2.49/ - icon: fas fa-scanner-image - - title: Printer - url: "http://[2a02:a464:5ed:1:3205:5cff:fe44:20a7]/" - icon: fas fa-print - - name: Media - icon: fas fa-photo-video - items: - - title: Plex - icon: hl-plex - url: https://plex.yori.cc/web/index.html - - title: Sonarr - icon: hl-sonarr - url: https://priv.yori.cc/sonarr - - title: Radarr - icon: hl-radarr - url: https://priv.yori.cc/radarr - - title: Calibre - icon: hl-calibre-web - url: https://calibre.yori.cc/ - - name: Monitoring - icon: fas fa-tachometer-alt-fast - displayData: - sortBy: default - rows: 1 - cols: 1 - collapsed: false - hideForGuests: false - items: - - title: Grafana - icon: hl-grafana - url: https://grafana.yori.cc - - title: Prometheus - icon: hl-prometheus - url: https://prometheus.yori.cc - - title: Home Assistant - icon: hl-home-assistant - url: https://home-assistant.yori.cc - - name: Public - icon: fas fa-globe - items: - - title: yori.cc - icon: mdi-account-box - url: https://yorickvanpelt.nl - statusCheck: true - - title: Gitea - icon: hl-gitea - url: https://git.yori.cc/ - - title: "2048" - icon: "https://yorickvp.github.io/2048/meta/apple-touch-icon.png" - url: "https://yorickvp.github.io/2048/" - - name: Frequently Used - icon: fas fa-link - displayData: - cols: 2 - items: - - title: Youtube - icon: fab fa-youtube - url: https://youtube.com - - title: NOS - icon: "https://static.nos.nl/img/favicon/android-chrome-192x192.png" - url: https://nos.nl - - title: Hacker News - icon: fab fa-hacker-news - url: https://news.ycombinator.com - - title: De Gelderlander - icon: fas fa-newspaper - url: https://gelderlander.nl - - title: reddit - icon: fab fa-reddit - url: https://reddit.com/ - - title: newsblur - icon: hl-newsblur - url: https://newsblur.com - - title: GMail - icon: mdi-gmail - url: https://mail.google.com - - title: ChatGPT - icon: hl-chatgpt - url: https://chat.openai.com - - title: GitHub - icon: fab fa-github - url: https://github.com diff --git a/emacs/emacs.org b/emacs/emacs.org index b7b3031..593c9da 100644 --- a/emacs/emacs.org +++ b/emacs/emacs.org @@ -366,6 +366,8 @@ from https://vickychijwani.me/nuggets-from-my-emacs-part-i/ :config ;; use copilot (delq 'company-preview-if-just-one-frontend company-frontends)) +(use-package company-box + :hook (company-mode . company-box-mode)) #+END_SRC ** Indentation #+BEGIN_SRC emacs-lisp diff --git a/fixups.nix b/fixups.nix index a517de9..155b140 100644 --- a/fixups.nix +++ b/fixups.nix @@ -1,6 +1,2 @@ (pkgs: super: { - # https://github.com/nix-community/emacs-overlay/issues/329#issuecomment-1571155533 - emacs-unstable-pgtk = super.emacs-unstable-pgtk.overrideAttrs (prev: { - withTreeSitter = true; - }); }) diff --git a/flake.lock b/flake.lock index 0fb2788..722f170 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1694793763, - "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1694946219, - "narHash": "sha256-bZ7RCLzaOnqr/4WE2Rs7/HcY9tLhpYJl6ZkI4i7AZ4Q=", + "lastModified": 1702399955, + "narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7e26d097d352f41e00fcc225529292843283010c", + "rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -216,11 +216,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": { @@ -234,11 +234,11 @@ "systems": "systems_2" }, "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": { @@ -269,11 +269,11 @@ "systems": "systems_4" }, "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": { @@ -330,16 +330,16 @@ ] }, "locked": { - "lastModified": 1694465129, - "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=", + "lastModified": 1702814678, + "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b", + "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -350,11 +350,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1694952508, - "narHash": "sha256-0KzgnYW9RvlwUnl5qYinNOg/WsV9jEJfMPVQoJL8bmI=", + "lastModified": 1702814943, + "narHash": "sha256-tNKSDbtoEDfCTs30dyW0Fcj4KJpjzTRASL6f2BbuSKE=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "d44755862cce5ba5e040ec8f7df6c6b33e47c8a0", + "rev": "ac8b1c4cfb2f9111e709aaf503511df354e86733", "type": "github" }, "original": { @@ -366,15 +366,16 @@ "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts_2", + "nix-github-actions": "nix-github-actions_2", "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1694654058, - "narHash": "sha256-Wo0yw5ow7OSJvK94CD708zcSVfm9CCi5WFopP3BDaVc=", + "lastModified": 1702815315, + "narHash": "sha256-LEpv7kvB7KPj/6BoNYWMcVjRezTJe6FNmg5kCKZQxMk=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "3e635f33fb31b39305ff378ed66149a4b3715985", + "rev": "3c6e1234af3aa26fc60d0969619cf6806ec51639", "type": "github" }, "original": { @@ -406,6 +407,28 @@ "type": "github" } }, + "nix-github-actions_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701208414, + "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -413,11 +436,11 @@ ] }, "locked": { - "lastModified": 1694921880, - "narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=", + "lastModified": 1702864432, + "narHash": "sha256-xR5Igg2hnm979W3YgMDrSjErHFhHo4rbMboF6DC0mbc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2", + "rev": "4605ccd764fac78b9e4b5b058698cb9f04430b91", "type": "github" }, "original": { @@ -498,11 +521,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1694710316, - "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -519,19 +542,20 @@ ], "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1687462267, - "narHash": "sha256-rNSputjn/0HEHHnsKfQ8mQVEPVchcBw7DsbND7Wg8dk=", + "lastModified": 1703023684, + "narHash": "sha256-XQU4OaacV0F2tf9cNAvIMqlC0HBIrAtvb0MLjIHt+7M=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "24128c3052090311688b09a400aa408ba61c6ee5", + "rev": "4bfb8eb058f098302c97b909df2d019926e11220", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -581,13 +605,28 @@ "type": "indirect" } }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1701539137, + "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs-lib": { "locked": { - "lastModified": 1694911725, - "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", + "lastModified": 1702774034, + "narHash": "sha256-M0IsUA89EKHL8IDx9bf+e2W2l1kMRpaZ4h08navMXig=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "819180647f428a3826bfc917a54449da1e532ce0", + "rev": "9b4f1493009b8d2f55a525a01de10addc9a0a752", "type": "github" }, "original": { @@ -598,11 +637,11 @@ }, "nixpkgs-mozilla": { "locked": { - "lastModified": 1690536331, - "narHash": "sha256-aRIf2FB2GTdfF7gl13WyETmiV/J7EhBGkSWXfZvlxcA=", + "lastModified": 1695805681, + "narHash": "sha256-1ElPLD8eFfnuIk0G52HGGpRtQZ4QPCjChRlEOfkZ5ro=", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "db89c8707edcffefcd8e738459d511543a339ff5", + "rev": "6eabade97bc28d707a8b9d82ad13ef143836736e", "type": "github" }, "original": { @@ -613,11 +652,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1694753796, - "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", + "lastModified": 1702221085, + "narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", + "rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af", "type": "github" }, "original": { @@ -637,11 +676,11 @@ ] }, "locked": { - "lastModified": 1694953556, - "narHash": "sha256-kz5+IFT+Hw82aibyYt7dEftfZIA6y3Aqe65yufjzTG0=", + "lastModified": 1703063583, + "narHash": "sha256-1LZRDydad4l/2NPCKuzO4ux+xo+aumsm7THnWaZ93m4=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "300fc71e23270989d11408aa2d7c8232c37aa113", + "rev": "7b53804f6f98103f1ca2424d07805f8b4665e207", "type": "github" }, "original": { @@ -652,32 +691,32 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694753796, - "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", + "lastModified": 1702921762, + "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", + "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1694651847, - "narHash": "sha256-W+2eI96glLiEwLnX/kWn5HDO7WfKKkF0lKW9yyNLEbY=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46ea94edba83944a236850bbc0bfd92785736b00", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -835,11 +874,11 @@ ] }, "locked": { - "lastModified": 1694528738, - "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", + "lastModified": 1702461037, + "narHash": "sha256-ssyGxfGHRuuLHuMex+vV6RMOt7nAo07nwufg9L5GkLg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", + "rev": "d06b70e5163a903f19009c3f97770014787a080f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 81a6050..edb079f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { description = "Yoricks dotfiles"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla"; emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs"; - nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; + nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; @@ -35,10 +35,7 @@ allowUnfree = true; # chromium.vaapiSupport = true; android_sdk.accept_license = true; - # todo: dashy - permittedInsecurePackages = [ - "nodejs-16.20.2" - ]; + permittedInsecurePackages = []; }; inherit system; overlays = [ self.overlays.default ]; diff --git a/home-manager/emacs.nix b/home-manager/emacs.nix index 68968ab..4c87af6 100644 --- a/home-manager/emacs.nix +++ b/home-manager/emacs.nix @@ -3,7 +3,7 @@ in { programs.emacs = { enable = true; - package = pkgs.emacs-unstable-pgtk; + package = pkgs.emacs29-pgtk; extraConfig = '' (setq copilot-node-executable "${pkgs.nodejs-slim-18_x}/bin/node") (setq lsp-nix-server-path "${pkgs.nil}/bin/nil") @@ -11,14 +11,14 @@ in { overrides = final: prev: { copilot = final.melpaBuild rec { pname = "copilot"; - version = "20230913"; - commit = "421703f5dd5218ec2a3aa23ddf09d5f13e5014c2"; + version = "20231220"; + commit = "d4fa14cea818e041b4a536c5052cf6d28c7223d7"; src = pkgs.fetchFromGitHub { owner = "zerolfx"; repo = "copilot.el"; rev = commit; - hash = "sha256-7LKB2JoYAVu5i23ZKBVZPe6azCItHK/tlBNPgFXxztc="; + hash = "sha256-Tzs0Dawqa+OD0RSsf66ORbH6MdBp7BMXX7z+5UuNwq4="; }; packageRequires = with final; [ dash editorconfig s ]; @@ -39,6 +39,7 @@ in { all-the-icons avy company + company-box counsel counsel-projectile copilot diff --git a/home-manager/home.nix b/home-manager/home.nix index afbd16d..f4bfdcd 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -92,7 +92,7 @@ in { enable = true; shellAliases = { l = "ls"; - ls = "exa"; + ls = "eza"; nr = ''nix repl --file "/home/yorick/dotfiles/repl.nix"''; "n." = "nix repl --file ."; nsd = "nix show-derivation"; @@ -240,7 +240,7 @@ in { ## misc asciinema cargo - exa + eza linuxPackages.perf ltrace lz4json diff --git a/nixos/machines/frumar/default.nix b/nixos/machines/frumar/default.nix index 2927c11..e07768a 100644 --- a/nixos/machines/frumar/default.nix +++ b/nixos/machines/frumar/default.nix @@ -242,10 +242,5 @@ nginx.virtualHosts = [ "priv.yori.cc" ]; extraConfig.whitelist-domain = ["priv.yori.cc"]; }; - services.dashy = { - enable = true; - host = "127.0.0.1"; - configFile = "${../../../dashy.yaml}"; - }; services.yorick.marvin-tracker.enable = true; } diff --git a/nixos/modules/dashy.nix b/nixos/modules/dashy.nix deleted file mode 100644 index 9419088..0000000 --- a/nixos/modules/dashy.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, lib, pkgs, ... }: -let cfg = config.services.dashy; in -{ - options.services.dashy = with lib; { - enable = mkEnableOption "Dashy server"; - host = mkOption { - default = "0.0.0.0"; - type = types.str; - }; - port = mkOption { - default = 4000; - type = types.port; - }; - package = mkOption { - default = pkgs.dashy; - type = types.package; - }; - configFile = mkOption { - type = types.path; - }; - }; - config = lib.mkIf cfg.enable { - systemd.services.dashy = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "simple"; - DynamicUser = true; - Restart = "on-failure"; - ExecStart = "${pkgs.nodejs}/bin/node ${cfg.package}/server.js"; - WorkingDirectory = "${cfg.package}"; - BindReadOnlyPaths = [ "/etc/dashy.yml" ]; - }; - environment.HOST = cfg.host; - environment.PORT = toString cfg.port; - }; - environment.etc."dashy.yml".source = cfg.configFile; - }; -} diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix index 67c596f..788175c 100644 --- a/nixos/roles/default.nix +++ b/nixos/roles/default.nix @@ -6,7 +6,6 @@ in { imports = [ inputs.agenix.nixosModules.default inputs.fooocus.nixosModules.default - ../modules/dashy.nix ../modules/tor-hidden-service.nix ../modules/nginx.nix ../modules/lumi-cache.nix @@ -47,7 +46,7 @@ in { }; # Nix - nixpkgs.config.allowUnfree = true; + # nixpkgs.config.allowUnfree = true; #nix.buildCores = config.nix.maxJobs; nix.extraOptions = '' diff --git a/nixos/roles/server.nix b/nixos/roles/server.nix index ec7550b..cbf31ef 100644 --- a/nixos/roles/server.nix +++ b/nixos/roles/server.nix @@ -3,7 +3,7 @@ services.sshguard.enable = true; programs.mosh.enable = true; - environment.noXlibs = true; + # environment.noXlibs = true; networking.firewall.logRefusedConnections = false; # Silence logging of scanners and knockers diff --git a/pkgs/dashy.nix b/pkgs/dashy.nix deleted file mode 100644 index 5c47451..0000000 --- a/pkgs/dashy.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, buildYarnPackage, nodejs }: - -buildYarnPackage { - src = fetchFromGitHub { - owner = "Lissy93"; - repo = "dashy"; - rev = "edeeb74c6ce1f86ae1806f1839723b640c326ace"; - hash = "sha256-WCnyq0MrsuUDt+owN/Ry5cVbvMmo5GVB0QFdCHZ8mxk="; - }; - pname = "dashy"; - version = "2023-09-23"; - NODE_OPTIONS="--openssl-legacy-provider"; - yarnBuildMore = "yarn run build --offline"; - # for the widgets, I think you need to - # cp dashy.yml ./public/conf.yml in the preBuild - postInstall = '' - rm -r $out/dist - mv ./dist $out/dist - rm -r $out/yarn-cache - ln -fs /etc/dashy.yml $out/dist/conf.yml - ''; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 1d322a0..a8ddb0e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -44,14 +44,6 @@ xwaylandvideobridge = self.callPackage ./xwaylandvideobridge.nix {}; timesync = self.flake-inputs.timesync.packages.${self.system}.default; wl-clipboard = super.wl-clipboard.overrideAttrs (o: { - # todo (upgrade): remove version override on nixos-23.11 - src = super.fetchFromGitHub { - owner = "bugaevc"; - repo = "wl-clipboard"; - rev = "v2.2.1"; - sha256 = "sha256-BYRXqVpGt9FrEBYQpi2kHPSZyeMk9o1SXkxjjcduhiY="; - }; - version = "2.2.1"; # todo: upstream patches = (o.patches or []) ++ [ (self.fetchpatch { @@ -60,23 +52,9 @@ }) ]; }); - # remove once https://github.com/NixOS/nixpkgs/pull/251597 is merged - calibre-web = super.calibre-web.overridePythonAttrs (o: { - propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.python3.pkgs.jsonschema ]; - }); - electron_27 = self.callPackage (self.path + /pkgs/development/tools/electron/binary/generic.nix) {} "27.0.0-beta.4" { - x86_64-linux = "sha256-wdPRBf65Tzu2N4/chNVJtEhaPRuLjUEWsghYZ00aGag="; - headers = "sha256-ZxvJrPrQX0UUy6LkXZcCXhUkRj6FLv40d7N65eGRRcY="; - }; notion-desktop = self.callPackage ./notion-desktop { electron_26 = self.electron_27; }; - dashy = self.callPackage ./dashy.nix { - inherit (self.nix-npm-buildpackage.override { - nodejs = self.nodejs_16; - yarn = self.yarn.override { nodejs = self.nodejs_16; }; - }) buildYarnPackage; - }; r8-cog = self.stdenvNoCC.mkDerivation rec { pname = "cog"; version = "0.8.6"; @@ -93,5 +71,12 @@ $out/bin/cog completion zsh > $out/share/zsh/site-functions/_cog ''; }; - + obsidian = with self.lib; throwIf (versionOlder "1.4.16" super.obsidian.version) "Obsidian no longer requires EOL Electron" ( + super.obsidian.override { + electron = self.electron_25.overrideAttrs (_: { + preFixup = "patchelf --add-needed ${self.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912 + meta.knownVulnerabilities = [ ]; # NixOS/nixpkgs#273611 + }); + } + ); }) diff --git a/pkgs/notion-desktop/default.nix b/pkgs/notion-desktop/default.nix index 1089528..fecbb62 100644 --- a/pkgs/notion-desktop/default.nix +++ b/pkgs/notion-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, p7zip, fetchurl, electron_26, makeWrapper, buildYarnPackage, python3 -, nodejs, makeDesktopItem, copyDesktopItems, jq }: +, nodejs, makeDesktopItem, copyDesktopItems, jq, runCommand, gzip, xz }: let env = buildYarnPackage { @@ -22,7 +22,13 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ p7zip makeWrapper python3 nodejs copyDesktopItems jq ]; - npm_config_tarball = electron_26.headers; + # https://github.com/NixOS/nixpkgs/issues/275627 + # npm_config_tarball = electron_26.headers; + npm_config_tarball = runCommand "node-headers.tar.gz" { + nativeBuildInputs = [ gzip xz ]; + } '' + xzcat ${electron_26.headers} | gzip > $out + ''; unpackPhase = '' runHook preUnpack