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:bd92e8b582221d0e58faa1c5c814952501468185
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:d9b6ce3094d62656e3bdbbd6804f17bf59c44baf
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. "bd92e8b582221d0e58faa1c5c814952501468185" and "d9b6ce3094d62656e3bdbbd6804f17bf59c44baf" have entirely different histories.
bd92e8b582 ... d9b6ce3094

6 changed files with 40 additions and 39 deletions
Show Stats Expand all files Collapse all files

58
flake.lock generated
View File

@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701892659, "lastModified": 1698440846,
"narHash": "sha256-vKy6Fwfb0FJeLJgmZ6DazyxrP85Fa2k4z3wWA6V2qZg=", "narHash": "sha256-GKvNrjbuuHoahfGK9V2UMtT6qf91SWLdXrrTITBmR6k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "comma", "repo": "comma",
"rev": "e37c16b39647b6805dded160c8b3c227147f2b36", "rev": "5ecd5024b4e490a0a69628c5ae96506f141551c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1702399955, "lastModified": 1701766395,
"narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=", "narHash": "sha256-lC8XOwVPBrEPZB4ssqaiVNm4rWkrYgxHRyaLHnBUxNw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923", "rev": "5bc76d2e18a8592d49e1539e7eb79a95a3f2ce1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,16 +194,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702814678, "lastModified": 1700392168,
"narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=", "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef", "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -267,11 +267,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1702453208, "lastModified": 1701656485,
"narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,11 +345,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1702221085, "lastModified": 1701540982,
"narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=", "narHash": "sha256-5ajSy6ODgGmAbmymRdHnjfVnuVrACjI8wXoGVvrtvww=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af", "rev": "6386d8aafc28b3a7ed03880a57bdc6eb4465491d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -361,11 +361,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1702777222, "lastModified": 1701568804,
"narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", "narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", "rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,11 +377,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1702312524, "lastModified": 1701436327,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c", "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,16 +393,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1702780907, "lastModified": 1701540982,
"narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", "narHash": "sha256-5ajSy6ODgGmAbmymRdHnjfVnuVrACjI8wXoGVvrtvww=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", "rev": "6386d8aafc28b3a7ed03880a57bdc6eb4465491d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -455,11 +455,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1702812162, "lastModified": 1701728052,
"narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=", "narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77", "rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
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-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
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-23.11"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

4
modules/locale.nix
View File

@ -12,8 +12,8 @@ with lib; {
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
fonts = { fonts = {
enableDefaultPackages = true; enableDefaultFonts = true;
packages = with pkgs; [ fonts = with pkgs; [
hasklig hasklig
# corefonts # not free # corefonts # not free
liberation_ttf liberation_ttf

3
modules/server/nextcloud.nix
View File

@ -12,9 +12,10 @@ with lib; {
elss.server.sql.enable = mkDefault true; elss.server.sql.enable = mkDefault true;
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud28; package = pkgs.nextcloud26;
hostName = "cloudstore.ellmauthaler.net"; hostName = "cloudstore.ellmauthaler.net";
https = true; https = true;
enableBrokenCiphersForSSE = false;
config = { config = {
dbtype = "pgsql"; dbtype = "pgsql";
dbuser = "nextcloud"; dbuser = "nextcloud";

2
modules/server/sql.nix
View File

@ -16,7 +16,7 @@ with lib; {
ensureUsers = [ ensureUsers = [
{ {
name = "nextcloud"; name = "nextcloud";
ensureDBOwnership = true; ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
} }
]; ];
authentication = '' authentication = ''

8
users/ellmau/zsh.nix
View File

@ -19,9 +19,9 @@
''; '';
shellAliases = { shellAliases = {
cp = "cp -i"; cp = "cp -i";
ls = "eza --icons --git"; ls = "exa --icons --git";
ll = "eza --long --icons --binary --group"; ll = "exa --long --icons --binary --group";
llg = "eza --long --icons --grid --binary --group"; llg = "exa --long --icons --grid --binary --group";
lal = "ll --all"; lal = "ll --all";
lla = "ll --all"; lla = "ll --all";
emacsc = "emacsclient -n"; emacsc = "emacsclient -n";
@ -51,7 +51,7 @@
config = {theme = "ansi";}; config = {theme = "ansi";};
}; };
eza = { exa = {
enable = true; enable = true;
enableAliases = false; enableAliases = false;
}; };