ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:f6646a275ff96a3da328b3acc0f9ab0460adce71
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:cfd65150434196e886be768306b6dee45493a3b9
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

No commits in common. "f6646a275ff96a3da328b3acc0f9ab0460adce71" and "cfd65150434196e886be768306b6dee45493a3b9" have entirely different histories.
f6646a275f ... cfd6515043

9 changed files with 135 additions and 145 deletions
Show Stats Expand all files Collapse all files

136
flake.lock generated
View File

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

6
flake.nix
View File

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

2
modules/base.nix
View File

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

6
modules/graphical.nix
View File

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

11
modules/plasma.nix
View File

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

6
modules/server/nextcloud.nix
View File

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

10
modules/xmonad.nix
View File

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

102
packages/emacs/default.el
View File

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

1
users/ellmau/zsh.nix
View File

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