jakalx/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: jakalx:main
Branches Tags
jakalx:main
jakalx:develop
jakalx:feature/hledger-web-module
..
compare: jakalx:develop
Branches Tags
jakalx:main
jakalx:develop
jakalx:feature/hledger-web-module

2 commits
main ... develop

Author SHA1 Message Date
Alexander Kobjolke
e4af2bb9ad chore: Update inputs 2025-12-10 13:08:02 +01:00
Alexander Kobjolke
6ad1d2b1bb chore: Fix deprecation warnings 2025-12-06 12:23:41 +01:00
12 changed files with 70 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.lock generated
View file

@ -68,11 +68,11 @@
]
},
"locked": {
"lastModified": 1768923567,
"narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=",
"lastModified": 1765326679,
"narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=",
"owner": "nix-community",
"repo": "disko",
"rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28",
"rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e",
"type": "github"
},
"original": {
@ -105,15 +105,15 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
@ -249,11 +249,11 @@
]
},
"locked": {
"lastModified": 1769187349,
"narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=",
"lastModified": 1765337252,
"narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb",
"rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921",
"type": "github"
},
"original": {
@ -334,11 +334,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1769018530,
"narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
"lastModified": 1765186076,
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
"type": "github"
},
"original": {
@ -475,11 +475,11 @@
]
},
"locked": {
"lastModified": 1769069492,
"narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
"lastModified": 1765016596,
"narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
"rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
"type": "github"
},
"original": {
@ -526,11 +526,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1766321686,
"narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=",
"lastModified": 1764763336,
"narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3",
"rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e",
"type": "gitlab"
},
"original": {

6
flake.nix
View file

@ -57,9 +57,9 @@
pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.;
tools.fourmolu = pkgs.haskellPackages.fourmolu;
tools.nixfmt = pkgs.nixfmt;
tools.nixfmt = pkgs.nixfmt-rfc-style;
hooks = {
nixfmt.enable = true;
nixfmt-rfc-style.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
nixfmt-rfc-style
nil
];
};

2
home/alex/cli.nix
View file

@ -44,7 +44,7 @@ in
# nix tools
nix-index
nixfmt
nixfmt-rfc-style
# misc
fd # better find
file # info about files

1
home/alex/programs/emacs/default.nix
View file

@ -15,7 +15,6 @@ in
programs.emacs = {
enable = true;
package = pkgs.emacs-pgtk;
extraPackages =
epkgs: with epkgs; [
vterm

29
home/alex/programs/emacs/doom/config.el
View file

@ -107,8 +107,7 @@
org-agenda-include-diary t
org-agenda-sticky t
org-todo-keywords '(
;; (sequence "TODO" "NEXT" "WAIT" "|" "DONE" "CNCL")
(sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
(sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)")
(sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)")
)
org-tag-alist '(
@ -163,10 +162,6 @@
)
)
(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)))
@ -247,32 +242,18 @@
:after org
:demand t
:init
(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@)")
))
(setq! org-gtd-update-ack "3.0.0")
: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 1)
(setq org-gtd-organize-hooks nil)
(org-edna-mode)
(map! :leader
:desc "Capture" "X" #'org-gtd-capture
(:prefix-map ("d" . "GTD")

1
home/alex/programs/emacs/doom/packages.el
View file

@ -91,4 +91,3 @@
(package! modus-themes)
(package! consult-denote)
(package! casual-suite)
(package! jj-mode :recipe (:host github :repo "bolivier/jj-mode.el"))

1
home/alex/programs/shell/default.nix
View file

@ -17,7 +17,6 @@
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
dotDir = "${config.xdg.configHome}/zsh";
initContent = ''
[ $TERM = "dumb" ] && unsetopt zle && PS1='$ '

13
hosts/dregil/configuration.nix
View file

@ -9,6 +9,15 @@
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.
@ -38,6 +47,9 @@
'';
i18n = {
extraLocaleSettings = {
LC_TIME = "sv_SE.UTF-8"; # iso foramt
};
extraLocales = "all";
defaultLocale = "en_US.UTF-8";
};
@ -81,6 +93,7 @@
wget
ripgrep
git
nvidia-offload
pinentry-qt
];

33
hosts/dregil/hardware-configuration.nix
View file

@ -10,10 +10,7 @@
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
../../modules/wm/nvidia.nix
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [
"xhci_pci"
@ -95,22 +92,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;

15
hosts/thrall/default.nix
View file

@ -211,14 +211,11 @@ in
};
services.nginx.virtualHosts = {
# main site
"thrall.failco.de" = {
"failco.de" = {
forceSSL = true;
enableACME = true;
root = "/srv/www/failco.de";
serverAliases = [
"failco.de"
"www.failco.de"
];
serverAliases = [ "www.failco.de" ];
extraConfig = ''
add_header X-Frame-Options 'SAMEORIGIN';
'';
@ -325,17 +322,19 @@ 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;
};
};
@ -467,7 +466,7 @@ in
"charlie@kobjolke.de" = "alex@kobjolke.de";
};
x509.useACMEHost = config.mailserver.fqdn;
certificateScheme = "acme-nginx";
enableImapSsl = true;
enableManageSieve = true;

25
modules/wm/nvidia.nix
View file

@ -1,25 +0,0 @@
{
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"
];
}

14
modules/wm/x.nix
View file

@ -6,7 +6,6 @@
}:
{
imports = [ ./nvidia.nix ];
# Enable the X11 windowing system.
services = {
dbus = {
@ -23,16 +22,13 @@
videoDrivers = [ "nvidia" ]; # "modesetting" ];
# displayManager.lightdm = {
# enable = true;
# greeters.slick.enable = true;
# };
displayManager.lightdm = {
enable = true;
greeters.slick.enable = true;
};
};
displayManager.cosmic-greeter.enable = true;
desktopManager.cosmic.enable = true;
# desktopManager.gnome.enable = true;
desktopManager.gnome.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
libinput = {