From 306ee40129e9a6fe3a71e310260b2848aac5751c Mon Sep 17 00:00:00 2001 From: lsoriano-mcm Date: Sat, 28 Jun 2025 17:31:47 -0500 Subject: [PATCH] Revert "FIX: finally fixed flake.lock" This reverts commit 1e19f865dedbd65b53afbe7ed876c0a2617f917c. --- config.nix | 1 + flake.lock | 96 +++++++++++++++++++++--------------------- flake.nix | 1 - home/desktop.nix | 6 +-- hosts/macos/darwin.nix | 6 +-- system/dev/dev.nix | 15 +++++++ system/dev/macos.nix | 13 ++++++ system/dev/python.nix | 6 ++- system/dev/tools.nix | 1 + 9 files changed, 87 insertions(+), 58 deletions(-) create mode 100644 system/dev/dev.nix create mode 100644 system/dev/macos.nix diff --git a/config.nix b/config.nix index 44e3c36..3df8f5e 100644 --- a/config.nix +++ b/config.nix @@ -67,6 +67,7 @@ # Custom Applications linux-apps = { + gaming = true; my-apps = pkgs: with pkgs; [ jellyfin-media-player diff --git a/flake.lock b/flake.lock index 8f4b2a5..4c0dc8e 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1747864449, - "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", + "lastModified": 1750372185, + "narHash": "sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e+09fN+NL/Q3BjTWHY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", + "rev": "7cef49d261cbbe537e8cb662485e76d29ac4cbca", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1749194393, - "narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=", + "lastModified": 1750618568, + "narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "19346808c445f23b08652971be198b9df6c33edc", + "rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1748979197, - "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=", + "lastModified": 1750713626, + "narHash": "sha256-uM+hqdMxp+H53d8R7EHn2yY+nLNGgg59pdipIgCZ5yY=", "owner": "nix-community", "repo": "home-manager", - "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3", + "rev": "86402a17b6c67b07c5536354da5d56c14196de46", "type": "github" }, "original": { @@ -372,11 +372,11 @@ ] }, "locked": { - "lastModified": 1745948457, - "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", + "lastModified": 1749155331, + "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "ac903e80b33ba6a88df83d02232483d99f327573", + "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", "type": "github" }, "original": { @@ -401,11 +401,11 @@ ] }, "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", + "lastModified": 1750371717, + "narHash": "sha256-cNP+bVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "rev": "15c6f8f3a567fec9a0f732cd310a7ff456deef88", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1749049255, - "narHash": "sha256-QXg2B/bF/f9IeSiZwJuhdnz2xcnpu/hDfz4eIHWVhz8=", + "lastModified": 1750681989, + "narHash": "sha256-uxIwiV1p2SVNIoP+oD025lZKfq4zNn7CmdaYVoskqnQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d7a87ce6e2535f1029fc93b062d2828e8549c525", + "rev": "cf7e3aa448f8c9e0d9e8f407e6ed730da55acc69", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", "type": "github" }, "original": { @@ -525,11 +525,11 @@ ] }, "locked": { - "lastModified": 1745951494, - "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", + "lastModified": 1750371812, + "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", + "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", "type": "github" }, "original": { @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1747484975, - "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", + "lastModified": 1750371198, + "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "163c83b3db48a17c113729c220a60b94596c9291", + "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", "type": "github" }, "original": { @@ -579,11 +579,11 @@ ] }, "locked": { - "lastModified": 1746635225, - "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", + "lastModified": 1750371096, + "narHash": "sha256-JB1IeJ41y7kWc/dPGV6RMcCUM0Xj2NEK26A2Ap7EM9c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", + "rev": "38f3a211657ce82a1123bf19402199b67a410f08", "type": "github" }, "original": { @@ -604,11 +604,11 @@ ] }, "locked": { - "lastModified": 1747584298, - "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", + "lastModified": 1750371869, + "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", + "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", "type": "github" }, "original": { @@ -698,11 +698,11 @@ ] }, "locked": { - "lastModified": 1751075759, - "narHash": "sha256-MNAlH/IlSkg5ODfLEgYuDvs4XrM8n3Ukmh6OqQxoJ6s=", + "lastModified": 1750557776, + "narHash": "sha256-+BgqY5UK1moaknyb+yi6NOqx63e0lT7V6d2h6lhFQoQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "622e26d86942642483e1a49d4f0dea2cbb80e6c1", + "rev": "6bdd014132028f025d53059a40ce9489c070ca27", "type": "github" }, "original": { @@ -795,11 +795,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -869,11 +869,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -1044,11 +1044,11 @@ ] }, "locked": { - "lastModified": 1745871725, - "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", + "lastModified": 1750372504, + "narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", + "rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1abccc3..b94ba73 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,6 @@ hyprland, unlisted-fonts, nixovim, - nix-gaming, ... } @ inputs: let config = import ./config.nix; diff --git a/home/desktop.nix b/home/desktop.nix index aa28d30..5344b70 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -1,12 +1,12 @@ -{general, ...}: { +{username, ...}: { imports = [ ]; programs.home-manager.enable = true; home = { - username = "${general.Username}"; - homeDirectory = "/home/${general.Username}"; + username = "${username}"; + homeDirectory = "/home/${username}"; packages = []; sessionVariables = {}; }; diff --git a/hosts/macos/darwin.nix b/hosts/macos/darwin.nix index 16b8ac9..450106e 100644 --- a/hosts/macos/darwin.nix +++ b/hosts/macos/darwin.nix @@ -5,12 +5,11 @@ ... }: { imports = [ - ../../modules/dev.nix ]; # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = with pkgs; [ - python313 + python313Full ]; # Auto upgrade nix package and the daemon service. @@ -22,9 +21,6 @@ nix.settings.experimental-features = "nix-command flakes"; nix.settings.trusted-users = builds.builder.trustedUsers; - # Security Fingerprinting - security.pam.services.sudo_local.touchIdAuth = true; - # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina programs.fish.enable = true; diff --git a/system/dev/dev.nix b/system/dev/dev.nix new file mode 100644 index 0000000..abc1620 --- /dev/null +++ b/system/dev/dev.nix @@ -0,0 +1,15 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + python3 + python3Packages.pip + python3Packages.pygobject3 + python3Packages.setuptools + python3Packages.wheel + + git + p7zip + busybox + tldr + jq + ]; +} diff --git a/system/dev/macos.nix b/system/dev/macos.nix new file mode 100644 index 0000000..53a0d72 --- /dev/null +++ b/system/dev/macos.nix @@ -0,0 +1,13 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + python3 + python3Packages.pip + python3Packages.pygobject3 + python3Packages.setuptools + python3Packages.wheel + git + p7zip + tldr + jq + ]; +} diff --git a/system/dev/python.nix b/system/dev/python.nix index 1a185be..0b197a0 100644 --- a/system/dev/python.nix +++ b/system/dev/python.nix @@ -1,5 +1,9 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ - python313Full + python3 + python3Packages.pip + python3Packages.pygobject3 + python3Packages.setuptools + python3Packages.wheel ]; } diff --git a/system/dev/tools.nix b/system/dev/tools.nix index 8f7ca03..152623d 100644 --- a/system/dev/tools.nix +++ b/system/dev/tools.nix @@ -2,6 +2,7 @@ environment.systemPackages = with pkgs; [ git p7zip + busybox tldr jq ];