1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00

Compare commits

...

6 Commits

Author SHA1 Message Date
f6646a275f
[24.05] Plasma 6
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
2024-06-10 12:27:40 +02:00
8937e48295
[24.05] Upgrade to UUkari
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
2024-06-10 11:52:56 +02:00
e329ee9e5e
flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/e3a8a67ce663448e33f01c8dd94c4d7218b634a6' (2024-06-10)
  → 'github:nix-community/emacs-overlay/e618bb81b46a182758c649c734294f55d73e05bc' (2024-06-10)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c' (2024-06-08)
  → 'github:NixOS/nixpkgs/9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b' (2024-06-06)
2024-06-10 11:32:37 +02:00
39ce5112c7
[nextcoud] Upgrade to 29
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
2024-06-10 11:30:03 +02:00
c4391a26f9
[emacs,org-mode] Removed broken package for now
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
2024-06-10 11:19:30 +02:00
fcfac1756e
flake.lock: Update
Flake lock file updates:

• Updated input 'comma':
    'github:nix-community/comma/efe30c16fcb9780ef8f8a4e5aa76977c89c6827b' (2024-04-18)
  → 'github:nix-community/comma/062daa39f1ab8a923f5df03745dd2546a5fae41c' (2024-05-26)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/cb16f015f4dd579cf5bd00d09e6a7ada6e72f5ab' (2024-04-22)
  → 'github:nix-community/emacs-overlay/e3a8a67ce663448e33f01c8dd94c4d7218b634a6' (2024-06-10)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/a5e4bbcb4780c63c79c87d29ea409abf097de3f7' (2024-04-21)
  → 'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c' (2024-06-08)
• Updated input 'flake-utils-plus':
    'github:gytis-ivaskevicius/flake-utils-plus/bfc53579db89de750b25b0c5e7af299e0c06d7d3' (2023-10-03)
  → 'github:gytis-ivaskevicius/flake-utils-plus/3542fe9126dc492e53ddd252bb0260fe035f2c0f' (2024-05-12)
• Updated input 'glpi-inventory':
    'github:mmarx/glpi-inventory/0de51cf35c238b6be5a26a1d697ba80c3343ae0d' (2024-04-11)
  → 'github:mmarx/glpi-inventory/6527876cae41a4b0b1b062a2ccd74f704383b926' (2024-05-31)
• Updated input 'home-manager':
    'github:nix-community/home-manager/d6bb9f934f2870e5cbc5b94c79e9db22246141ff' (2024-04-06)
  → 'github:nix-community/home-manager/095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a' (2024-06-04)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/5d48925b815fd202781bfae8fb6f45c07112fdb2' (2024-04-19)
  → 'github:NixOS/nixos-hardware/58b52b0dd191af70f538c707c66c682331cfdffc' (2024-06-10)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a5e4bbcb4780c63c79c87d29ea409abf097de3f7' (2024-04-21)
  → 'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c' (2024-06-08)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19)
  → 'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e' (2024-06-07)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4371a1301c4d36cc791069d90ae522613a3a335e' (2024-04-22)
  → 'github:Mic92/sops-nix/f0922ad001829b400f0160ba85b47d252fa3d925' (2024-06-09)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/74574c38577914733b4f7a775dd77d24245081dd' (2024-04-20)
  → 'github:NixOS/nixpkgs/4913a7c3d8b8d00cb9476a6bd730ff57777f740c' (2024-06-08)
2024-06-10 10:30:28 +02:00
9 changed files with 146 additions and 136 deletions

138
flake.lock generated
View File

@ -29,11 +29,11 @@
]
},
"locked": {
"lastModified": 1713398551,
"narHash": "sha256-SsTqMo+sf/sGsFd9SpaARfw18vdi+Kytb8sIcq+4STg=",
"lastModified": 1716686705,
"narHash": "sha256-D5a+JV4AOPTyG+5E2m2XNcWJH0dRwJGgd4wDd0R/mi8=",
"owner": "nix-community",
"repo": "comma",
"rev": "efe30c16fcb9780ef8f8a4e5aa76977c89c6827b",
"rev": "062daa39f1ab8a923f5df03745dd2546a5fae41c",
"type": "github"
},
"original": {
@ -73,11 +73,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1713773852,
"narHash": "sha256-h7UBxoL2GBCqD4+HFj+QiSjLNafnsVTe86SBubDuTrs=",
"lastModified": 1718010608,
"narHash": "sha256-UdQqYGtvFfovH1PfsNWIuzEXxqpeqILCXIoJIhC3Q9M=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "cb16f015f4dd579cf5bd00d09e6a7ada6e72f5ab",
"rev": "e618bb81b46a182758c649c734294f55d73e05bc",
"type": "github"
},
"original": {
@ -121,11 +121,11 @@
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@ -157,11 +157,11 @@
"flake-utils": "flake-utils_2"
},
"locked": {
"lastModified": 1696331477,
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=",
"lastModified": 1715533576,
"narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
},
"original": {
@ -198,11 +198,11 @@
]
},
"locked": {
"lastModified": 1712854492,
"narHash": "sha256-V2rFA2EneaiQzNpGnxjmOnnHEvHCtJahVRmuEtWMKGg=",
"lastModified": 1717186853,
"narHash": "sha256-KY5FiDorM7/2bMyWPEzpkHBEoAJxBndF8Y713SUYc4k=",
"owner": "mmarx",
"repo": "glpi-inventory",
"rev": "0de51cf35c238b6be5a26a1d697ba80c3343ae0d",
"rev": "6527876cae41a4b0b1b062a2ccd74f704383b926",
"type": "github"
},
"original": {
@ -218,16 +218,16 @@
]
},
"locked": {
"lastModified": 1712386041,
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
"lastModified": 1717527182,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
"rev": "845a5c4c073f74105022533907703441e0464bc3",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@ -291,11 +291,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1713521961,
"narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
"lastModified": 1717995329,
"narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
"rev": "58b52b0dd191af70f538c707c66c682331cfdffc",
"type": "github"
},
"original": {
@ -321,33 +321,18 @@
"type": "github"
}
},
"nixpkgs-22_11": {
"nixpkgs-24_05": {
"locked": {
"lastModified": 1669558522,
"narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
"lastModified": 1717144377,
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.11",
"type": "indirect"
}
},
"nixpkgs-23_05": {
"locked": {
"lastModified": 1684782344,
"narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.05",
"ref": "nixos-24.05",
"type": "indirect"
}
},
@ -369,11 +354,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"lastModified": 1717880976,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
"type": "github"
},
"original": {
@ -385,11 +370,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1713638189,
"narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
"lastModified": 1717880976,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "74574c38577914733b4f7a775dd77d24245081dd",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
"type": "github"
},
"original": {
@ -401,11 +386,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"type": "github"
},
"original": {
@ -417,16 +402,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"lastModified": 1717696253,
"narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
"rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@ -453,21 +438,20 @@
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-22_11": "nixpkgs-22_11",
"nixpkgs-23_05": "nixpkgs-23_05",
"nixpkgs-24_05": "nixpkgs-24_05",
"utils": "utils"
},
"locked": {
"lastModified": 1687462267,
"narHash": "sha256-rNSputjn/0HEHHnsKfQ8mQVEPVchcBw7DsbND7Wg8dk=",
"lastModified": 1717834029,
"narHash": "sha256-woG0M/WIrYDQeYd+aXRvGGMyojLmXND04Pi9XqE7ZxU=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "24128c3052090311688b09a400aa408ba61c6ee5",
"rev": "62afb98ef6385bcb745d7b189ef4efdce2044030",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
"ref": "nixos-23.05",
"ref": "nixos-24.05",
"repo": "nixos-mailserver",
"type": "gitlab"
}
@ -480,11 +464,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1713775152,
"narHash": "sha256-xyP8h9jLQ0AmyPy40sIwL7/D03oVpXG9YHoYJ4ecYWA=",
"lastModified": 1717902109,
"narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4371a1301c4d36cc791069d90ae522613a3a335e",
"rev": "f0922ad001829b400f0160ba85b47d252fa3d925",
"type": "github"
},
"original": {
@ -524,13 +508,31 @@
"type": "github"
}
},
"utils": {
"systems_3": {
"locked": {
"lastModified": 1605370193,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5021eac20303a61fafe17224c087f5519baed54d",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {

View File

@ -2,7 +2,7 @@
description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
#nix = {
@ -14,7 +14,7 @@
nixos-hardware = {url = "github:NixOS/nixos-hardware/master";};
home-manager = {
url = "github:nix-community/home-manager/release-23.11";
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -26,7 +26,7 @@
};
simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};

View File

@ -55,7 +55,7 @@ with lib; {
htop
neofetch
nix-prefetch-github
nixfmt
nixfmt-rfc-style
nixpkgs-fmt
procs
ripgrep

View File

@ -73,8 +73,10 @@ with lib; {
${pkgs.autorandr}/bin/autorandr -c
'';
};
xkb = {
options = "eurosign:e";
layout = "us";
xkbOptions = "eurosign:e";
};
};
gnome.gnome-keyring.enable = true;
udisks2.enable = true;

View File

@ -16,13 +16,16 @@ with lib; {
pulse.enable = true;
};
services.xserver = {
services = {
xserver = {
enable = true;
};
desktopManager.plasma6.enable = true;
displayManager = {
sddm.wayland.enable = true;
defaultSession = "plasmawayland";
defaultSession = "plasma";
};
desktopManager.plasma5.enable = true;
};
services.gnome.gnome-keyring.enable = true;

View File

@ -12,7 +12,7 @@ with lib; {
elss.server.sql.enable = mkDefault true;
services.nextcloud = {
enable = true;
package = pkgs.nextcloud28;
package = pkgs.nextcloud29;
hostName = "cloudstore.ellmauthaler.net";
https = true;
config = {
@ -22,7 +22,9 @@ with lib; {
adminuser = "storemin";
adminpassFile = config.sops.secrets.storemin.path;
dbhost = "/run/postgresql";
defaultPhoneRegion = "DE";
};
settings = {
default_phone_region = "DE";
};
};

View File

@ -21,12 +21,12 @@ with lib; {
enable = true;
enableContribAndExtras = true;
};
};
displayManager.defaultSession = "none+xmonad";
libinput = {
enable = true;
touchpad = {disableWhileTyping = true;};
};
};
upower.enable = true;
pipewire = {

View File

@ -137,58 +137,60 @@
;; org-roam-server-network-label-truncate-length 60
;; org-roam-server-network-label-wrap-length 20)
(use-package org-bullets
:defer t
:commands org-bullets-mode
:hook (org-mode . org-bullets-mode))
(use-package org-roam
:custom
(org-roam-directory (file-truename "~/org-notes"))
:bind
(("C-c n l" . org-roam-buffer-toggle)
("C-c n f" . org-roam-node-find)
("C-c n g" . org-roam-graph)
("C-c n i" . org-roam-node-insert)
("C-c n c" . org-roam-capture)
("C-c n j" . org-roam-dailies-capture-today)
("C-c n d" . org-roam-dailies-capture-date))
:init
(setq org-roam-v2-ack t)
(require 'org-roam-protocol)
:config
(org-roam-db-autosync-mode))
(use-package org-roam-ui
:after org-roam
:custom
(org-roam-ui-sync-theme t)
(org-roam-ui-follow)
(org-roam-ui-update-on-save t)
(org-roam-ui-open-on-start t))
(define-key org-roam-mode-map [mouse-1] #'org-roam-visit-thing)
;; new config for org-roam, deactivated for now
;; (use-package org-bullets
;; :defer t
;; :commands org-bullets-mode
;; :hook (org-mode . org-bullets-mode))
;; (use-package org-roam
;; :custom
;; (org-roam-directory (file-truename "~/org-notes"))
;; :bind
;; (("C-c n l" . org-roam-buffer-toggle)
;; ("C-c n f" . org-roam-node-find)
;; ("C-c n g" . org-roam-graph)
;; ("C-c n i" . org-roam-node-insert)
;; ("C-c n c" . org-roam-capture)
;; ("C-c n j" . org-roam-dailies-capture-today)
;; ("C-c n d" . org-roam-dailies-capture-date))
;; tally-list
(defun coffee-tally-add (n)
(interactive "nN: ")
(org-entry-put
nil "COFFEETALLY"
(format "%s" (+ n (string-to-number
(or (org-entry-get nil "COFFEETALLY") "0"))))))
;; :init
;; (setq org-roam-v2-ack t)
;; (require 'org-roam-protocol)
;; :config
;; (org-roam-db-autosync-mode))
;; (use-package org-roam-ui
;; :after org-roam
;; :custom
;; (org-roam-ui-sync-theme t)
;; (org-roam-ui-follow)
;; (org-roam-ui-update-on-save t)
;; (org-roam-ui-open-on-start t))
;; (define-key org-roam-mode-map [mouse-1] #'org-roam-visit-thing)
(cl-defmethod org-roam-node-directories ((node org-roam-node))
(if-let ((dirs (file-name-directory (file-relative-name (org-roam-node-file node) org-roam-directory))))
(format "(%s)" (car (f-split dirs)))
""))
;; ;; tally-list
;; (defun coffee-tally-add (n)
;; (interactive "nN: ")
;; (org-entry-put
;; nil "COFFEETALLY"
;; (format "%s" (+ n (string-to-number
;; (or (org-entry-get nil "COFFEETALLY") "0"))))))
(cl-defmethod org-roam-node-backlinkscount ((node org-roam-node))
(let* ((count (caar (org-roam-db-query
[:select (funcall count source)
:from links
:where (= dest $s1)
:and (= type "id")]
(org-roam-node-id node)))))
(format "[%d]" count)))
(setq org-roam-node-display-template "${directories:10} ${tags:10} ${title:100} ${backlinkscount:6}")
;; (cl-defmethod org-roam-node-directories ((node org-roam-node))
;; (if-let ((dirs (file-name-directory (file-relative-name (org-roam-node-file node) org-roam-directory))))
;; (format "(%s)" (car (f-split dirs)))
;; ""))
;; (cl-defmethod org-roam-node-backlinkscount ((node org-roam-node))
;; (let* ((count (caar (org-roam-db-query
;; [:select (funcall count source)
;; :from links
;; :where (= dest $s1)
;; :and (= type "id")]
;; (org-roam-node-id node)))))
;; (format "[%d]" count)))
;; (setq org-roam-node-display-template "${directories:10} ${tags:10} ${title:100} ${backlinkscount:6}")
@ -218,8 +220,8 @@
'(show-paren-mode t)
'(show-paren-style 'mixed)
'(blink-matching-paren 'infoline)
'(org-agenda-files '("~/org-notes/daily/" "~/org-notes/"))
'(org-angeda-files '("~/org-notes/daily/" "~/org-notes/"))
;; '(org-agenda-files '("~/org-notes/daily/" "~/org-notes/"))
;; '(org-angeda-files '("~/org-notes/daily/" "~/org-notes/"))
'(size-indication-mode)
'(line-number-mode t)
'(epg-gpg-program (executable-find "gpg2"))

View File

@ -53,7 +53,6 @@
eza = {
enable = true;
enableAliases = false;
};
tmux = {