From 3ed457b10fe34fe5f38ae2572eeadbb2f3a6d8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Sun, 8 Dec 2024 01:11:54 +0100 Subject: [PATCH] Update flake.nix --- flake.lock | 183 ++++++++++++++++++++++++++++++++------- flake.nix | 3 +- home/Kell.nix | 1 + hosts/Common/default.nix | 1 + hosts/Kell/default.nix | 9 +- 5 files changed, 161 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 0f3dee2..a4f62ca 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-cLqKFRw5I2HMWzfIolLyNVmk094KoIqt0zRdRwo7a5Y=", - "path": "/nix/store/3xvbbqnjayfaginzw3i20javmh24cgnl-source/home/ags", + "path": "/nix/store/85kgmnc3iny1wbziqa6a6i2alprkyg59-source/home/ags", "type": "path" }, "original": { - "path": "/nix/store/3xvbbqnjayfaginzw3i20javmh24cgnl-source/home/ags", + "path": "/nix/store/85kgmnc3iny1wbziqa6a6i2alprkyg59-source/home/ags", "type": "path" } }, @@ -131,6 +131,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "worktimer", @@ -199,11 +220,11 @@ ] }, "locked": { - "lastModified": 1733045511, - "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -241,11 +262,42 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733248371, + "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -255,11 +307,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732988560, - "narHash": "sha256-QBFoZSceBzBqf5alWSHudb/81FymlyTcRaOCdL7zPHM=", + "lastModified": 1733601692, + "narHash": "sha256-NclQtpS5Ri7eMuWjI0ZFs7WrVWANSEwICPjhOY191O4=", "ref": "refs/heads/main", - "rev": "d26439a0fe5594fb26d5a3c01571f9490a9a2d2c", - "revCount": 5506, + "rev": "c106f454c136ecca47f84c659c58e19670050412", + "revCount": 5524, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -295,6 +347,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733472316, + "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -331,11 +412,11 @@ ] }, "locked": { - "lastModified": 1732469616, - "narHash": "sha256-U4NBsGjusFc6YjrmoulkeTMrnmuFbFh80Ooua84cHgo=", + "lastModified": 1733421342, + "narHash": "sha256-Wu8g8ykLO9hB04Q/gm5wfpnJU+3V6FWRZ+gElA/UTGk=", "ref": "refs/heads/main", - "rev": "eebfc7b114f8b0687692b13d0d2f04827aa5145f", - "revCount": 52, + "rev": "28b1603e7674cc12e0b2b5b384b4dc88b659a62b", + "revCount": 53, "type": "git", "url": "https://github.com/shezdy/hyprsplit" }, @@ -464,11 +545,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -480,11 +561,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -495,6 +576,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -511,12 +608,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_5", + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1733065597, - "narHash": "sha256-CIPizxtr5Pk5pnncKtcf0I214IZGVDrbmZjlyVNKQi8=", + "lastModified": 1733611653, + "narHash": "sha256-s8EbhSLBIPkYMcw2gVc2QVdrjIBNwiYthZcPpZOAjNE=", "owner": "nix-community", "repo": "NUR", - "rev": "7d4007f69a37be43cbdd420d8d0659f8ae70fcbf", + "rev": "0c96f90c65b1ea86e44453304e2c35091cbb1dd4", "type": "github" }, "original": { @@ -536,11 +638,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -577,10 +679,31 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "worktimer": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1730850710, @@ -625,11 +748,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1733157064, + "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 197ebd0..6cf5482 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ commonModules = host: user: [ ./hosts/${host}/hardware-configuration.nix { nixpkgs.overlays = [ - nur.overlay + nur.overlays.default (self: super: { utillinux = super.util-linux; }) ]; } { @@ -83,6 +83,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHtzTFdvLEvXpv69qAWLTipl4hgsKgRrRrWJRecsFthG user@Arch" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxtJRtlAphl8euicVUR/6C7o+tyhpYmcbMBLHnldEIX server@mallorea" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILazQU/Y9I5PkMZoG/Lzc6mDR7s+aRHzqJoFUhYSse4P PocoF1" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOetfiPyIQ8hbU4t87E0ZrgLqFW9YW09+MNNiusXwW0C user@Asturia" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoUYcVMsDw6tmjfdOuQkwaXx8fohKJs/6/5HoLzTP6x Tablet" ]; shell = pkgs.zsh; diff --git a/home/Kell.nix b/home/Kell.nix index cd7022a..16f98b9 100644 --- a/home/Kell.nix +++ b/home/Kell.nix @@ -16,6 +16,7 @@ home.packages = with pkgs; [ distrobox gnome-disk-utility + moonlight-qt ]; services.hyprpaper = { diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix index 7aa5529..7a66461 100644 --- a/hosts/Common/default.nix +++ b/hosts/Common/default.nix @@ -41,6 +41,7 @@ ]; environment.systemPackages = with pkgs; [ + virtiofsd wget curl git diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index 9140be2..52c4159 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -85,12 +85,11 @@ in { "vfio_pci" "vfio" "vfio_iommu_type1" - "amdgpu" - "nvidia" - "nvidia_modeset" - "nvidia_uvm" - "nvidia_drm" + # "nvidia_modeset" + # "nvidia" + # "nvidia_uvm" + # "nvidia_drm" ]; kernelParams = [ "amd_pstate=active"