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

[24.05] Upgrade to UUkari

Browse Source 
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
This commit is contained in:
Stefan Ellmauthaler 2024-06-10 11:52:56 +02:00
parent e329ee9e5e
commit 8937e48295
Failed to extract signature
8 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
flake.lock generated
View File

@ -121,11 +121,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668681692, "lastModified": 1696426674,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -218,16 +218,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717476296, "lastModified": 1717527182,
"narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", "rev": "845a5c4c073f74105022533907703441e0464bc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -321,33 +321,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-22_11": { "nixpkgs-24_05": {
"locked": { "locked": {
"lastModified": 1669558522, "lastModified": 1717144377,
"narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.11", "ref": "nixos-24.05",
"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"
} }
}, },
@ -453,21 +438,20 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-24_05": "nixpkgs-24_05",
"nixpkgs-23_05": "nixpkgs-23_05",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1687462267, "lastModified": 1717834029,
"narHash": "sha256-rNSputjn/0HEHHnsKfQ8mQVEPVchcBw7DsbND7Wg8dk=", "narHash": "sha256-woG0M/WIrYDQeYd+aXRvGGMyojLmXND04Pi9XqE7ZxU=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "24128c3052090311688b09a400aa408ba61c6ee5", "rev": "62afb98ef6385bcb745d7b189ef4efdce2044030",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-23.05", "ref": "nixos-24.05",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }
@ -524,13 +508,31 @@
"type": "github" "type": "github"
} }
}, },
"utils": { "systems_3": {
"locked": { "locked": {
"lastModified": 1605370193, "lastModified": 1681028828,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", "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", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5021eac20303a61fafe17224c087f5519baed54d", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"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-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.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-24.05";
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-23.05"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.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 nixfmt-rfc-style
nixpkgs-fmt nixpkgs-fmt
procs procs
ripgrep ripgrep

4
modules/graphical.nix
View File

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

6
modules/plasma.nix
View File

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

4
modules/server/nextcloud.nix
View File

@ -22,7 +22,9 @@ 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";
}; };
}; };

2
modules/xmonad.nix
View File

@ -21,12 +21,12 @@ 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;
pipewire = { pipewire = {

1
users/ellmau/zsh.nix
View File

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