From 6ad1d2b1bb63ce138ec82a78787efb76de9e5dad Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Sat, 6 Dec 2025 11:38:26 +0100 Subject: [PATCH 01/11] chore: Fix deprecation warnings --- home/alex/home.nix | 2 +- hosts/dregil/configuration.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home/alex/home.nix b/home/alex/home.nix index 3d8b050..cdae044 100644 --- a/home/alex/home.nix +++ b/home/alex/home.nix @@ -111,7 +111,7 @@ enableSshSupport = true; sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ]; extraConfig = '' - pinentry-program ${pkgs.pinentry.qt}/bin/pinentry + pinentry-program ${pkgs.pinentry-qt}/bin/pinentry ''; }; diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index 3001398..f37eaf5 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -48,9 +48,10 @@ in i18n = { extraLocaleSettings = { - TIME_STYLE = "iso"; + LC_TIME = "sv_SE.UTF-8"; # iso foramt }; extraLocales = "all"; + defaultLocale = "en_US.UTF-8"; }; console = { @@ -65,7 +66,7 @@ in [ corefonts noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji fira-code fira-code-symbols ] @@ -93,7 +94,7 @@ in ripgrep git nvidia-offload - pinentry + pinentry-qt ]; # adjust channels to nixpkgs used on this system via this flake From e4af2bb9ad8a35a22b0980899cc460a4fbf22a7b Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 10 Dec 2025 13:07:16 +0100 Subject: [PATCH 02/11] chore: Update inputs --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 5fc1bf6..d1bcde2 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", + "lastModified": 1765326679, + "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", "owner": "nix-community", "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", + "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1763906693, - "narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=", + "lastModified": 1765337252, + "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b", + "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763553727, - "narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=", + "lastModified": 1764374374, + "narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "094318ea16502a7a81ce90dd3638697020f030a2", + "rev": "6a49303095abc094ee77dc243a9e351b642e8e75", "type": "github" }, "original": { @@ -475,11 +475,11 @@ ] }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -526,11 +526,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763564778, - "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", + "lastModified": 1764763336, + "narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", + "rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e", "type": "gitlab" }, "original": { From 42d53f650075ea58b1b3f03d4dc5f56a6b34be32 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Thu, 15 Jan 2026 23:03:00 +0100 Subject: [PATCH 03/11] thrall: Configure automatic exports for paperless --- hosts/thrall/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index 164a582..fddb6ac 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -322,19 +322,17 @@ in services.paperless = { enable = true; address = "127.0.0.1"; + domain = "docs.failco.de"; port = 3002; consumptionDirIsPublic = true; configureTika = true; + exporter.enable = true; settings = { PAPERLESS_OCR_LANGUAGE = "deu+eng"; PAPERLESS_OCR_USER_ARGS = ''{"invalidate_digital_signatures": true}''; PAPERLESS_URL = "https://docs.failco.de"; PAPERLESS_CONSUMER_RECURSIVE = true; PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS = true; - - # workaround for classification getting stuck, see - # https://github.com/NixOS/nixpkgs/issues/240591#issuecomment-1915678490 - OMP_NUM_THREADS = 1; }; }; From 8895ae29634da12400094e065f623ee6c8a9284f Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Thu, 15 Jan 2026 23:03:00 +0100 Subject: [PATCH 04/11] emacs: Update to org-gtd-4 --- home/alex/programs/emacs/doom/config.el | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el index 39c5a5e..d1bad75 100644 --- a/home/alex/programs/emacs/doom/config.el +++ b/home/alex/programs/emacs/doom/config.el @@ -107,7 +107,8 @@ org-agenda-include-diary t org-agenda-sticky t org-todo-keywords '( - (sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)") + ;; (sequence "TODO" "NEXT" "WAIT" "|" "DONE" "CNCL") + (sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)") (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)") ) org-tag-alist '( @@ -242,18 +243,32 @@ :after org :demand t :init - (setq! org-gtd-update-ack "3.0.0") + (setq! org-gtd-update-ack "4.0.0") + (setq! org-gtd-directory org-directory) + (setopt org-todo-keywords + '( + (sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)") + )) + + :config + (setopt org-gtd-keyword-mapping + '((todo . "TODO") ;; tasks not ready to be acted upon + (next . "NEXT") ;; tasks ready to act on immediately + (wait . "WAIT") ;; tasks blocked or delegated + (done . "DONE") ;; tasks successfully completed + (canceled . "CNCL"))) ;; tasks that won't be completed + + (setq org-agenda-files (list org-gtd-directory)) (setf org-gtd-id--generate #'org-id-get-create) - (setq! org-gtd-directory org-directory) (setq! org-gtd-default-file-name "actionable") (setq! org-gtd-refile-to-any-target nil) (setq! org-gtd-engage-prefix-width 40) (setq! org-edna-use-inheritance t) ;; (setq org-gtd-areas-of-focus '("house" "haskell" "foss")) - (setq org-gtd-organize-hooks nil) - (org-edna-mode) + ;; (setq org-gtd-organize-hooks nil) + (org-edna-mode 1) (map! :leader :desc "Capture" "X" #'org-gtd-capture (:prefix-map ("d" . "GTD") From 2a1db15b8cfd97e9b7f50641cba60ba46f1beb9a Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Thu, 15 Jan 2026 23:03:00 +0100 Subject: [PATCH 05/11] chore: Update inputs --- flake.lock | 52 ++++++++++++++++++++-------------------- hosts/thrall/default.nix | 9 ++++--- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 5fc1bf6..1f5fb27 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", + "lastModified": 1768923567, + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", "owner": "nix-community", "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", "type": "github" }, "original": { @@ -105,15 +105,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1763906693, - "narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=", + "lastModified": 1769187349, + "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b", + "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763553727, - "narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=", + "lastModified": 1764374374, + "narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "094318ea16502a7a81ce90dd3638697020f030a2", + "rev": "6a49303095abc094ee77dc243a9e351b642e8e75", "type": "github" }, "original": { @@ -475,11 +475,11 @@ ] }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "type": "github" }, "original": { @@ -526,11 +526,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763564778, - "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", + "lastModified": 1766321686, + "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", + "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3", "type": "gitlab" }, "original": { diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index fddb6ac..0634a16 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -211,11 +211,14 @@ in }; services.nginx.virtualHosts = { # main site - "failco.de" = { + "thrall.failco.de" = { forceSSL = true; enableACME = true; root = "/srv/www/failco.de"; - serverAliases = [ "www.failco.de" ]; + serverAliases = [ + "failco.de" + "www.failco.de" + ]; extraConfig = '' add_header X-Frame-Options 'SAMEORIGIN'; ''; @@ -464,7 +467,7 @@ in "charlie@kobjolke.de" = "alex@kobjolke.de"; }; - certificateScheme = "acme-nginx"; + x509.useACMEHost = config.mailserver.fqdn; enableImapSsl = true; enableManageSieve = true; From 2d2e3a9ccaa385186b16b27afa001c7752a74d9d Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Sat, 6 Dec 2025 11:38:26 +0100 Subject: [PATCH 06/11] chore: Fix deprecation warnings --- home/alex/home.nix | 2 +- hosts/dregil/configuration.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home/alex/home.nix b/home/alex/home.nix index 3d8b050..cdae044 100644 --- a/home/alex/home.nix +++ b/home/alex/home.nix @@ -111,7 +111,7 @@ enableSshSupport = true; sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ]; extraConfig = '' - pinentry-program ${pkgs.pinentry.qt}/bin/pinentry + pinentry-program ${pkgs.pinentry-qt}/bin/pinentry ''; }; diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index 3001398..f37eaf5 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -48,9 +48,10 @@ in i18n = { extraLocaleSettings = { - TIME_STYLE = "iso"; + LC_TIME = "sv_SE.UTF-8"; # iso foramt }; extraLocales = "all"; + defaultLocale = "en_US.UTF-8"; }; console = { @@ -65,7 +66,7 @@ in [ corefonts noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji fira-code fira-code-symbols ] @@ -93,7 +94,7 @@ in ripgrep git nvidia-offload - pinentry + pinentry-qt ]; # adjust channels to nixpkgs used on this system via this flake From 9facd640ad538e81a9204f507263c83c0182af43 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Fri, 20 Feb 2026 20:38:18 +0100 Subject: [PATCH 07/11] chore: Update nixpkgs and resolve resulting issues --- flake.nix | 6 +++--- home/alex/cli.nix | 2 +- home/alex/programs/shell/default.nix | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 23f2062..7c3ec9f 100644 --- a/flake.nix +++ b/flake.nix @@ -57,9 +57,9 @@ pre-commit-check = pre-commit-hooks.lib.${system}.run { src = ./.; tools.fourmolu = pkgs.haskellPackages.fourmolu; - tools.nixfmt = pkgs.nixfmt-rfc-style; + tools.nixfmt = pkgs.nixfmt; hooks = { - nixfmt-rfc-style.enable = true; + nixfmt.enable = true; fourmolu.enable = true; hpack.enable = true; hlint.enable = true; @@ -143,7 +143,7 @@ inherit (self.checks.${system}.pre-commit-check) shellHook; packages = with pkgs; [ - nixfmt-rfc-style + nixfmt nil ]; }; diff --git a/home/alex/cli.nix b/home/alex/cli.nix index b4833b9..5d96eac 100644 --- a/home/alex/cli.nix +++ b/home/alex/cli.nix @@ -44,7 +44,7 @@ in # nix tools nix-index - nixfmt-rfc-style + nixfmt # misc fd # better find file # info about files diff --git a/home/alex/programs/shell/default.nix b/home/alex/programs/shell/default.nix index 48b25b9..87db7da 100644 --- a/home/alex/programs/shell/default.nix +++ b/home/alex/programs/shell/default.nix @@ -17,6 +17,7 @@ enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; + dotDir = "${config.xdg.configHome}/zsh"; initContent = '' [ $TERM = "dumb" ] && unsetopt zle && PS1='$ ' From 892bd5f8e326199396be4ae5ea1c59385a4721f3 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Tue, 24 Feb 2026 22:29:34 +0100 Subject: [PATCH 08/11] dregil: Setup COSMIC desktop-environment --- hosts/dregil/configuration.nix | 3 --- modules/wm/x.nix | 13 ++++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index f37eaf5..a9c27d7 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -47,9 +47,6 @@ in ''; i18n = { - extraLocaleSettings = { - LC_TIME = "sv_SE.UTF-8"; # iso foramt - }; extraLocales = "all"; defaultLocale = "en_US.UTF-8"; }; diff --git a/modules/wm/x.nix b/modules/wm/x.nix index aa86b29..8b68d3c 100644 --- a/modules/wm/x.nix +++ b/modules/wm/x.nix @@ -22,13 +22,16 @@ videoDrivers = [ "nvidia" ]; # "modesetting" ]; - displayManager.lightdm = { - enable = true; - greeters.slick.enable = true; - }; + # displayManager.lightdm = { + # enable = true; + # greeters.slick.enable = true; + # }; + }; - desktopManager.gnome.enable = true; + displayManager.cosmic-greeter.enable = true; + desktopManager.cosmic.enable = true; + # desktopManager.gnome.enable = true; # Enable touchpad support (enabled default in most desktopManager). libinput = { From 4fc9ee5d66a851d043502eb4d8b36ce7f2e63f3d Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 25 Feb 2026 21:44:51 +0100 Subject: [PATCH 09/11] dregil: Fix suspend/hibernate issue related to nvidia settings --- hosts/dregil/configuration.nix | 10 ------- hosts/dregil/hardware-configuration.nix | 35 ++++++++++++++----------- modules/wm/nvidia.nix | 25 ++++++++++++++++++ modules/wm/x.nix | 1 + 4 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 modules/wm/nvidia.nix diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index a9c27d7..5c927b2 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -9,15 +9,6 @@ lib, ... }: -let - nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" '' - export __NV_PRIME_RENDER_OFFLOAD=1 - export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 - export __GLX_VENDOR_LIBRARY_NAME=nvidia - export __VK_LAYER_NV_optimus=NVIDIA_only - exec "$@" - ''; -in { imports = [ # Include the results of the hardware scan. @@ -90,7 +81,6 @@ in wget ripgrep git - nvidia-offload pinentry-qt ]; diff --git a/hosts/dregil/hardware-configuration.nix b/hosts/dregil/hardware-configuration.nix index 6f9e45d..19426b9 100644 --- a/hosts/dregil/hardware-configuration.nix +++ b/hosts/dregil/hardware-configuration.nix @@ -10,7 +10,10 @@ }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ../../modules/wm/nvidia.nix + ]; boot.initrd.availableKernelModules = [ "xhci_pci" @@ -92,22 +95,22 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.nvidia = { - nvidiaSettings = true; - nvidiaPersistenced = true; - open = true; + # hardware.nvidia = { + # nvidiaSettings = true; + # nvidiaPersistenced = true; + # open = true; - # modesetting.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; - # prime = { - # offload.enable = true; - # - # intelBusId = "PCI:1:0:0"; - # nvidiaBusId = "PCI:1:0:0"; - # intelBusId = "0@0:2:0"; - # nvidiaBusId = "1@1:0:0"; - # }; - }; + # # modesetting.enable = true; + # # package = config.boot.kernelPackages.nvidiaPackages.beta; + # # prime = { + # # offload.enable = true; + # # + # # intelBusId = "PCI:1:0:0"; + # # nvidiaBusId = "PCI:1:0:0"; + # # intelBusId = "0@0:2:0"; + # # nvidiaBusId = "1@1:0:0"; + # # }; + # }; hardware.graphics = { enable = true; diff --git a/modules/wm/nvidia.nix b/modules/wm/nvidia.nix new file mode 100644 index 0000000..6bedb23 --- /dev/null +++ b/modules/wm/nvidia.nix @@ -0,0 +1,25 @@ +{ + config, + ... +}: + +{ + hardware.graphics.enable = true; + + services.xserver.videoDrivers = [ "nvidia" ]; + + hardware.nvidia = { + modesetting.enable = true; + nvidiaPersistenced = true; + powerManagement.enable = true; + powerManagement.finegrained = false; + open = false; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.latest; + }; + + boot.kernelParams = [ + "nvidia-drm.fbdev=1" + "nvidia-drm.modeset=1" + ]; +} diff --git a/modules/wm/x.nix b/modules/wm/x.nix index 8b68d3c..bfcfb03 100644 --- a/modules/wm/x.nix +++ b/modules/wm/x.nix @@ -6,6 +6,7 @@ }: { + imports = [ ./nvidia.nix ]; # Enable the X11 windowing system. services = { dbus = { From 5b64992d4d70c3d715147b603f799a35ff2d083f Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Thu, 26 Feb 2026 23:07:34 +0100 Subject: [PATCH 10/11] emacs: Replace standard emacs package by emacs-pgtk variant This resolves issues related to wayland, since emacs created tiny new windows everytime it wanted to perform a completion operation. --- home/alex/programs/emacs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/alex/programs/emacs/default.nix b/home/alex/programs/emacs/default.nix index fe0b524..dc10f31 100644 --- a/home/alex/programs/emacs/default.nix +++ b/home/alex/programs/emacs/default.nix @@ -15,6 +15,7 @@ in programs.emacs = { enable = true; + package = pkgs.emacs-pgtk; extraPackages = epkgs: with epkgs; [ vterm From 97c84634ad7a2c9ba0840db019a8d068bd0887b4 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Thu, 26 Feb 2026 23:07:34 +0100 Subject: [PATCH 11/11] emacs: Install jj-mode package --- home/alex/programs/emacs/doom/config.el | 4 ++++ home/alex/programs/emacs/doom/packages.el | 1 + 2 files changed, 5 insertions(+) diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el index d1bad75..58c0a94 100644 --- a/home/alex/programs/emacs/doom/config.el +++ b/home/alex/programs/emacs/doom/config.el @@ -163,6 +163,10 @@ ) ) +(use-package! jj-mode + :config + (evil-make-overriding-map jj-mode-map 'normal)) + (when ak/at-work? (after! forge (add-to-list 'forge-alist '("gitlab.atlas.de" "gitlab.atlas.de/api/v4" "gitlab.atlas.de" forge-gitlab-repository))) diff --git a/home/alex/programs/emacs/doom/packages.el b/home/alex/programs/emacs/doom/packages.el index 3589576..767f041 100644 --- a/home/alex/programs/emacs/doom/packages.el +++ b/home/alex/programs/emacs/doom/packages.el @@ -91,3 +91,4 @@ (package! modus-themes) (package! consult-denote) (package! casual-suite) +(package! jj-mode :recipe (:host github :repo "bolivier/jj-mode.el"))