Compare commits

..

No commits in common. "a4586f58abba0223948eef9e643f63ec9f0fa9a6" and "f7c058157c1b94d7300ce3ab166725a884187da6" have entirely different histories.

4 changed files with 19 additions and 48 deletions

View file

@ -293,11 +293,6 @@
#xdg.portal = { enable = true; extraPortals = [ inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; }; #xdg.portal = { enable = true; extraPortals = [ inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; };
#xdg.portal = { enable = true; }; #xdg.portal = { enable = true; };
nix.settings = {
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
};
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
#enableNvidiaPatches = true; #enableNvidiaPatches = true;

View file

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1715290355, "lastModified": 1714136352,
"narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,11 +241,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716293225, "lastModified": 1714763106,
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,30 +255,13 @@
"type": "github" "type": "github"
} }
}, },
"nvidia-beta": {
"locked": {
"lastModified": 1716316820,
"narHash": "sha256-mcbyy0lbUYuPbNIggb2Fy020iJhs7uI5Vfny3pVsSqY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"flatpaks": "flatpaks", "flatpaks": "flatpaks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nvidia-beta": "nvidia-beta"
} }
}, },
"systems": { "systems": {

View file

@ -2,11 +2,10 @@
inputs = { inputs = {
# ... # ...
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nvidia-beta.url = "github:NixOS/nixpkgs/d5c3f1ef368b44fa63ff2a5b79578b9acbbb40db";
flatpaks.url = "github:GermanBread/declarative-flatpak/dev"; flatpaks.url = "github:GermanBread/declarative-flatpak/dev";
flatpaks.inputs.nixpkgs.follows = "nixpkgs"; flatpaks.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland.url = "github:hyprwm/Hyprland";
#hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
home-manager = { home-manager = {

View file

@ -3,15 +3,15 @@
environment.etc.nixpkgs.source = inputs.nixpkgs; environment.etc.nixpkgs.source = inputs.nixpkgs;
networking.hostName = "insertpclinux"; networking.hostName = "insertpclinux";
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
nixpkgs.overlays = [ (self: super: (let #nixpkgs.overlays = [ (self: super: (let
patched_pkgs = import inputs.nvidia-beta { # patched_pkgs = import inputs.nixpkgs_patched {
inherit (self) system; # inherit (self) system;
config.allowUnfree = true; # config.allowUnfree = true;
}; # };
in { # in {
linuxPackages = patched_pkgs.linuxPackages; # linuxPackages = patched_pkgs.linuxPackages;
})) ]; # })) ];
boot.kernelPackages = pkgs.linuxPackages; #boot.kernelPackages = pkgs.linuxPackages;
services.sunshine = { services.sunshine = {
enable = true; enable = true;
@ -41,7 +41,7 @@
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.production;
}; };
@ -122,13 +122,7 @@ source=~/.config/hypr/frappe.conf
# source = ~/.config/hypr/myColors.conf # source = ~/.config/hypr/myColors.conf
# Some default env vars. # Some default env vars.
env = LIBVA_DRIVER_NAME,nvidia
env = XDG_SESSION_TYPE,wayland
env = GBM_BACKEND,nvidia-drm
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
env = WLR_NO_HARDWARE_CURSORS,1 env = WLR_NO_HARDWARE_CURSORS,1
env = NO_HARDWARE_CURSORS,true
env = ELECTRON_OZONE_PLATFORM_HINT,auto
env = NIXOS_OZONE_WL,1 env = NIXOS_OZONE_WL,1
env = KUBECONFIG,/home/insert/Desktop/k3s.yaml env = KUBECONFIG,/home/insert/Desktop/k3s.yaml
env = QT_QPA_PLATFORMTHEME,qt5ct env = QT_QPA_PLATFORMTHEME,qt5ct