Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnRTitor committed Aug 1, 2024
1 parent 7674f4a commit 0c6e95e
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 36 deletions.
56 changes: 28 additions & 28 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 <thisFlake>`.
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="
];
};
}
2 changes: 2 additions & 0 deletions modules-overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];
}
2 changes: 1 addition & 1 deletion system/boot/kernel.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions system/hardware/graphics.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions system/hyprland.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand Down
4 changes: 3 additions & 1 deletion system/nix-settings.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions system/services/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -50,7 +52,7 @@
enable = true;
settings = {
default = [
"kitty.desktop"
"${pkgs.kitty}/share/applications/kitty.desktop"
];
/*
GNOME = [
Expand Down Expand Up @@ -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
}

0 comments on commit 0c6e95e

Please sign in to comment.