From 2bdb43c14a476a067412ce99f64bd5c8b802ac20 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Mon, 30 Oct 2023 19:00:58 +0100 Subject: [PATCH] WIP #2 --- flake.lock | 36 ++++++++++++++++----------------- flake.nix | 1 - home-mods/desktop/default.nix | 2 +- os-mods/network/default.nix | 1 + systems/nixos-pulse/default.nix | 1 + users/default.nix | 4 ++-- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 7d8ec8d..044c33a 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1698430543, - "narHash": "sha256-8i/cKFQ1M6d5NPRsWD79KDQpbLl8/wI6ZUMUo58AMCY=", + "lastModified": 1698661082, + "narHash": "sha256-ju60wCA5A+JpiGZV056kroBNvvyC9vNCyYb/eIwZaYo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7e6cc3c97847651f7c3035274430daaeed94e153", + "rev": "9716242daed6b500616e0d2378a06f5eba53ca2b", "type": "github" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1697946153, - "narHash": "sha256-7k7qIwWLaYPgQ4fxmEdew3yCffhK6rM4I4Jo3X/79DA=", + "lastModified": 1698550809, + "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5a2006282caaf32663cdcd582c5b18809c7d7d8d", + "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1686849676, - "narHash": "sha256-+z9t7BLugZO1WhyYEq6FI38TMh2EwfgfAv3RDFSjwtc=", + "lastModified": 1698486730, + "narHash": "sha256-MP4bGb3JXkmmECssp0B7i0OipUXN7HurAqvfP830NLg=", "owner": "Mic92", "repo": "nix-ld", - "rev": "3abd605e56b5b34ec630bb10ba85f98c93cc05b2", + "rev": "846421112563fb6cf0334d9f124449aada964088", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", + "lastModified": 1698434055, + "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", + "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", "type": "github" }, "original": { @@ -264,11 +264,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1698336494, - "narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=", + "lastModified": 1698553279, + "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "808c0d8c53c7ae50f82aca8e7df263225cf235bf", + "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nur": { "locked": { - "lastModified": 1698430738, - "narHash": "sha256-gQ+UdpX8+wPKKdkQGv+NewNKXLfyQM6TMILBQSivuKU=", + "lastModified": 1698682568, + "narHash": "sha256-tUivLGXEhY0d8+4oXn06S5E5xnufkGmubQuDqPoGwkw=", "owner": "nix-community", "repo": "NUR", - "rev": "c7cb3e6301bf76ef39fc60da3cc92544fb9165c4", + "rev": "bf223184b4e92b6c0c1d0a292a525606dcfe7f01", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 926d170..b10ad2a 100644 --- a/flake.nix +++ b/flake.nix @@ -153,7 +153,6 @@ _module = { inherit args; }; xsession.enable = true; } - ] ++ hmModules; }; diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 95add2c..0612b04 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -15,7 +15,7 @@ in file.".background".source = wallpaperPath; packages = with pkgs.unstable-pkgs; [ - bucklespring-libinput # model m sounds :D + airshipper bitwarden brave cavalier diff --git a/os-mods/network/default.nix b/os-mods/network/default.nix index 907ea92..7db1f38 100644 --- a/os-mods/network/default.nix +++ b/os-mods/network/default.nix @@ -7,6 +7,7 @@ networking.nameservers = [ "23.88.68.113#dns.vlt81.de" "2a01:4f8:272:5917::baad:c0de#dns.vlt81.de" + "100.64.0.8#dns.vlt81.de" ]; services = { diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix index 423a02a..29bf802 100644 --- a/systems/nixos-pulse/default.nix +++ b/systems/nixos-pulse/default.nix @@ -101,6 +101,7 @@ powerManagement.powertop.enable = true; hardware = { + i2c.enable = true; tuxedo-control-center = { enable = true; package = inputs.tuxedo-nixos.packages.${system}.default; diff --git a/users/default.nix b/users/default.nix index 183da85..e287dea 100644 --- a/users/default.nix +++ b/users/default.nix @@ -8,7 +8,7 @@ users.users.tester = { isNormalUser = true; description = "Testa Test"; - extraGroups = [ "audio" "docker" "networkmanager" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; + extraGroups = [ "audio" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; shell = pkgs.fish; home = "/home/tester"; hashedPassword = "$6$YJT50/Za3FSFQuNT$0orD1URwoURoRKO9sIAsUiIHxOtEOjmPXn5Mp7vAmIYlgVmI629qS7YPUInmztEtEorRpkSMbV3.fCy9NQhKX."; @@ -16,7 +16,7 @@ users.users.tristand = { isNormalUser = true; description = "Tristan Druyen"; - extraGroups = [ "audio" "docker" "networkmanager" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; + extraGroups = [ "audio" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; shell = pkgs.fish; home = "/home/tristand"; hashedPassword = "$6$Wj.XY8JgH5EWuog4$HnbtPJXDEqKXFrzkPVEjih3PytcpBCrkfL7TAwkXd0IFced7kGMlZNliNsAqQ3XqfyUzAYiiKTIqoPVJEk.s..";