diff --git a/flake.lock b/flake.lock index e11aef4..69e41da 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1697838989, - "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=", + "lastModified": 1702735279, + "narHash": "sha256-SztEzDOE/6bDNnWWvnRbSHPVrgewLwdSei1sxoZFejM=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0", + "rev": "e9b9ecef4295a835ab073814f100498716b05a96", "type": "github" }, "original": { @@ -20,13 +20,29 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -38,6 +54,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 70d6f50..cdea57e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = { self, nixpkgs, home-manager }@attrs: + outputs = { self, nixpkgs, home-manager, nixos-hardware }@attrs: let system = "x86_64-linux"; homeManagerSharedModule = { @@ -290,7 +291,7 @@ environment.systemPackages = with pkgs; [ tmux vim wget curl git w3m iftop iotop killall file unzip zip ripgrep imv killall gomuks htop python3 waypipe firefox-wayland chromium gnome.nautilus - vlc steam libreoffice calibre foliate transmission-gtk mupdf + vlc mpv steam libreoffice calibre foliate transmission-gtk mupdf gimp pavucontrol pywal sway wayland glib dracula-theme gnome.adwaita-icon-theme swaylock swayidle wl-clipboard @@ -351,6 +352,7 @@ inherit system; specialArgs = attrs; modules = [ + nixos-hardware.nixosModules.framework-13-7040-amd home-manager.nixosModules.home-manager homeManagerSharedModule ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince pkgs.wezterm pkgs.gnome.gnome-tweaks pkgs.vulkan-tools ]) { @@ -394,6 +396,8 @@ #boot.kernelParams = [ "amdgpu.sg_display=0" ]; networking.hostName = "nixos-framework"; # Define your hostname. system.stateVersion = "22.11"; # Did you read the comment? + programs.fuse.userAllowOther = true; + services.jellyfin.enable = true; services.fwupd.enable = true; #services.xserver = { # enable = true;