Merge branch 'main' of git.datarift.nl:erwin/nixos-config

This commit is contained in:
Erwin Boskma 2023-01-13 10:31:40 +01:00
commit 38fed37c74
Signed by: erwin
SSH key fingerprint: SHA256:CyeNoWXd3kjX2Nwu6pDxxdS7OqmPVOy0NavA/KU/ntU
4 changed files with 34 additions and 48 deletions

View file

@ -24,26 +24,6 @@
"type": "github" "type": "github"
} }
}, },
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1672841174,
"narHash": "sha256-E4t0BnQdbvfbpd9uJnQen5Gsu3LreHoZff7c9Z0wr+Y=",
"owner": "nix-community",
"repo": "disko",
"rev": "dd025155fb0f5d36afd6719e358e7cf99a47644e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -54,11 +34,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673256023, "lastModified": 1673494149,
"narHash": "sha256-bU/SNZYv1q3QfuaR9Hyh0hhOxxP3Y3p+/D5hJEpMDJY=", "narHash": "sha256-TitnT29bxDzckQfePsHMARtPS2TLHbLlf4FTgy9JdXw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "070389cdd38008ad49d8097e18817db7cd6ddc2b", "rev": "9066f92a2f6334de8977240e221278aba8037d7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +156,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1673265621, "lastModified": 1673343300,
"narHash": "sha256-4F5fbx2HvIWqYhEFfiI4WOMs79Ah9jH4PohI66vhOBY=", "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "69806e937881c75269e058daecf49d9c39bd034e", "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +179,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1673271358, "lastModified": 1673460918,
"narHash": "sha256-7aUBr6Ga/6mcrdp53X43CRnO7Dx1p0GFNB4UFlVHIoE=", "narHash": "sha256-vL9AhYPCMP1/8va2pdmLn0vmCdsxbgYSSQHm4kaQjHs=",
"owner": "Hyprwm", "owner": "Hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "ff118834829dd0db37e3622480756776b368bd4a", "rev": "11afb660102198abb1e74fffdffd00f8c1a11cd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,11 +261,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1672644464, "lastModified": 1673440569,
"narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=", "narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26", "rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +276,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673134516, "lastModified": 1673315479,
"narHash": "sha256-mAZQKqkNQbBmJnmUU0blOfkKlgMSSVyPHdeWeuKad8U=", "narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f6f44561884c3470e2b783683d5dbac42dfc833b", "rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +378,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1673240110, "lastModified": 1673281605,
"narHash": "sha256-Em7Eg/qv1QBx1XpIldJz9E9aQohSBtwwxffYS02FPdQ=", "narHash": "sha256-v6U0G3pJe0YaIuD1Ijhz86EhTgbXZ4f/2By8sLqFk4c=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "f3b402838c49b0989c07494f6f5db77dfce0ce97", "rev": "f8992fb404c7e79638192a10905b7ea985818050",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,7 +394,6 @@
"root": { "root": {
"inputs": { "inputs": {
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"ha-now-playing": "ha-now-playing", "ha-now-playing": "ha-now-playing",
@ -442,11 +421,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673231106, "lastModified": 1673490397,
"narHash": "sha256-Tbw4N/TL+nHmxF8RBoOJbl/6DRRzado/9/ttPEzkGr8=", "narHash": "sha256-VCSmIYJy/ZzTvEGjdfITmTYfybXBgZpMjyjDndbou+8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3488cec01351c2f1086b02a3a61808be7a25103e", "rev": "0833f4d063a2bb75aa31680f703ba594a384ffe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +442,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1673147300, "lastModified": 1673481602,
"narHash": "sha256-gR9OEfTzWfL6vG0qkbn1TlBAOlg4LuW8xK/u0V41Ihc=", "narHash": "sha256-P80X38fOM2MtoYdgkyuksGOQPDhIhNJW2W2jMeMIZzE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2253120d2a6147e57bafb5c689e086221df8032f", "rev": "32187b33ac6ec9b628dcd08dd941a715e6241dda",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -249,7 +249,7 @@ in
"module/headset-battery" = { "module/headset-battery" = {
type = "custom/script"; type = "custom/script";
exec = "${headset-battery}"; exec = "${headset-battery}";
interval = 5; interval = 1;
format.prefix = " "; format.prefix = " ";
format.padding = 2; format.padding = 2;

View file

@ -25,7 +25,7 @@ in
users.users.erwin = { users.users.erwin = {
isNormalUser = true; isNormalUser = true;
home = "/home/erwin"; home = "/home/erwin";
extraGroups = [ "wheel" "adm" "audio" "video" "dialout" ]; extraGroups = [ "wheel" "adm" "audio" "video" "dialout" "input" ];
shell = pkgs.fish; shell = pkgs.fish;
openssh.authorizedKeys.keyFiles = [ openssh.authorizedKeys.keyFiles = [
(pkgs.fetchurl { (pkgs.fetchurl {

View file

@ -96,7 +96,6 @@ in
ffmpeg_5-full ffmpeg_5-full
git git
gnome.nautilus gnome.nautilus
headsetcontrol
icemon icemon
imagemagick imagemagick
iotop iotop
@ -201,6 +200,14 @@ in
services.teamviewer.enable = true; services.teamviewer.enable = true;
environment.systemPackages = with pkgs; [
headsetcontrol
];
services.udev.packages = with pkgs; [
headsetcontrol
];
services.xserver = { services.xserver = {
layout = "us,us"; layout = "us,us";
xkbVariant = "colemak,"; xkbVariant = "colemak,";