mirror of
https://github.com/MichaelFisher1997/nixos.git
synced 2025-08-13 11:23:43 +00:00
Compare commits
No commits in common. "81bff57394efc182659b4d8a09fb2f69ec20be90" and "3c37d9f3352f41365a9fe40028cc6b3025257698" have entirely different histories.
81bff57394
...
3c37d9f335
@ -25,12 +25,6 @@
|
|||||||
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"
|
||||||
];
|
];
|
||||||
@ -67,9 +61,6 @@
|
|||||||
|
|
||||||
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";
|
||||||
@ -82,6 +73,7 @@
|
|||||||
# 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
|
||||||
@ -114,6 +106,9 @@
|
|||||||
# 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;
|
||||||
@ -175,6 +170,22 @@
|
|||||||
#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;
|
||||||
|
|
27
flake.lock
generated
27
flake.lock
generated
@ -1,27 +0,0 @@
|
|||||||
{
|
|
||||||
"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
17
flake.nix
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
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
Normal file
10
gpu.nix
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
rocmPackages.clr.icd
|
||||||
|
];
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.rocmPackages.rpp
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
@ -1,22 +0,0 @@
|
|||||||
{ 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
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
@ -35,6 +35,7 @@
|
|||||||
discocss
|
discocss
|
||||||
themechanger
|
themechanger
|
||||||
catppuccin-kvantum
|
catppuccin-kvantum
|
||||||
|
dolphin
|
||||||
nwg-drawer
|
nwg-drawer
|
||||||
hyprpaper
|
hyprpaper
|
||||||
];
|
];
|
@ -8,9 +8,11 @@ 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
|
||||||
@ -20,7 +22,9 @@ in
|
|||||||
glew
|
glew
|
||||||
glfw
|
glfw
|
||||||
libGL
|
libGL
|
||||||
sdl3
|
SDL2
|
||||||
|
unstable.sdl3
|
||||||
|
SDL2_image
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
vulkan-headers
|
vulkan-headers
|
||||||
@ -30,10 +34,11 @@ in
|
|||||||
python3
|
python3
|
||||||
php
|
php
|
||||||
php83Packages.composer
|
php83Packages.composer
|
||||||
|
libsForQt5.kdenlive
|
||||||
exercism
|
exercism
|
||||||
betterdiscord-installer
|
betterdiscord-installer
|
||||||
go
|
unstable.go
|
||||||
bun
|
unstable.bun
|
||||||
air
|
air
|
||||||
tailwindcss
|
tailwindcss
|
||||||
google-cloud-sdk-gce
|
google-cloud-sdk-gce
|
||||||
@ -106,12 +111,14 @@ in
|
|||||||
i3
|
i3
|
||||||
eww
|
eww
|
||||||
vesktop
|
vesktop
|
||||||
hyprsunset
|
unstable.hyprsunset
|
||||||
|
unstable.hyprshot
|
||||||
|
|
||||||
# Web Browsers
|
# Web Browsers
|
||||||
brave
|
brave
|
||||||
google-chrome
|
google-chrome
|
||||||
firefox
|
firefox
|
||||||
|
falkon
|
||||||
tor-browser
|
tor-browser
|
||||||
|
|
||||||
# Communication
|
# Communication
|
||||||
@ -173,21 +180,22 @@ 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
|
||||||
sunshine
|
unstable.sunshine
|
||||||
|
|
||||||
# Miscellaneous
|
# Miscellaneous
|
||||||
fastfetch
|
fastfetch
|
||||||
betterdiscord-installer
|
betterdiscord-installer
|
||||||
ghostty
|
unstable.ghostty
|
||||||
guacamole-client
|
guacamole-client
|
||||||
rpi-imager
|
rpi-imager
|
||||||
|
kdePackages.filelight
|
||||||
light
|
light
|
||||||
|
|
||||||
#games
|
#games
|
||||||
@ -206,12 +214,6 @@ in
|
|||||||
modrinth-app
|
modrinth-app
|
||||||
minecraft
|
minecraft
|
||||||
nsnake
|
nsnake
|
||||||
|
|
||||||
#kdePackages
|
|
||||||
kdePackages.dolphin
|
|
||||||
kdePackages.filelight
|
|
||||||
kdePackages.kate
|
|
||||||
kdePackages.falkon
|
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
1
result
Symbolic link
1
result
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
/nix/store/2hqaqfwyqgx9fpfcpwzf1ajj723z7hk6-nixos-system-hypr-nix-24.05.7376.b134951a4c9f
|
Loading…
x
Reference in New Issue
Block a user