liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 06:50:14 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

chore: merge remote-tracking branch 'refs/remotes/origin/master'

Browse source
This commit is contained in:
Ahwx 2025-04-16 10:49:19 +02:00
commit 11747a2a92
9 changed files with 125 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

98
flake.lock generated
View file

@ -104,11 +104,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742213273, "lastModified": 1743265529,
"narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1743414153, "lastModified": 1743801669,
"narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=", "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4", "rev": "07beb389d69a52c4dd5895da9553463c3740a26a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -200,11 +200,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1743550720,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +358,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743430792, "lastModified": 1744008831,
"narHash": "sha256-pGKDA84oK1WTt2yxBUjAwKLacNwJkf9CS7cTXXfgWvI=", "narHash": "sha256-g3mHJLB8ShKuMaBBZxiGuoftJ22f7Boegiw5xBUnS8E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "216690777e47aa0fb1475e4dbe2510554ce0bc4b", "rev": "f463902a3f03e15af658e48bcc60b39188ddf734",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -465,11 +465,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1743370710, "lastModified": 1743975687,
"narHash": "sha256-caSjWT8knTS9rtxxIBBUk8srdi+XlbPC82qFrC6Wp5s=", "narHash": "sha256-6ja6p1xBXzoiVSWfg6kKmQrdRxqY2/m3tZVomcDbocg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "79b526a04199a05d1e9b0bbb035ba20b652a7a2b", "rev": "51838fb5f5b5b03bca99b324fb1f6494d3854f89",
"revCount": 5952, "revCount": 5972,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -492,11 +492,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738422629, "lastModified": 1743714874,
"narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -635,11 +635,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1742816055, "lastModified": 1743452824,
"narHash": "sha256-uxPknq5vuSl5h3kV1s+PzrCul2m8jgXcFEx/OMTchlg=", "narHash": "sha256-wfXP1rk2jpuKq2Jm95Y33HazkiG85t1dZYWUvV1FmDc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpicker", "repo": "hyprpicker",
"rev": "09101f77a4a9d14837c94a12765294683a6ee1a3", "rev": "6692091d56d75d3858c85e5cabe52c4469a8c932",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -682,11 +682,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741534688, "lastModified": 1743950287,
"narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -856,11 +856,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1743299372, "lastModified": 1743990663,
"narHash": "sha256-vFuxkHPd+Xpi5Bx1VCyZwYl/BbF83C+KmlbPBNVJvNU=", "narHash": "sha256-n7bzOLVlYvxgawlIl8fXIxaDjATKhYOhp2OyP61DxdI=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "2ab0a37308559926bddb0009dfcf16a2a5b34e2b", "rev": "35e3aef6ebb7b27195586130175f1409cd71d7f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -902,11 +902,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1740877520, "lastModified": 1743296961,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -948,11 +948,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1743315132, "lastModified": 1743827369,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1", "rev": "42a1c966be226125b48c384171c44c651c236c22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -980,11 +980,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1742889210, "lastModified": 1743583204,
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "698214a32beb4f4c8e3942372c694f40848b360d", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1044,11 +1044,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1743076231, "lastModified": 1743689281,
"narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c5963357f3c1c840201eda129a99d455074db04", "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1060,11 +1060,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1743315132, "lastModified": 1743827369,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1", "rev": "42a1c966be226125b48c384171c44c651c236c22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1097,11 +1097,11 @@
"nixvim": "nixvim_2" "nixvim": "nixvim_2"
}, },
"locked": { "locked": {
"lastModified": 1743436430, "lastModified": 1743458006,
"narHash": "sha256-/9kYyUTUewLptib+jHfPSIDvv0AAQaigNyj23IYwEsQ=", "narHash": "sha256-tipfpX6yRhnj/fbGGJ7nPMMzwnK00jwG29u4N24zndc=",
"owner": "ahwxorg", "owner": "ahwxorg",
"repo": "nixvim-config", "repo": "nixvim-config",
"rev": "c6d9764058af2869a01d7057de9ba2ec6ec66510", "rev": "3ce2fc53a6fef854989742efb04ab368412ca356",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1137,11 +1137,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1743432156, "lastModified": 1744011358,
"narHash": "sha256-2/E1HKZPCa6yFzAqG9Hva6nn7y0fHs41cI39p31l80g=", "narHash": "sha256-WZnoZY/GVRmeqYg83S/XlWuiLZ5xHmaRmC1crMPUOss=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "eab90f0687a564764388d6a993ea719800fe385c", "rev": "0a028aa2ce26f25fd4f5e9bc000fe61c10da14db",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
modules/core/pipewire.nix
View file

@ -1,11 +1,13 @@
{ ... }: { ... }:
{ {
hardware.pulseaudio.enable = false; services = {
services.pipewire = { pulseaudio.enable = false;
enable = true; pipewire = {
alsa.enable = true; enable = true;
alsa.support32Bit = true; alsa.enable = true;
pulse.enable = true; alsa.support32Bit = true;
# lowLatency.enable = true; pulse.enable = true;
# lowLatency.enable = true;
};
}; };
} }

9
modules/core/sshd.nix
View file

@ -1,8 +1,8 @@
{ lib, ... }: { lib, ... }:
{ {
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [22]; ports = [ 22 ];
settings = { settings = {
PasswordAuthentication = lib.mkDefault false; PasswordAuthentication = lib.mkDefault false;
AllowUsers = null; AllowUsers = null;
@ -11,5 +11,8 @@
}; };
}; };
users.users.liv.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@lila" ]; users.users.liv.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # main laptop
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ2nsQHyWnrmuQway0ehoMUcYYfhD8Ph/vpD0Tzip1b1 liv@meow" # main phone
];
} }

4
modules/core/user.nix
View file

@ -13,8 +13,8 @@
[ ./../home/default.server.nix ] [ ./../home/default.server.nix ]
else if (host == "dandelion") then else if (host == "dandelion") then
[ ./../home/default.server.nix ] [ ./../home/default.server.nix ]
else if (host == "yoshino") then # else if (host == "yoshino") then
[ ./../home/default.yoshino.nix ] # [ ./../home/default.nix ]
else [ ./../home ]; else [ ./../home ];
home = { home = {
username = "${username}"; username = "${username}";

1
modules/home/hyprland/displays.conf
View file

@ -0,0 +1 @@
monitor=HDMI-A-1,1920x1080@165,0x0,1,transform,0

33
roles/amdgpu.nix
View file

@ -1,8 +1,14 @@
{ lib, pkgs, config, ... }: {
lib,
pkgs,
config,
...
}:
with lib; with lib;
let let
cfg = config.liv.amdgpu; cfg = config.liv.amdgpu;
in { in
{
options.liv.amdgpu = { options.liv.amdgpu = {
enable = mkEnableOption "Enable amdgpu drivers"; enable = mkEnableOption "Enable amdgpu drivers";
}; };
@ -11,19 +17,24 @@ in {
hardware = { hardware = {
graphics = { graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [
mesa
libva
libvdpau-va-gl
vulkan-loader
vulkan-validation-layers
amdvlk
mesa.opencl
];
extraPackages32 = with pkgs; [
driversi686Linux.amdvlk # Install amdvlk for 32 bit applications as well
];
}; };
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
opengl = {
extraPackages = with pkgs; [
amdvlk
];
# For 32 bit applications as well
extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
];
};
}; };
boot.initrd.kernelModules = [ "amdgpu" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
amdvlk amdvlk
]; ];

1
roles/creative.nix
View file

@ -16,6 +16,7 @@ in {
audacity audacity
obs-studio obs-studio
kdePackages.kdenlive kdePackages.kdenlive
orca-slicer
]; ];
}; };
}; };

42
roles/desktop.nix
View file

@ -1,8 +1,16 @@
{ lib, pkgs, config, username, home-manager, ... }: {
lib,
pkgs,
config,
username,
home-manager,
...
}:
with lib; with lib;
let let
cfg = config.liv.desktop; cfg = config.liv.desktop;
in { in
{
options.liv.desktop = { options.liv.desktop = {
enable = mkEnableOption "Enable desktop"; enable = mkEnableOption "Enable desktop";
}; };
@ -12,6 +20,7 @@ in {
users.${username} = { users.${username} = {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Home packages # Home packages
swaylock
]; ];
}; };
}; };
@ -19,22 +28,21 @@ in {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
boot = { boot = {
kernelModules = ["acpi_call"]; kernelModules = [ "acpi_call" ];
extraModulePackages = with config.boot.kernelPackages; extraModulePackages = with config.boot.kernelPackages; [
[ acpi_call
acpi_call ];
]; };
}; services = {
services = {
thermald.enable = true; thermald.enable = true;
hardware.openrgb = { hardware.openrgb = {
enable = true; enable = true;
package = pkgs.openrgb-with-all-plugins; package = pkgs.openrgb-with-all-plugins;
motherboard = "amd"; motherboard = "amd";
server = { server = {
port = 6742; port = 6742;
# autoStart = true; # autoStart = true;
}; };
}; };
}; };
}; };

14
roles/nvidia.nix
View file

@ -1,19 +1,23 @@
{ lib, pkgs, config, ... }: {
lib,
pkgs,
config,
...
}:
with lib; with lib;
let let
cfg = config.liv.nvidia; cfg = config.liv.nvidia;
in { in
{
options.liv.nvidia = { options.liv.nvidia = {
enable = mkEnableOption "Enable NVIDIA drivers"; enable = mkEnableOption "Enable NVIDIA drivers";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
hardware = { hardware = {
enableRedistributableFirmware = true;
graphics = { graphics = {
enable = true; enable = true;
};
enableRedistributableFirmware = true;
opengl = {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
# amdvlk # amdvlk
]; ];