Compare commits

..

10 Commits

Author SHA1 Message Date
MichaelFisher1997
81bff57394 Flake implemented 2025-05-10 21:30:15 +01:00
MichaelFisher1997
99bea024e8 moved to stable 2025-05-10 19:38:58 +01:00
MichaelFisher1997
ab0558eaf3 refactor build 2025-05-10 18:48:08 +01:00
MichaelFisher1997
948dbff72e refactor build 2025-05-10 18:41:44 +01:00
MichaelFisher1997
2a7c5f1f40 refactor build 2025-05-10 17:03:38 +01:00
MichaelFisher1997
a3c8550d0e refactor build 2025-05-10 17:02:42 +01:00
MichaelFisher1997
1914559b88 refactor build 2025-05-10 16:56:54 +01:00
MichaelFisher1997
7a79886dc6 desktops 2025-05-10 16:43:47 +01:00
MichaelFisher1997
412bd695e1 Remove deprecated hardware.opengl.driSupport option 2025-05-10 16:35:53 +01:00
MichaelFisher1997
13f11fda47 Initial flake-based system config 2025-05-10 16:33:30 +01:00
14 changed files with 88 additions and 47 deletions

27
flake.lock generated Normal file
View File

@ -0,0 +1,27 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1746557022,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

17
flake.nix Normal file
View File

@ -0,0 +1,17 @@
{
description = "NixOS configuration for hypr-nix";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
};
outputs = { self, nixpkgs, ... }@inputs: {
nixosConfigurations.hypr-nix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./hosts/hypr-nix/configuration.nix
];
};
};
}

10
gpu.nix
View File

@ -1,10 +0,0 @@
{ pkgs, ... }:
{
hardware.opengl.extraPackages = with pkgs; [
rocmPackages.clr.icd
];
environment.systemPackages = [
pkgs.rocmPackages.rpp
];
}

View File

@ -25,6 +25,12 @@
boot.loader.grub.useOSProber = true; boot.loader.grub.useOSProber = true;
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
nix.package = pkgs.nixVersions.latest;
# Optional but recommended:
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
boot.kernelParams = [ boot.kernelParams = [
"cgroup_enable=cpuset,cpu,cpuacct,blkio,devices,freezer,net_cls,perf_event,net_prio,hugetlb,pids" "cgroup_enable=cpuset,cpu,cpuacct,blkio,devices,freezer,net_cls,perf_event,net_prio,hugetlb,pids"
]; ];
@ -61,6 +67,9 @@
services = { services = {
# Enable X11 and configure Wayland support # Enable X11 and configure Wayland support
desktopManager = {
plasma6.enable = true;
};
xserver = { xserver = {
enable = true; enable = true;
xkb.layout = "gb"; xkb.layout = "gb";
@ -73,7 +82,6 @@
# Desktop Managers Configuration # Desktop Managers Configuration
desktopManager = { desktopManager = {
gnome.enable = true; # GNOME gnome.enable = true; # GNOME
plasma6.enable = true; # Use plasma5 for KDE6 as well
}; };
# Window Managers Configuration # Window Managers Configuration
@ -106,9 +114,6 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
#sound.enable = true; #sound.enable = true;
services.flatpak.enable = true; services.flatpak.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
@ -170,22 +175,6 @@
#services.desktopManager.cosmic.enable = true; #services.desktopManager.cosmic.enable = true;
#services.displayManager.cosmic-greeter.enable = true; #services.displayManager.cosmic-greeter.enable = true;
hardware.opengl = {
enable = true;
driSupport = true;
#driSupport32Bit = true;
extraPackages = with pkgs; [
vulkan-loader
vulkan-validation-layers
vulkan-extension-layer
intel-media-driver # LIBVA_DRIVER_NAME=iHD
intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
libvdpau-va-gl
vaapiVdpau
mesa.drivers
];
};
programs.steam.enable = true; programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true; programs.steam.gamescopeSession.enable = true;

22
hosts/hypr-nix/gpu.nix Normal file
View File

@ -0,0 +1,22 @@
{ pkgs, ... }:
{
environment.systemPackages = [
pkgs.rocmPackages.rpp
];
hardware.graphics = {
enable = true;
#driSupport = true;
#driSupport32Bit = true;
extraPackages = with pkgs; [
rocmPackages.clr.icd
vulkan-loader
vulkan-validation-layers
vulkan-extension-layer
intel-media-driver # LIBVA_DRIVER_NAME=iHD
intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
libvdpau-va-gl
vaapiVdpau
mesa
];
};
}

View File

@ -35,7 +35,6 @@
discocss discocss
themechanger themechanger
catppuccin-kvantum catppuccin-kvantum
dolphin
nwg-drawer nwg-drawer
hyprpaper hyprpaper
]; ];

View File

@ -8,11 +8,9 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Text Editors # Text Editors
vim vim
libsForQt5.kate
sublime sublime
lunarvim lunarvim
vscode vscode
#unstable.zed-editor
# Development Tools # Development Tools
openjdk openjdk
@ -22,9 +20,7 @@ in
glew glew
glfw glfw
libGL libGL
SDL2 sdl3
unstable.sdl3
SDL2_image
vulkan-loader vulkan-loader
vulkan-tools vulkan-tools
vulkan-headers vulkan-headers
@ -34,11 +30,10 @@ in
python3 python3
php php
php83Packages.composer php83Packages.composer
libsForQt5.kdenlive
exercism exercism
betterdiscord-installer betterdiscord-installer
unstable.go go
unstable.bun bun
air air
tailwindcss tailwindcss
google-cloud-sdk-gce google-cloud-sdk-gce
@ -111,14 +106,12 @@ in
i3 i3
eww eww
vesktop vesktop
unstable.hyprsunset hyprsunset
unstable.hyprshot
# Web Browsers # Web Browsers
brave brave
google-chrome google-chrome
firefox firefox
falkon
tor-browser tor-browser
# Communication # Communication
@ -180,22 +173,21 @@ in
spice-vdagent spice-vdagent
# Themes and Customization # Themes and Customization
kdePackages.qt6ct #kdePackages.qt6ct
catppuccin-kvantum catppuccin-kvantum
# Multimedia Tools # Multimedia Tools
svt-av1 svt-av1
rav1e rav1e
libaom libaom
unstable.sunshine sunshine
# Miscellaneous # Miscellaneous
fastfetch fastfetch
betterdiscord-installer betterdiscord-installer
unstable.ghostty ghostty
guacamole-client guacamole-client
rpi-imager rpi-imager
kdePackages.filelight
light light
#games #games
@ -214,6 +206,12 @@ in
modrinth-app modrinth-app
minecraft minecraft
nsnake nsnake
#kdePackages
kdePackages.dolphin
kdePackages.filelight
kdePackages.kate
kdePackages.falkon
]; ];
} }

1
result
View File

@ -1 +0,0 @@
/nix/store/2hqaqfwyqgx9fpfcpwzf1ajj723z7hk6-nixos-system-hypr-nix-24.05.7376.b134951a4c9f