From 32d3ab71e8c6b4933e0d0c71cf4a588fca9d3086 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 15 Feb 2024 10:28:25 -0600 Subject: [PATCH] many misc things --- flake.lock | 75 +++++++++++++++----- flake.nix | 4 ++ hosts/algiz/default.nix | 1 + hosts/othalan/default.nix | 5 +- modules/desktop/window-managers/hyprland.nix | 2 +- modules/users/default.nix | 1 + 6 files changed, 67 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 6068cfa..df91557 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1707586793, - "narHash": "sha256-Vdf5QGzkZe6UUdVZ80YT78id7Yw5ww9Fku0rEyPAkCg=", + "lastModified": 1708006940, + "narHash": "sha256-jod61azkh2e2kTSM+e0YxXwXbw0fjBROF/wFxt/3CK8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e4bb5fa4af1a6c36aab1c28651b5403dc4952f93", + "rev": "a8dae8f5e198327e5de8508d860234089f31e272", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1707048513, - "narHash": "sha256-gZh1mHkjtOmXrlgWWdl6G27NlKuNuruz1lOnhgmg1Nk=", + "lastModified": 1707653303, + "narHash": "sha256-DSnssBCh1rPPyxGxFawGzWJjfmDB5AL18QHzzDMarqc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "83a014ca34f5cf6ef441b760e12d503856f20b35", + "rev": "48d8001225a9148f1a97ee519ad53d8272cd8c73", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707451808, - "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", + "lastModified": 1707939175, + "narHash": "sha256-D1xan0lgxbmXDyzVqXTiSYHLmAMrMRdD+alKzEO/p3w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "442d407992384ed9c0e6d352de75b69079904e4e", + "rev": "f7e8132daca31b1e3859ac0fb49741754375ac3d", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1707007541, - "narHash": "sha256-fuFppCuZO4wJAfodUkiWhtSxTb+pkBW+lJP2S51jRNU=", + "lastModified": 1707612395, + "narHash": "sha256-iqWiOQY+OwL0Yqdqy1dEWsMMpht+0eSlmtpZ5Rws16Y=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "948ff77600f9fff8c904d1e1ffb87a60773991af", + "rev": "240f2ff0ed2aac2b91efa29ba3d325526824205b", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1707567920, - "narHash": "sha256-svWRgfOUaBsEyUwos8jdicrb93lOeTspkMzWL0sdqkA=", + "lastModified": 1708011365, + "narHash": "sha256-7kKkEQ/+pKtgUqBIxFgfEDcLwTHXvCPs8aFb0h3Km+8=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "08e7225b6fb9aa42be1bef2dff6477a240f1ac2e", + "rev": "4b035077b1e75e8f4d5ff3abb61ad630ec5327c6", "type": "github" }, "original": { @@ -265,13 +265,35 @@ "type": "github" } }, + "pinix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1707852451, + "narHash": "sha256-6FkObpMDcQJ53Wfzs/uWzk9JapQQ72UuJ6DRrMDRbY0=", + "owner": "daylinmorgan", + "repo": "pinix", + "rev": "f148a5dbc84e53dbcc1cb983bb80c65df620616d", + "type": "github" + }, + "original": { + "owner": "daylinmorgan", + "repo": "pinix", + "type": "github" + } + }, "root": { "inputs": { "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": "nixpkgs", - "nixpkgs-wayland": "nixpkgs-wayland" + "nixpkgs-wayland": "nixpkgs-wayland", + "pinix": "pinix" } }, "systems": { @@ -304,6 +326,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -361,11 +398,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1706521509, + "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9806d28..f20b165 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,10 @@ nixpkgs-wayland.inputs.nix-eval-jobs.follows = "nix-eval-jobs"; nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; + + # https://github.com/remi-dupre/pinix/pull/2 + pinix.url = "github:daylinmorgan/pinix"; + pinix.inputs.nixpkgs.follows = "nixpkgs"; }; nixConfig = { diff --git a/hosts/algiz/default.nix b/hosts/algiz/default.nix index c99698c..aafc0ed 100644 --- a/hosts/algiz/default.nix +++ b/hosts/algiz/default.nix @@ -37,6 +37,7 @@ daylin = { extraGroups = ["docker"]; }; + git = { isNormalUser = true; }; diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index 718044a..ab3765b 100644 --- a/hosts/othalan/default.nix +++ b/hosts/othalan/default.nix @@ -7,8 +7,9 @@ nix-ld virtualbox restic + docker ]; - + nixpkgs.overlays = [inputs.pinix.overlays.default]; cli.enable = true; desktop.enable = true; @@ -24,6 +25,7 @@ zk rclone quarto + pinix ]; programs.hyprland.enable = true; @@ -38,6 +40,7 @@ }; users.users.daylin.extraGroups = [ + "docker" "audio" ]; } diff --git a/modules/desktop/window-managers/hyprland.nix b/modules/desktop/window-managers/hyprland.nix index 3e2ad8b..c423f97 100644 --- a/modules/desktop/window-managers/hyprland.nix +++ b/modules/desktop/window-managers/hyprland.nix @@ -12,7 +12,7 @@ name = "lock"; runtimeInputs = with pkgs; [swaylock]; text = '' - swaylock -c 1e1e2e + swaylock -c 1e1e2e ''; }; in { diff --git a/modules/users/default.nix b/modules/users/default.nix index cf852a0..1674e07 100644 --- a/modules/users/default.nix +++ b/modules/users/default.nix @@ -22,6 +22,7 @@ in { shell = pkgs.zsh; extraGroups = [ "wheel" # sudo + "docker" ]; initialPassword = "nix"; openssh.authorizedKeys.keys = [