From 77bef65f96891f2d6712ed6b10aeae3d37ab510a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:06:04 +0100 Subject: [PATCH 01/19] Update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e179486..6f15723 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700900274, - "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700967639, - "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", + "lastModified": 1701127353, + "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4be58d802693d7def8622ff34d36714f8db40371", + "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", "type": "github" }, "original": { From 386897c36e1e8cd611c164956a9875eb8bb2ce16 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:10:20 +0100 Subject: [PATCH 02/19] Downgrade to 23.05? --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index fb6fcb7..67e3382 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index c291657..5aade6a 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -39,5 +39,5 @@ networking.hostName = "EDI"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "unstable"; + system.stateVersion = "23.05"; } From d3382eeb0c726d29e6b6b95a3370523d02130a1f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:10:56 +0100 Subject: [PATCH 03/19] Update flake --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6f15723..5fe9fc7 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701053011, + "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 89d218e..35c5c4a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: From a77277d889b69b56911a28949b49eab0f099626d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:12:11 +0100 Subject: [PATCH 04/19] Not found in 23.05 --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d0c3732..a7efb2b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -102,7 +102,7 @@ package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ arrterian.nix-env-selector - ban.spellright + #ban.spellright dracula-theme.theme-dracula eamodio.gitlens github.vscode-pull-request-github From 67d1b18e2403e15dd3a97a68fd45c6bcc0f52519 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:12:46 +0100 Subject: [PATCH 05/19] Ditto --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index a7efb2b..d088f4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -112,7 +112,7 @@ ms-pyright.pyright #ms-python.python ms-python.vscode-pylance - ms-vscode-remote.remote-containers + #ms-vscode-remote.remote-containers ms-vscode-remote.remote-ssh oderwat.indent-rainbow rust-lang.rust-analyzer From 6811ab7fdf89109618166d6617ab049b04660de5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:14:04 +0100 Subject: [PATCH 06/19] Permit electron 24 --- home-manager/desktop-shared.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index d088f4b..ad1e004 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -42,6 +42,10 @@ allowUnfree = true; # Workaround for https://github.com/nix-community/home-manager/issues/2942 allowUnfreePredicate = _: true; + + permittedInsecurePackages = [ + "electron-24.8.6" + ]; }; }; From c87d6ab3c84c231c4fa8e0c13d980d2ddd49c3b9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:18:46 +0100 Subject: [PATCH 07/19] Isn't an option in this version --- home-manager/program-configs/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/program-configs/zsh.nix b/home-manager/program-configs/zsh.nix index e61cb4b..f4da504 100644 --- a/home-manager/program-configs/zsh.nix +++ b/home-manager/program-configs/zsh.nix @@ -24,7 +24,7 @@ enableCompletion = true; historySubstringSearch.enable = true; syntaxHighlighting.enable = true; - zsh-abbr.enable = true; + #zsh-abbr.enable = true; oh-my-zsh = { enable = true; plugins = [ From 01314042e2d45c31b8c45dad8230e98180c16d6a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:19:50 +0100 Subject: [PATCH 08/19] Remove input leap --- nixos/shared-desktop/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 5743b01..160d70a 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,7 +62,6 @@ docker-compose git-filter-repo home-manager - input-leap libsForQt5.discover libsForQt5.kcalc libsForQt5.kdepim-addons From 8c69899f9afb22825f27bbd08df7179cdd0437e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:31:41 +0100 Subject: [PATCH 09/19] Let's go unstable again (timewarp beat) --- home-manager/EDI-Lillian.nix | 2 +- nixos/EDI/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/EDI-Lillian.nix b/home-manager/EDI-Lillian.nix index 67e3382..fb6fcb7 100644 --- a/home-manager/EDI-Lillian.nix +++ b/home-manager/EDI-Lillian.nix @@ -22,5 +22,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix index 5aade6a..c291657 100644 --- a/nixos/EDI/configuration.nix +++ b/nixos/EDI/configuration.nix @@ -39,5 +39,5 @@ networking.hostName = "EDI"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "23.05"; + system.stateVersion = "unstable"; } From 5d468c542df8099f64a9ffdc8d0ebab08767feb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:32:44 +0100 Subject: [PATCH 10/19] This was the issue I think --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 35c5c4a..89d218e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: From 200dd415f09b92c9157566231b2c052479b41b49 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:33:01 +0100 Subject: [PATCH 11/19] Flake lock --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5fe9fc7..6f15723 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701053011, - "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } From fb01bf66afa64a757783419219c8464b1964d171 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 28 Nov 2023 10:39:10 +0100 Subject: [PATCH 12/19] Try the other webcord? --- home-manager/desktop-shared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index ad1e004..a950fac 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -66,7 +66,7 @@ # Chat applications: element-desktop signal-desktop - webcord + webcord-vencord # Gaming: prismlauncher From e3b1fe9161e389a3107279271541683f3ae86a56 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 29 Nov 2023 13:22:33 +0100 Subject: [PATCH 13/19] Add sqlfluff (that's its name I promise) --- nixos/shared-desktop/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 160d70a..41a01d2 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -77,6 +77,7 @@ pciutils rsync steam + sqlfluff wget zsh ]; From d5ac22bb1bfe3823b5c6adb1381153c384c83d04 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 10:41:54 +0100 Subject: [PATCH 14/19] flake lock update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 6f15723..c9923c2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "lastModified": 1701728041, + "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700905716, - "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", + "lastModified": 1701568804, + "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb95385d21475da10b63da74ae96d89ab352431", + "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "lastModified": 1701336116, + "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701127353, - "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", + "lastModified": 1701728052, + "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", + "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d", "type": "github" }, "original": { From cabefc2fa3d9a96f9142605d2ab5a75613e2b4e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 11:27:27 +0100 Subject: [PATCH 15/19] Maybe open the right port for the db --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 8a351e0..11dd541 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -113,7 +113,7 @@ # Enable networking networking.networkmanager.enable = true; - networking.firewall.allowedTCPPorts = [80 443 1443]; + networking.firewall.allowedTCPPorts = [80 443 1433]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 4656596b0a5bf900dfa243cc002e77bfb6c635df Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 13:16:48 +0100 Subject: [PATCH 16/19] Add krunner plugins --- nixos/shared-desktop/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 41a01d2..65782dd 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -62,11 +62,14 @@ docker-compose git-filter-repo home-manager + krunner-translator libsForQt5.discover libsForQt5.kcalc libsForQt5.kdepim-addons libsForQt5.kirigami2 libsForQt5.kdeconnect-kde + libsForQt5.krunner-ssh + libsForQt5.krunner-symbols libsForQt5.packagekit-qt libportal-qt5 noto-fonts From bf951766a71d81f5e00868a4d8c4ce8159c90420 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 14:30:54 +0100 Subject: [PATCH 17/19] Enable firewall? --- nixos/queen/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 11dd541..6e595c0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -113,6 +113,8 @@ # Enable networking networking.networkmanager.enable = true; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [80 443 1433]; # Set your time zone. From 8e07ec55c732e230d78ac22c429fcf18768b3bd8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 5 Dec 2023 14:34:39 +0100 Subject: [PATCH 18/19] Allow SSH port --- nixos/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index 6e595c0..ab9f77d 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -115,7 +115,7 @@ networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [80 443 1433]; + networking.firewall.allowedTCPPorts = [22 80 443 1433]; # Set your time zone. time.timeZone = "Europe/Amsterdam"; From 7878ea2df3f0bd7f88e510f9867d81187c17cdc7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 6 Dec 2023 11:14:36 +0100 Subject: [PATCH 19/19] Maybe the updates have fixed akkoma? (doubful) --- nixos/queen/akkoma.nix | 2 +- nixos/queen/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/queen/akkoma.nix b/nixos/queen/akkoma.nix index fef0b69..bd68ba9 100644 --- a/nixos/queen/akkoma.nix +++ b/nixos/queen/akkoma.nix @@ -25,7 +25,7 @@ nginx = { enableACME = true; forceSSL = true; - serverName = "social.gladtherescake.eu"; + serverName = "akkoma.gladtherescake.eu"; }; #dist.cookie._secret = config.sops.secrets."releaseCookie".path; config = { diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix index ab9f77d..fb3dfd0 100644 --- a/nixos/queen/configuration.nix +++ b/nixos/queen/configuration.nix @@ -20,7 +20,7 @@ ./nextcloud.nix ./mail-server.nix ./gotosocial.nix - #./akkoma.nix + ./akkoma.nix ]; boot.tmp.cleanOnBoot = true;