From 0c6e95ebbbcd37d6748c3bf8c557dec94b5936a3 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:29:22 +0530 Subject: [PATCH] test --- flake.lock | 56 ++++++++++++++++++------------------ flake.nix | 18 ++++++++++++ modules-overlays/default.nix | 2 ++ system/boot/kernel.nix | 2 +- system/hardware/graphics.nix | 6 ++-- system/hyprland.nix | 4 +-- system/nix-settings.nix | 4 ++- system/services/default.nix | 6 ++-- 8 files changed, 62 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 6b195ee1..7d9f4e04 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1722386781, - "narHash": "sha256-I2S/GT7tWVjf3vmV6qBzaqCqpYxVYkQFKmgcmI5ORpE=", + "lastModified": 1722464543, + "narHash": "sha256-UjkjGUrozdVL28UmYLodLgCtALAV/1hM+4snv41Al0U=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "c60ce818902d10f65180e261f8b0d7c72467a94d", + "rev": "e42312b6028d96a735fdcd4262e59d5335f0e398", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1722269440, - "narHash": "sha256-eUzqnxgHIfxGcXk0SwXwP011uQ41WOEHX+gg1uPSkcE=", + "lastModified": 1722455255, + "narHash": "sha256-ah/5TUuX/hLRY4sSFApMTva+2mC3GsWNQx3r9+G3GDk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a383380ec33f66ef92c4e815260271f6ad7cf286", + "rev": "a531a96131a200374f9482b3de495704c4e3e12e", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1722262342, - "narHash": "sha256-bKNPr3GVhV7DgkEWyNxG0vM1ZJq/SAlrRA8TNs+rrbk=", + "lastModified": 1722502292, + "narHash": "sha256-qUzbqhrrzXE3sGNpGZsa2z8OQRRRSZWx82IzwC68Css=", "owner": "cachix", "repo": "devenv", - "rev": "11a1ca0ad80bc172d2efda34ae542494442dcf48", + "rev": "9955b35f70855790bd375ce6effce5e46c76a908", "type": "github" }, "original": { @@ -657,11 +657,11 @@ ] }, "locked": { - "lastModified": 1722407237, - "narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=", + "lastModified": 1722462338, + "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", "owner": "nix-community", "repo": "home-manager", - "rev": "58cef3796271aaeabaed98884d4abaab5d9d162d", + "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", "type": "github" }, "original": { @@ -759,11 +759,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722455246, - "narHash": "sha256-dMcWN+M+VsSsf86ldj7zfOpd9QqM88BXAYYh2mxFWc0=", + "lastModified": 1722508575, + "narHash": "sha256-pDcn0Q8H2eFU9rjXy4FA6RtpCFAm+2YMhh3mIielrrw=", "ref": "refs/heads/main", - "rev": "37e1411e8d94fe8f3fb678588a7df9b8f931910f", - "revCount": 5033, + "rev": "60571cd5ccc76f91209ef2faac93ecea542de221", + "revCount": 5038, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1276,11 +1276,11 @@ ] }, "locked": { - "lastModified": 1722388556, - "narHash": "sha256-90/qzsfqtXbHk3vshBQkJdymG/IY7S6RqqYpQU2GB8Y=", + "lastModified": 1722476581, + "narHash": "sha256-dCNcvjaOTu+cPin3VUym9pglsghWYJe5oUpKTuAgiiU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "af75b047c7e12cbd5484190900e6216b5ebe68e2", + "rev": "1fe57eaf074d28246ec310486fe3db4ae44d0451", "type": "github" }, "original": { @@ -1318,11 +1318,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -1334,11 +1334,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1722457276, - "narHash": "sha256-EfUh0lbogZFCPe2hs4Qq/9EOyQ7Kn8L08loPxzcKYlk=", + "lastModified": 1722506739, + "narHash": "sha256-LSBrjBJV/sKyoRQ0j4p3cgQ0Sj4tEiKDr9Km5z9kaDg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b36d1f59424c569e101f2b7c0413729dd6d6308", + "rev": "20265e85a6edf425e6b6403149e759c6f2fc0e95", "type": "github" }, "original": { @@ -1476,11 +1476,11 @@ }, "nur": { "locked": { - "lastModified": 1722455170, - "narHash": "sha256-AstQS6WdzJthqUMpIXJS6HbCV2qUsp/qmHnL76p8U1M=", + "lastModified": 1722506945, + "narHash": "sha256-stBe+eCSthbVgRbnw7omowcRHLxua391at3e9yPKVpQ=", "owner": "nix-community", "repo": "NUR", - "rev": "c44d0e4abc611d991c6208a57e3a49e90a057fe3", + "rev": "883ce50da0a347787fecb88969c6d92452f058e5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index af35402b..75917bcf 100644 --- a/flake.nix +++ b/flake.nix @@ -82,4 +82,22 @@ nur.url = "github:nix-community/NUR"; # Nix User Repository, for community packages }; outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} {imports = [./flake];}; + + + # Allows the user to use our cache when using `nix run `. + nixConfig = { + extra-substituters = [ + "https://nyx.chaotic.cx/" + "https://devenv.cachix.org" + "https://hyprland.cachix.org" + "https://nix-community.cachix.org" + ]; + extra-trusted-public-keys = [ + "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; } diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix index f8ce0e16..be7218d9 100644 --- a/modules-overlays/default.nix +++ b/modules-overlays/default.nix @@ -18,4 +18,6 @@ programs.uwsm.enable = true; programs.uwsm.package = pkgs-edge.uwsm; + + boot.kernelParams = [ "systemd.unified_cgroup_hierachy=0" "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1" ]; } diff --git a/system/boot/kernel.nix b/system/boot/kernel.nix index e9678462..c82208e1 100644 --- a/system/boot/kernel.nix +++ b/system/boot/kernel.nix @@ -4,7 +4,7 @@ pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; + boot.kernelPackages = pkgs.linuxPackages_cachyos; boot.extraModulePackages = with config.boot.kernelPackages; [ # zenpower is used for reading temperature, voltage, current and power diff --git a/system/hardware/graphics.nix b/system/hardware/graphics.nix index c3bc38e4..c0c5c640 100644 --- a/system/hardware/graphics.nix +++ b/system/hardware/graphics.nix @@ -58,13 +58,15 @@ in { libvdpau-va-gl ]; }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = (with pkgs; [ ## GRAPHICS UTILS ## clinfo # OpenCL hardware information libva-utils # libva graphics library tools vdpauinfo # vdpau graphics library tools vulkan-tools # vulkan graphics library tools - ]; + ]) ++ (with nur-amdgpu; [ + amdgpu-pro-libs.prefixes + ]); # Use modesetting driver for Xorg, its better and updated # AMDGPU graphics driver for Xorg is deprecated diff --git a/system/hyprland.nix b/system/hyprland.nix index a02afeb9..28912667 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -139,10 +139,10 @@ in { xorg.xhost # needed for some packages running x11 like gparted ## GNOME Suite ## - gnome.nautilus # file manager + nautilus # file manager gnome-text-editor # text editor shotcut # video editor - gnome.gnome-system-monitor # system monitor + gnome-system-monitor # system monitor loupe # image viewer ## Hypr ecosystem ## diff --git a/system/nix-settings.nix b/system/nix-settings.nix index cd684f84..7458fe12 100644 --- a/system/nix-settings.nix +++ b/system/nix-settings.nix @@ -5,6 +5,7 @@ ... }: { nix.package = pkgs.lix; # pkgs.nixVersions.latest; # Use latest nix + # DONOT DISABLE THIS nix.settings.trusted-users = [userSettings.username]; # FIXME: if someday custom cache works without this # Features for building @@ -24,7 +25,8 @@ "nix-command" "flakes" ]; # enable nix command and flakes - nix.settings.auto-optimise-store = true; # enable space optimisation by hardlinking + # auto optimise sometimes corrupts, DANGEROUS + # nix.settings.auto-optimise-store = true; # enable space optimisation by hardlinking # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/system/services/default.nix b/system/services/default.nix index 9ce0c167..3fbb5747 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -27,6 +27,8 @@ chaotic.scx.enable = true; # by default uses rustland chaotic.scx.scheduler = "scx_bpfland"; + # Accounts daemon is needed to remember passwords and other account information + # by display manager and other services services.accounts-daemon.enable = true; services.dbus = { enable = true; @@ -50,7 +52,7 @@ enable = true; settings = { default = [ - "kitty.desktop" + "${pkgs.kitty}/share/applications/kitty.desktop" ]; /* GNOME = [ @@ -89,5 +91,5 @@ security.polkit.enable = true; # Enable polkit for elevated prompts - services.colord.enable = true; # For color management + # services.colord.enable = true; # For color management }