From f9e5be5864648bdfd8ec149509d7a1b294f730f0 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:05:27 +0100 Subject: [PATCH 01/13] Fix `magit-delta` build --- packages/emacs/packages.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 74b0068..952d7c2 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -148,7 +148,17 @@ let embark embark-consult magit - magit-delta + (magit-delta.override (old: { + # FIXME why is this needed? + melpaBuild = + args: + old.melpaBuild ( + args + // { + packageRequires = (args.packageRequires or [ ]) ++ [ dash ]; + } + ); + })) magit-todos difftastic with-editor From 9d6d17f2cf71c387c80af1160f0cc619e83114e5 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:05:38 +0100 Subject: [PATCH 02/13] Add `org-super-agenda` --- packages/emacs/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 952d7c2..f726e67 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -205,6 +205,7 @@ let aggressive-indent mixed-pitch visual-replace + org-super-agenda # org-re-reveal # FIXME very not nice hash mismatch when building ] ) From 75ab6534516f35c7228ef51b0413bce781df8b19 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:05:46 +0100 Subject: [PATCH 03/13] Change syncthing id for `sisko` --- modules/syncthing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/syncthing/default.nix b/modules/syncthing/default.nix index b1b9857..2b2d607 100644 --- a/modules/syncthing/default.nix +++ b/modules/syncthing/default.nix @@ -20,7 +20,7 @@ ]; }; sisko = { - id = "TOC7QXZ-JLB4LYP-VNIJAV5-DCKVGFN-UE45SPX-PPFJHSG-O3UHFCK-2PEMAQ6"; + id = "QE6V7PR-VHMAHHS-GHD4ZI3-IBB7FEM-M6EQZBX-YFCWDAK-YCYL6VO-NNRMXQK"; addresses = [ "tcp://sisko.fleet" ]; From ff47e7ba4bea433090087ae2ed01801136b454a8 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:05:59 +0100 Subject: [PATCH 04/13] Refactor --- modules/pipewire/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/pipewire/default.nix b/modules/pipewire/default.nix index 3e324a1..51d78cf 100644 --- a/modules/pipewire/default.nix +++ b/modules/pipewire/default.nix @@ -1,6 +1,11 @@ { lib, ... }: { - services.pipewire.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + pulse.enable = true; + jack.enable = true; + }; services.pulseaudio = { enable = false; From 3c12cbec24e3c04346783d95239d10e77ac603a2 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:06:09 +0100 Subject: [PATCH 05/13] Comment out unsuded WMs --- modules/greetd/default.nix | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix index 2f9707e..57b1acb 100644 --- a/modules/greetd/default.nix +++ b/modules/greetd/default.nix @@ -5,24 +5,24 @@ }: let sessions = builtins.concatStringsSep ":" [ - (pkgs.writeTextFile { - name = "xorg-session.desktop"; - destination = "/hyprland-session.desktop"; - text = '' - [Desktop Entry] - Name=Hyprland - Exec=Hyprland - ''; - }) - (pkgs.writeTextFile { - name = "xorg-session.desktop"; - destination = "/cosmic-session.desktop"; - text = '' - [Desktop Entry] - Name=Cosmic - Exec=cosmic-session - ''; - }) + # (pkgs.writeTextFile { + # name = "xorg-session.desktop"; + # destination = "/hyprland-session.desktop"; + # text = '' + # [Desktop Entry] + # Name=Hyprland + # Exec=Hyprland + # ''; + # }) + # (pkgs.writeTextFile { + # name = "xorg-session.desktop"; + # destination = "/cosmic-session.desktop"; + # text = '' + # [Desktop Entry] + # Name=Cosmic + # Exec=cosmic-session + # ''; + # }) (pkgs.writeTextFile { name = "xorg-session.desktop"; destination = "/niri-session.desktop"; From d5a1912ced5a5b89df0d6aa634f2d1a8a7a26b6b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:06:24 +0100 Subject: [PATCH 06/13] Re-enable personal Matrix home server --- hosts/sisko/default.nix | 1 + modules/cloudflare-dyndns/default.nix | 1 + modules/matrix/default.nix | 56 +++++++++++++-------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index e69404e..d15f43a 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -33,6 +33,7 @@ "atticd" "jellyfin" "firefly" + "matrix" ] ++ [ ./disko.nix diff --git a/modules/cloudflare-dyndns/default.nix b/modules/cloudflare-dyndns/default.nix index 77f1e46..071a22b 100644 --- a/modules/cloudflare-dyndns/default.nix +++ b/modules/cloudflare-dyndns/default.nix @@ -17,6 +17,7 @@ "jelly.aciceri.dev" "firefly.aciceri.dev" "import.firefly.aciceri.dev" + "matrix.aciceri.dev" ]; apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path; }; diff --git a/modules/matrix/default.nix b/modules/matrix/default.nix index c7a2741..c7d115b 100644 --- a/modules/matrix/default.nix +++ b/modules/matrix/default.nix @@ -7,7 +7,7 @@ let clientConfig = { "m.homeserver".base_url = "https://matrix.aciceri.dev"; - "org.matrix.msc3575.proxy".url = "https://syncv3.matrix.aciceri.dev"; + # "org.matrix.msc3575.proxy".url = "https://syncv3.matrix.aciceri.dev"; }; serverConfig."m.server" = "matrix.aciceri.dev:443"; mkWellKnown = data: '' @@ -38,13 +38,13 @@ in services.postgresql = { enable = true; - initialScript = pkgs.writeText "synapse-init.sql" '' - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; - CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" - TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; - ''; + # initialScript = pkgs.writeText "synapse-init.sql" '' + # CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; + # CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" + # TEMPLATE template0 + # LC_COLLATE = "C" + # LC_CTYPE = "C"; + # ''; }; systemd.tmpfiles.rules = [ @@ -80,27 +80,27 @@ in extraConfigFiles = [ config.age.secrets.matrix-registration-shared-secret.path ]; }; - backup.paths = [ - config.services.matrix-synapse.dataDir - "/var/backup/postgresql/matrix-synapse.sql.gz" - ]; + # backup.paths = [ + # config.services.matrix-synapse.dataDir + # "/var/backup/postgresql/matrix-synapse.sql.gz" + # ]; - services.postgresqlBackup = { - enable = true; - databases = [ "matrix-synapse" ]; - }; + # services.postgresqlBackup = { + # enable = true; + # databases = [ "matrix-synapse" ]; + # }; - services.matrix-sliding-sync = { - enable = true; - environmentFile = config.age.secrets.matrix-sliding-sync-secret.path; - settings = { - SYNCV3_SERVER = "http://localhost:8008"; - }; - }; + # services.matrix-sliding-sync = { + # enable = true; + # environmentFile = config.age.secrets.matrix-sliding-sync-secret.path; + # settings = { + # SYNCV3_SERVER = "http://localhost:8008"; + # }; + # }; - services.nginx.virtualHosts."syncv3.matrix.aciceri.dev" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = config.services.matrix-sliding-sync.settings.SYNCV3_SERVER; - }; + # services.nginx.virtualHosts."syncv3.matrix.aciceri.dev" = { + # enableACME = true; + # forceSSL = true; + # locations."/".proxyPass = config.services.matrix-sliding-sync.settings.SYNCV3_SERVER; + # }; } From 25ce4955993774dfe0609c1118eed3d4857aeb9f Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:07:03 +0100 Subject: [PATCH 07/13] Use `pantalaimon` --- hmModules/pantalaimon/default.nix | 18 ++++++++++++++++-- hosts/default.nix | 1 + hosts/picard/default.nix | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hmModules/pantalaimon/default.nix b/hmModules/pantalaimon/default.nix index 2c0a520..a6f2b8b 100644 --- a/hmModules/pantalaimon/default.nix +++ b/hmModules/pantalaimon/default.nix @@ -1,13 +1,27 @@ +{ pkgs, lib, ... }: { services.pantalaimon = { enable = true; + package = pkgs.pantalaimon.overrideAttrs { + pytestCheckPhase = "echo skip pytest"; + }; settings = { + Default = { + LogLevel = "Debug"; + SSL = true; + }; local-matrix = { - Homeserver = "https://nixos.dev"; - ListenAddress = "127.0.0.1"; + Homeserver = "https://matrix.aciceri.dev"; + # Homeserver = "https://matrix.nixos.dev/_matrix/client"; + # Homeserver = "https://matrix.nixos.dev"; + ListenAddress = "localhost"; ListenPort = 8008; + # SSL = false; + UseKeyring = false; + # IgnoreVerification = true; }; }; }; + systemd.user.services.pantalaimon.Unit.Requires = [ "dbus.socket" ]; } diff --git a/hosts/default.nix b/hosts/default.nix index b9d2db1..c17d45f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -117,6 +117,7 @@ group = "forgejo"; }; "firefly-app-key".owner = "firefly-iii"; + "matrix-registration-shared-secret".owner = "matrix-synapse"; }; }; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 50aa7a4..be6c8b7 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -95,6 +95,7 @@ "discord" "ib-tws" "zoom" + "pantalaimon" ]; extraGroups = [ "plugdev" ]; backupPaths = [ ]; From c7dce3ab4c3dafc3841ba4da6458103426d4f17e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:07:22 +0100 Subject: [PATCH 08/13] Prepare for next `niri` release --- hmModules/niri/config.kdl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl index d06c32d..09dacf3 100644 --- a/hmModules/niri/config.kdl +++ b/hmModules/niri/config.kdl @@ -222,6 +222,17 @@ layout { // top 64 // bottom 64 } + + // shadow { + // on + // } +} + +layer-rule { + match namespace="^rofi$" + // shadow { + // on + // } } // Add lines like this to spawn processes at startup. From dd900e93773541cb0edefdac4a23d365c7bb16f6 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:07:44 +0100 Subject: [PATCH 09/13] Play with org agenda --- hmModules/emacs/init.el | 50 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index a09038d..9987cbf 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -733,7 +733,7 @@ :hook ((org-mode . variable-pitch-mode) (org-mode . visual-line-mode) (org-mode . visual-fill-column-mode)) - :custom ((org-log-done 'time) + :custom ((org-log-done nil) (org-return-follows-link t) (org-hide-emphasis-markers t) (visual-fill-column-center-text t) @@ -758,7 +758,6 @@ (org-ellipsis "…") ) :bind (("C-c o l" . org-store-link) - ("C-c o a" . org-agenda) ("C-c o c" . org-capture) ("C-c b o" . org-switchb)) :config @@ -787,6 +786,7 @@ This is meant to be an helper to be called from the window manager." (add-hook 'org-attach-after-change-hook #'ccr/org-attach-save-file-list-to-property)) (use-package org-agenda + :after org-super-agenda :custom (org-agenda-files '("~/org")) (org-agenda-tags-column 0) @@ -797,7 +797,51 @@ This is meant to be an helper to be called from the window manager." " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄")) (org-agenda-current-time-string "◀── now ─────────────────────────────────────────────────") - :bind (("C-c o a" . org-agenda))) + (org-super-agenda-groups + '(;; Each group has an implicit boolean OR operator between its selectors. + (:name "Today" ; Optionally specify section name + :time-grid t ; Items that appear on the time grid + :todo "TODAY") ; Items that have this TODO keyword + (:name "Important" + ;; Single arguments given alone + :tag "bills" + :priority "A") + ;; Set order of multiple groups at once + (:order-multi (2 (:name "Shopping in town" + ;; Boolean AND group matches items that match all subgroups + :and (:tag "shopping" :tag "@town")) + (:name "Food-related" + ;; Multiple args given in list with implicit OR + :tag ("food" "dinner")) + (:name "Personal" + :habit t + :tag "personal") + (:name "Space-related (non-moon-or-planet-related)" + ;; Regexps match case-insensitively on the entire entry + :and (:regexp ("space" "NASA") + ;; Boolean NOT also has implicit OR between selectors + :not (:regexp "moon" :tag "planet"))))) + ;; Groups supply their own section names when none are given + (:todo "WAITING" :order 8) ; Set order of this section + (:todo ("SOMEDAY" "TO-READ" "CHECK" "TO-WATCH" "WATCHING") + ;; Show this group at the end of the agenda (since it has the + ;; highest number). If you specified this group last, items + ;; with these todo keywords that e.g. have priority A would be + ;; displayed in that group instead, because items are grouped + ;; out in the order the groups are listed. + :order 9) + (:priority<= "B" + ;; Show this section after "Today" and "Important", because + ;; their order is unspecified, defaulting to 0. Sections + ;; are displayed lowest-number-first. + :order 1) + ;; After the last group, the agenda will display items that didn't + ;; match any of these groups, with the default order position of 99 + )) + :bind (("C-c o a" . org-agenda)) + :config + (org-super-agenda-mode) + ) (use-package org-modern :after org From 1ba8ff0100652ef1ae17ff90119d83325760efd3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:07:53 +0100 Subject: [PATCH 10/13] Lock nixpkgs commit --- flake.lock | 311 +++++++++++++++++++++++++++++++++++++++++------------ flake.nix | 2 +- 2 files changed, 245 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index a90094c..b3a803e 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -23,14 +23,20 @@ }, "catppuccin": { "inputs": { - "nixpkgs": "nixpkgs_2" + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager_2", + "home-manager-stable": "home-manager-stable", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" }, "locked": { - "lastModified": 1739934729, - "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=", + "lastModified": 1736069220, + "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", "owner": "catppuccin", "repo": "nix", - "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", "type": "github" }, "original": { @@ -39,6 +45,34 @@ "type": "github" } }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "crane": { "locked": { "lastModified": 1731098351, @@ -83,11 +117,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1736711425, + "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", "type": "github" }, "original": { @@ -119,14 +153,14 @@ "emacs-overlay": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1740622367, - "narHash": "sha256-7TpBfGb24DrQrdW94T5x0vHN0GF2I50fkP+YX5r6JqE=", + "lastModified": 1736759802, + "narHash": "sha256-XCaIRTC+YlL5nRi9WJHeftyfw2Z0YXwwzEmHThGuR3Q=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ee8442abce734e9a1d0e5824818062bcbf358e73", + "rev": "244a2ab1459c72bac32a2db088549f8bc6d7a836", "type": "github" }, "original": { @@ -226,6 +260,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -245,11 +297,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -282,11 +334,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -359,7 +411,50 @@ "type": "github" } }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nix-on-droid", @@ -387,11 +482,11 @@ ] }, "locked": { - "lastModified": 1740624780, - "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", + "lastModified": 1736781604, + "narHash": "sha256-nIjcN89nxaI5ZnwU/1gzc3rBVQ/te5sHraYeG4cyJX4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", + "rev": "9616d81f98032d1ee9bec68ab4b6a8c833add88c", "type": "github" }, "original": { @@ -423,11 +518,11 @@ }, "impermanence": { "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1736688610, + "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", "type": "github" }, "original": { @@ -436,6 +531,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -448,11 +571,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1740440383, - "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", + "lastModified": 1734994463, + "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6321bc060d757c137c1fbae2057c7e941483878f", + "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", "type": "github" }, "original": { @@ -464,11 +587,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740629216, - "narHash": "sha256-i6fadzFVD7B8XWXa2ycPoVlpSJ5SeWcZ8LLzfzYedKs=", + "lastModified": 1736680332, + "narHash": "sha256-gwidOezQ6FT5q4GHcpD6y2EwKcrtzjAoxaN/9bTGqQw=", "ref": "refs/heads/main", - "rev": "8082f0b8434a81db309ac8abf1cf32532ba9168e", - "revCount": 17513, + "rev": "38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2", + "revCount": 16610, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -479,7 +602,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -489,11 +612,11 @@ ] }, "locked": { - "lastModified": 1738176840, - "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", + "lastModified": 1733522213, + "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", "ref": "refs/heads/main", - "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", - "revCount": 133, + "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", + "revCount": 124, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -505,11 +628,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1737346419, - "narHash": "sha256-YHByUFujAnfJJ2JnhHIJyohECr5o0EDmuRdyUcvnZGQ=", + "lastModified": 1736638789, + "narHash": "sha256-pkpOkSUNrSf5DePUtYYFt4wGODhY28RlQ4SIJ1e+15M=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "1498c4d7fd59026479469efdbfe30c78a7300d89", + "rev": "72a0601f36a1b424e8b72f17ff53509b990ee060", "type": "github" }, "original": { @@ -546,7 +669,7 @@ }, "nix-on-droid": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": "nixpkgs_5", "nixpkgs-docs": "nixpkgs-docs", @@ -569,11 +692,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1740387674, - "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -632,23 +755,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1740463929, - "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { @@ -659,6 +782,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -676,11 +815,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -708,11 +847,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { @@ -739,17 +878,17 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1736701207, + "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" } }, @@ -805,6 +944,29 @@ "type": "gitlab" } }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -816,7 +978,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1731363552, @@ -999,6 +1161,21 @@ "type": "github" } }, + "systems_4": { + "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": [ @@ -1006,11 +1183,11 @@ ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { @@ -1021,7 +1198,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_7" }, "locked": { diff --git a/flake.nix b/flake.nix index 4b6946e..847a775 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { flakeParts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6"; # FIXME update (check if screen sharing works!) nixosHardware.url = "github:NixOS/nixos-hardware"; homeManager = { url = "github:nix-community/home-manager"; From f819c3bad628278e1aba048b48d467777b507ccc Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:08:04 +0100 Subject: [PATCH 11/13] `gnome-keyring` portal --- modules/xdg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/xdg/default.nix b/modules/xdg/default.nix index 078ee8e..04c145e 100644 --- a/modules/xdg/default.nix +++ b/modules/xdg/default.nix @@ -10,6 +10,8 @@ xdg-desktop-portal-gnome xdg-desktop-portal kdePackages.xdg-desktop-portal-kde + libsForQt5.xdg-desktop-portal-kde + gnome-keyring ]; extraPortals = with pkgs; [ xdg-desktop-portal-wlr @@ -18,6 +20,7 @@ xdg-desktop-portal-gnome xdg-desktop-portal kdePackages.xdg-desktop-portal-kde + gnome-keyring ]; xdgOpenUsePortal = true; wlr.enable = true; From 82ac0622aa2f45ca6f57db75144dcefa99bc28cd Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 6 Mar 2025 13:08:29 +0100 Subject: [PATCH 12/13] Various --- modules/common/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/common/default.nix b/modules/common/default.nix index c802ddd..88bd936 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -1,6 +1,7 @@ { lib, fleetModules, + pkgs, ... }: { @@ -15,4 +16,12 @@ users.mutableUsers = false; i18n.defaultLocale = "en_US.UTF-8"; nixpkgs.config.allowUnfree = true; # Forgive me Mr. Stallman :( + system.switch.enableNg = true; + + environment.systemPackages = [ pkgs.btop ]; + + # FIXME not the best place + nixpkgs.config.permittedInsecurePackages = [ + "olm-3.2.16" + ]; } From 3a69a43c2539ac18e1c69270a2ece2b011c7060e Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Fri, 7 Mar 2025 08:18:45 +0000 Subject: [PATCH 13/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41' (2024-08-10) → 'github:ryantm/agenix/e600439ec4c273cf11e06fe4d9d906fb98fa097c' (2025-01-15) • Updated input 'catppuccin': 'github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e' (2025-01-05) → 'github:catppuccin/nix/2884670e4deddc862988ba25548211ff13a5a742' (2025-03-06) • Removed input 'catppuccin/catppuccin-v1_1' • Removed input 'catppuccin/catppuccin-v1_2' • Removed input 'catppuccin/home-manager' • Removed input 'catppuccin/home-manager/nixpkgs' • Removed input 'catppuccin/home-manager-stable' • Removed input 'catppuccin/home-manager-stable/nixpkgs' • Updated input 'catppuccin/nixpkgs': 'github:NixOS/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33' (2024-12-17) → 'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04) • Removed input 'catppuccin/nixpkgs-stable' • Removed input 'catppuccin/nuscht-search' • Removed input 'catppuccin/nuscht-search/flake-utils' • Removed input 'catppuccin/nuscht-search/flake-utils/systems' • Removed input 'catppuccin/nuscht-search/ixx' • Removed input 'catppuccin/nuscht-search/ixx/flake-utils' • Removed input 'catppuccin/nuscht-search/ixx/nixpkgs' • Removed input 'catppuccin/nuscht-search/nixpkgs' • Updated input 'disko': 'github:nix-community/disko/f720e64ec37fa16ebba6354eadf310f81555cc07' (2025-01-12) → 'github:nix-community/disko/19c1140419c4f1cdf88ad4c1cfb6605597628940' (2025-02-25) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/244a2ab1459c72bac32a2db088549f8bc6d7a836' (2025-01-13) → 'github:nix-community/emacs-overlay/cb747e4bc76c308d2ece3721bf07f534d10cb196' (2025-03-07) • Updated input 'emacs-overlay/nixpkgs': 'github:NixOS/nixpkgs/130595eba61081acde9001f43de3248d8888ac4a' (2025-01-10) → 'github:NixOS/nixpkgs/d69ab0d71b22fa1ce3dbeff666e6deb4917db049' (2025-03-05) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/1dab772dd4a68a7bba5d9460685547ff8e17d899' (2025-01-10) → 'github:NixOS/nixpkgs/48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3' (2025-03-05) • Updated input 'flakeParts': 'github:hercules-ci/flake-parts/b905f6fc23a9051a6e1b741e1438dbfc0634c6de' (2025-01-06) → 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764' (2025-03-01) • Updated input 'flakeParts/nixpkgs-lib': 'https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz?narHash=sha256-CewEm1o2eVAnoqb6Ml%2BQi9Gg/EfNAxbRx1lANGVyoLI%3D' (2025-01-01) → 'https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz?narHash=sha256-3wHafybyRfpUCLoE8M%2BuPVZinImg3xX%2BNm6gEfN3G8I%3D' (2025-03-01) • Updated input 'git-hooks-nix': 'github:cachix/git-hooks.nix/a5a961387e75ae44cc20f0a57ae463da5e959656' (2025-01-03) → 'github:cachix/git-hooks.nix/42b1ba089d2034d910566bf6b40830af6b8ec732' (2025-03-02) • Updated input 'homeManager': 'github:nix-community/home-manager/9616d81f98032d1ee9bec68ab4b6a8c833add88c' (2025-01-13) → 'github:nix-community/home-manager/486b066025dccd8af7fbe5dd2cc79e46b88c80da' (2025-03-05) • Updated input 'impermanence': 'github:nix-community/impermanence/c64bed13b562fc3bb454b48773d4155023ac31b7' (2025-01-12) → 'github:nix-community/impermanence/4b3e914cdf97a5b536a889e939fb2fd2b043a170' (2025-01-25) • Updated input 'lanzaboote': 'github:nix-community/lanzaboote/93e6f0d77548be8757c11ebda5c4235ef4f3bc67' (2024-12-23) → 'github:nix-community/lanzaboote/3a3ed972151121c8b159eb40e0be21146270e73b' (2025-03-06) • Updated input 'lanzaboote/crane': 'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28' (2024-11-08) → 'github:ipetkov/crane/75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53' (2025-03-05) • Updated input 'lanzaboote/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04) • Updated input 'lanzaboote/flake-parts': 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01) → 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764' (2025-03-01) • Updated input 'lanzaboote/pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0' (2024-11-11) → 'github:cachix/pre-commit-hooks.nix/42b1ba089d2034d910566bf6b40830af6b8ec732' (2025-03-02) • Removed input 'lanzaboote/pre-commit-hooks-nix/nixpkgs-stable' • Updated input 'lanzaboote/rust-overlay': 'github:oxalica/rust-overlay/0be641045af6d8666c11c2c40e45ffc9667839b5' (2024-11-18) → 'github:oxalica/rust-overlay/38e9826bc4296c9daf18bc1e6aa299f3e932a403' (2025-03-06) • Updated input 'lix': 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2' (2025-01-12) → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08' (2025-03-05) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea' (2024-12-06) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e' (2025-01-29) • Updated input 'mobile-nixos': 'github:NixOS/mobile-nixos/72a0601f36a1b424e8b72f17ff53509b990ee060' (2025-01-11) → 'github:NixOS/mobile-nixos/8956d72cf8fa9110dcc5fcbc537adee45a8014f5' (2025-03-04) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/8870dcaff63dfc6647fb10648b827e9d40b0a337' (2025-01-09) → 'github:NixOS/nixos-hardware/b48cc4dab0f9711af296fc367b6108cf7b8ccb16' (2025-03-07) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/13c913f5deb3a5c08bb810efd89dc8cb24dd968b' (2025-01-06) → 'github:numtide/treefmt-nix/3d0579f5cc93436052d94b73925b48973a104204' (2025-02-17) --- flake.lock | 350 ++++++++++++----------------------------------------- 1 file changed, 78 insertions(+), 272 deletions(-) diff --git a/flake.lock b/flake.lock index b3a803e..081a5a3 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -23,20 +23,14 @@ }, "catppuccin": { "inputs": { - "catppuccin-v1_1": "catppuccin-v1_1", - "catppuccin-v1_2": "catppuccin-v1_2", - "home-manager": "home-manager_2", - "home-manager-stable": "home-manager-stable", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable", - "nuscht-search": "nuscht-search" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1736069220, - "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", + "lastModified": 1741287139, + "narHash": "sha256-lpSXdmXj6fEo3DwImX6+R/cSakuIHWJ+gLGw1ZcVOXs=", "owner": "catppuccin", "repo": "nix", - "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", + "rev": "2884670e4deddc862988ba25548211ff13a5a742", "type": "github" }, "original": { @@ -45,41 +39,13 @@ "type": "github" } }, - "catppuccin-v1_1": { - "locked": { - "lastModified": 1734055249, - "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", - "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", - "revCount": 326, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" - } - }, - "catppuccin-v1_2": { - "locked": { - "lastModified": 1734728407, - "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", - "rev": "23ee86dbf4ed347878115a78971d43025362fab1", - "revCount": 341, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" - } - }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1741148495, + "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", "type": "github" }, "original": { @@ -117,11 +83,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -153,14 +119,14 @@ "emacs-overlay": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1736759802, - "narHash": "sha256-XCaIRTC+YlL5nRi9WJHeftyfw2Z0YXwwzEmHThGuR3Q=", + "lastModified": 1741310221, + "narHash": "sha256-R2HrOkqshpuPlUE2480xCPAf4xuHaXWdGtM0bByigYE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "244a2ab1459c72bac32a2db088549f8bc6d7a836", + "rev": "cb747e4bc76c308d2ece3721bf07f534d10cb196", "type": "github" }, "original": { @@ -204,11 +170,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -225,11 +191,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -260,24 +226,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -297,11 +245,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -334,11 +282,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -411,50 +359,7 @@ "type": "github" } }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nix-on-droid", @@ -482,11 +387,11 @@ ] }, "locked": { - "lastModified": 1736781604, - "narHash": "sha256-nIjcN89nxaI5ZnwU/1gzc3rBVQ/te5sHraYeG4cyJX4=", + "lastModified": 1741217763, + "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", "owner": "nix-community", "repo": "home-manager", - "rev": "9616d81f98032d1ee9bec68ab4b6a8c833add88c", + "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", "type": "github" }, "original": { @@ -518,11 +423,11 @@ }, "impermanence": { "locked": { - "lastModified": 1736688610, - "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -531,34 +436,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "catppuccin", - "nuscht-search", - "flake-utils" - ], - "nixpkgs": [ - "catppuccin", - "nuscht-search", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -571,11 +448,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1734994463, - "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", + "lastModified": 1741259028, + "narHash": "sha256-QWgGXe9Ai8+hSwNEAqLjZoAvLwV3ywDzT+XBpfMOzuU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", + "rev": "3a3ed972151121c8b159eb40e0be21146270e73b", "type": "github" }, "original": { @@ -587,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1736680332, - "narHash": "sha256-gwidOezQ6FT5q4GHcpD6y2EwKcrtzjAoxaN/9bTGqQw=", + "lastModified": 1741212440, + "narHash": "sha256-UrNM90hCGa4Ee8R7v6oyBL9Mqi5XbyNdUAireOzgzGs=", "ref": "refs/heads/main", - "rev": "38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2", - "revCount": 16610, + "rev": "f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08", + "revCount": 17618, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -602,7 +479,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -612,11 +489,11 @@ ] }, "locked": { - "lastModified": 1733522213, - "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", + "lastModified": 1738176840, + "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", "ref": "refs/heads/main", - "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", - "revCount": 124, + "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", + "revCount": 133, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -628,11 +505,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1736638789, - "narHash": "sha256-pkpOkSUNrSf5DePUtYYFt4wGODhY28RlQ4SIJ1e+15M=", + "lastModified": 1741101701, + "narHash": "sha256-Kup8HWWC2AR1j2c9pAjXQXLYmuhyv8sRRfX0o03sNQg=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "72a0601f36a1b424e8b72f17ff53509b990ee060", + "rev": "8956d72cf8fa9110dcc5fcbc537adee45a8014f5", "type": "github" }, "original": { @@ -669,7 +546,7 @@ }, "nix-on-droid": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": "nixpkgs_5", "nixpkgs-docs": "nixpkgs-docs", @@ -692,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1741325094, + "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "type": "github" }, "original": { @@ -755,23 +632,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "lastModified": 1740872140, + "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1734600368, - "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "lastModified": 1741196730, + "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", "type": "github" }, "original": { @@ -781,45 +658,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1736549401, - "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -847,11 +692,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { @@ -944,29 +789,6 @@ "type": "gitlab" } }, - "nuscht-search": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", - "owner": "NuschtOS", - "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -977,15 +799,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_3" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -1065,11 +886,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1741228283, + "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", "type": "github" }, "original": { @@ -1161,21 +982,6 @@ "type": "github" } }, - "systems_4": { - "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": [ @@ -1183,11 +989,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -1198,7 +1004,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_7" }, "locked": {