mirror of
https://github.com/Moe1369/nixos-config.git
synced 2024-10-18 04:14:08 +02:00
This commit is contained in:
parent
a9d0a9d62b
commit
ae9b64a789
21
flake.lock
21
flake.lock
@ -94,6 +94,26 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nypkgs": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720792364,
|
||||
"narHash": "sha256-3AvMMvTKkvtDPlTtBZADrQaIRHjW09EO9uyEZNdHOkw=",
|
||||
"owner": "yunfachi",
|
||||
"repo": "nypkgs",
|
||||
"rev": "209a7be0d39ee9a3f5a726abddcdf79753c4f47e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "yunfachi",
|
||||
"repo": "nypkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plasma-manager": {
|
||||
"inputs": {
|
||||
"home-manager": [
|
||||
@ -123,6 +143,7 @@
|
||||
"home-manager": "home-manager",
|
||||
"jovian": "jovian",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nypkgs": "nypkgs",
|
||||
"plasma-manager": "plasma-manager"
|
||||
}
|
||||
}
|
||||
|
20
flake.nix
20
flake.nix
@ -12,20 +12,16 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
nypkgs = {
|
||||
url = "github:yunfachi/nypkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
outputs = { self, nixpkgs, home-manager, jovian, plasma-manager, ...}:
|
||||
let
|
||||
# Different Devices
|
||||
host-computer = "computer-mo";
|
||||
host-server = "server";
|
||||
host-konsole = "konsole";
|
||||
host-steamdeck = "steamdeck";
|
||||
|
||||
user-computer = "mo";
|
||||
user-server = "administrator";
|
||||
user-konsole = "deck";
|
||||
user-steamdeck = "deck";
|
||||
|
||||
|
||||
lib = nixpkgs.lib;
|
||||
system = "x86_64-linux";
|
||||
@ -36,8 +32,8 @@
|
||||
${host-computer} = lib.nixosSystem {
|
||||
specialArgs = {inherit user-computer host-computer;};
|
||||
modules = [
|
||||
./hosts/${host-computer}
|
||||
./global/system-imports.nix
|
||||
./hosts/${host-computer}/system
|
||||
./global/system
|
||||
jovian.nixosModules.jovian
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
@ -46,8 +42,8 @@
|
||||
home-manager.backupFileExtension = "backup";
|
||||
home-manager.extraSpecialArgs = {inherit pkgs;};
|
||||
home-manager.users.${user-computer}.imports = [
|
||||
./hosts/${host-computer}
|
||||
./global/user-imports.nix
|
||||
./hosts/${host-computer}/user
|
||||
./global/user
|
||||
];
|
||||
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager];
|
||||
}
|
||||
|
@ -1,15 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports =
|
||||
[
|
||||
# Packages
|
||||
./system-packages/sys.pkg-dev.nix
|
||||
# Settings
|
||||
./system-settings/sys.set-boot.nix
|
||||
./system-settings/sys.set-dev.nix
|
||||
./system-settings/sys.set-locale.nix
|
||||
./system-settings/sys.set-networking.nix
|
||||
./system-settings/sys.set-system.nix
|
||||
./system-settings/sys.set-updates.nix
|
||||
];
|
||||
}
|
12
global/system/default.nix
Normal file
12
global/system/default.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./pkg-dev.nix
|
||||
./set-boot.nix
|
||||
./set-dev.nix
|
||||
./set-locale.nix
|
||||
./set-networking.nix
|
||||
./set-system.nix
|
||||
./set-updates.nix
|
||||
];
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
# Home-Manager Packages
|
||||
./user-packages/usr.pkg-dev.nix
|
||||
# Home-Manager Settings
|
||||
./user-settings/usr.set-dev.nix
|
||||
./user-settings/usr.set-system.nix
|
||||
];
|
||||
}
|
8
global/user/default.nix
Normal file
8
global/user/default.nix
Normal file
@ -0,0 +1,8 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./pkg-dev.nix
|
||||
./set-dev.nix
|
||||
./set-system.nix
|
||||
];
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
kde-rounded-corners
|
||||
neofetch
|
||||
ibm-plex
|
||||
]);
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.displayManager.sddm.enable = true;
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
kdePackages.kate
|
||||
git
|
||||
nil
|
||||
yaml-language-server
|
||||
]);
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
languagePacks = ["de"];
|
||||
};
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
mangohud
|
||||
unigine-valley
|
||||
unigine-heaven
|
||||
unigine-tropics
|
||||
]);
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
pciutils
|
||||
aha
|
||||
lact
|
||||
kdePackages.isoimagewriter
|
||||
]);
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
kdePackages.gwenview
|
||||
kdePackages.okular
|
||||
kdePackages.kdenlive
|
||||
kdePackages.elisa
|
||||
haruna
|
||||
krita
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -1,15 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
vesktop
|
||||
google-chrome
|
||||
teams-for-linux
|
||||
kdePackages.kcolorchooser
|
||||
xwaylandvideobridge
|
||||
kdePackages.kfind
|
||||
kdePackages.kcalc
|
||||
kdePackages.filelight
|
||||
kdePackages.skanlite
|
||||
]);
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
jovian.steam = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
kdePackages.ksystemlog
|
||||
kdePackages.partitionmanager
|
||||
]);
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.extraModprobeConfig = ''
|
||||
options amdgpu ppfeaturemask=0xFFF7FFFF
|
||||
'';
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
# Ignore Dualsense Touchpad in Desktop
|
||||
services.udev.extraRules =''
|
||||
ACTION=="add|change", KERNEL=="event[0-9]*", ATTRS{name}=="*Wireless Controller Touchpad", ENV{LIBINPUT_IGNORE_DEVICE}="1"
|
||||
'';
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
{ user-computer, ... }:
|
||||
{
|
||||
services.xserver.enable = false;
|
||||
services.displayManager.autoLogin.enable = true;
|
||||
services.displayManager.autoLogin.user = user-computer;
|
||||
}
|
@ -1,18 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-partlabel/root";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-partlabel/EFI";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ {
|
||||
device = "/var/lib/swapfile";
|
||||
size = 16*1024;
|
||||
}];
|
||||
}
|
@ -1,17 +0,0 @@
|
||||
{ lib, config,... }:
|
||||
{
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
services.fwupd.enable = true;
|
||||
services.printing.enable = true;
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
services.libinput.enable = false;
|
||||
}
|
@ -1,4 +0,0 @@
|
||||
{ host-computer, ... }:
|
||||
{
|
||||
networking.hostName = host-computer;
|
||||
}
|
@ -1,18 +0,0 @@
|
||||
{ user-computer, ... }:
|
||||
{
|
||||
jovian.steam = {
|
||||
autoStart = false;
|
||||
user = user-computer;
|
||||
desktopSession = "plasma";
|
||||
};
|
||||
|
||||
jovian.hardware.has.amd.gpu = true;
|
||||
jovian.hardware.amd.gpu.enableEarlyModesetting = true;
|
||||
jovian.steamos.enableBluetoothConfig = true;
|
||||
|
||||
programs.steam = {
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
};
|
||||
}
|
@ -1,12 +0,0 @@
|
||||
{ pkgs,... }:
|
||||
{
|
||||
systemd.services.lact = {
|
||||
enable = true;
|
||||
description = "AMDGPU Control Daemon";
|
||||
after = ["multi-user.target"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.lact}/bin/lact daemon";
|
||||
};
|
||||
};
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
{ user-computer, ... }:
|
||||
{
|
||||
users.users.${user-computer} = {
|
||||
isNormalUser = true;
|
||||
description = "Mohamed Chrayed";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
};
|
||||
}
|
@ -1,27 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports =
|
||||
[
|
||||
# Packages
|
||||
./system-packages/sys.pkg-customization.nix
|
||||
./system-packages/sys.pkg-desktop.nix
|
||||
./system-packages/sys.pkg-dev.nix
|
||||
./system-packages/sys.pkg-firefox.nix
|
||||
./system-packages/sys.pkg-gaming.nix
|
||||
./system-packages/sys.pkg-hardware.nix
|
||||
./system-packages/sys.pkg-media.nix
|
||||
./system-packages/sys.pkg-misc.nix
|
||||
./system-packages/sys.pkg-steam.nix
|
||||
./system-packages/sys.pkg-system.nix
|
||||
# Settings
|
||||
./system-settings/sys.set-boot.nix
|
||||
./system-settings/sys.set-controller.nix
|
||||
./system-settings/sys.set-desktop.nix
|
||||
./system-settings/sys.set-filesystems.nix
|
||||
./system-settings/sys.set-hardware.nix
|
||||
./system-settings/sys.set-hostname.nix
|
||||
./system-settings/sys.set-steam.nix
|
||||
./system-settings/sys.set-systemd.nix
|
||||
./system-settings/sys.set-users.nix
|
||||
];
|
||||
}
|
@ -1,12 +0,0 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
# Home-Manager Packages
|
||||
./user-packages/usr.pkg-desktop.nix
|
||||
# Home-Manager Settings
|
||||
./user-settings/usr.set-customization.nix
|
||||
./user-settings/usr.set-dotfiles.nix
|
||||
./user-settings/usr.set-desktop.nix
|
||||
];
|
||||
}
|
9
hosts/computer-mo/user/default.nix
Normal file
9
hosts/computer-mo/user/default.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./pkg-desktop.nix
|
||||
./set-customization.nix
|
||||
./set-desktop.nix
|
||||
./set-dotfiles.nix
|
||||
];
|
||||
}
|
Loading…
Reference in New Issue
Block a user