From d917ac9f6ac018c033666a35f9dbcd0638f57f23 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:55:45 +0200 Subject: [PATCH] Update --- flake.lock | 78 +++++++++++++------------------- home/scripts/startup/default.nix | 3 ++ nixos/configuration.nix | 1 + nixos/fonts.nix | 44 +++++++++++++++--- nixos/nvidia.nix | 8 ++-- 5 files changed, 78 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 6420a16..b1bd973 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -97,21 +97,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -180,11 +165,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -222,11 +207,11 @@ ] }, "locked": { - "lastModified": 1717316182, - "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -243,11 +228,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -295,11 +280,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1717433180, - "narHash": "sha256-0f7RnoE9cyDd99YkD+sseZz4WBwGBszJqBki6w0Odo8=", + "lastModified": 1717698429, + "narHash": "sha256-81gZr6hXEySxzdpqltnR4GOBHO+QFRxFHQK3fW3iTTE=", "ref": "refs/heads/main", - "rev": "3fd6c1b30e5397432c4640286efaf52a6891f71c", - "revCount": 4757, + "rev": "af5f24929d83cc7a97a77de516bc665e38acfa12", + "revCount": 4767, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -480,11 +465,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -531,7 +516,6 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -541,11 +525,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717430734, - "narHash": "sha256-mJ4uC6gkhNVpDTMBe/KB8q0ZnYJVLwEhJCsB8PBcrD4=", + "lastModified": 1717681257, + "narHash": "sha256-0PhFvfc4wDjba1cus2ALsfn0wVizeKkcuF+aqvDJivg=", "owner": "nix-community", "repo": "nixvim", - "rev": "0c2834c50b68c8c2ebe75bd28a74701c573cac49", + "rev": "36f2e51b28ee3389a67ed5e9ed5c4bd388b06918", "type": "github" }, "original": { @@ -654,11 +638,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717297459, - "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", + "lastModified": 1717455931, + "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", + "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", "type": "github" }, "original": { @@ -784,11 +768,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1717278143, + "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", "type": "github" }, "original": { diff --git a/home/scripts/startup/default.nix b/home/scripts/startup/default.nix index 07ba86a..9580e12 100644 --- a/home/scripts/startup/default.nix +++ b/home/scripts/startup/default.nix @@ -39,6 +39,9 @@ let notify-system & ${pkgs.waybar}/bin/waybar & + + + wlr-randr --output "Unknown-1" --off # REMOVE WEIRD GHOST MONITOR ''; in { home.packages = with pkgs; [ startup nextcloud-watch nextcloud-client ]; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b2a1ee3..0c0ae01 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -90,6 +90,7 @@ in { security.rtkit.enable = true; hardware.pulseaudio.enable = false; + services.pipewire = { enable = true; alsa.enable = true; diff --git a/nixos/fonts.nix b/nixos/fonts.nix index 2d7b1e1..cdbf34b 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -1,10 +1,42 @@ { pkgs, inputs, ... }: { - fonts.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "FiraCode" ]; }) - inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd - inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd - openmoji-color - ]; + fonts = { + packages = with pkgs; [ + material-icons + material-design-icons + roboto + work-sans + comic-neue + source-sans + twemoji-color-font + comfortaa + inter + lato + lexend + jost + dejavu_fonts + iosevka-bin + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + jetbrains-mono + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd + inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd + openmoji-color + ]; + enableDefaultPackages = false; + + # this fixes emoji stuff + fontconfig = { + defaultFonts = { + monospace = [ "FiraCode Nerd Font Mono" "Noto Color Emoji" ]; + sansSerif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ]; + serif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + + }; } diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix index 05642f3..7e7bdff 100644 --- a/nixos/nvidia.nix +++ b/nixos/nvidia.nix @@ -1,8 +1,9 @@ -{ +{ config, pkgs, ... }: { hardware.opengl = { enable = true; driSupport = true; driSupport32Bit = true; + extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ]; }; services.xserver.videoDrivers = [ "nvidia" ]; @@ -11,9 +12,10 @@ hardware.nvidia = { modesetting.enable = true; - powerManagement.enable = true; + powerManagement.enable = false; powerManagement.finegrained = false; - open = true; + open = false; nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.production; }; }