mirror of
https://github.com/Moe1369/nixos-config.git
synced 2024-10-18 02:14:07 +02:00
reorder
This commit is contained in:
parent
218f0389ce
commit
efb626eadc
Before Width: | Height: | Size: 2.6 MiB After Width: | Height: | Size: 2.6 MiB |
16
flake.nix
16
flake.nix
@ -22,9 +22,15 @@
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
|
||||
commonModules = [
|
||||
./global/system
|
||||
jovian.nixosModules.jovian
|
||||
home-manager.nixosModules.home-manager
|
||||
./modules/system/boot
|
||||
./modules/system/devices
|
||||
./modules/system/locale
|
||||
./modules/system/networking
|
||||
./modules/system/nixsettings
|
||||
./modules/system/shell
|
||||
./modules/system/systemversion
|
||||
./modules/system/upgrades
|
||||
];
|
||||
|
||||
homeManagerConfig = {
|
||||
@ -39,7 +45,7 @@
|
||||
hosts = {
|
||||
computer-mo = {
|
||||
user = "mo";
|
||||
extraModules = [ ./hosts/computer-mo/system ];
|
||||
extraModules = [];
|
||||
userConfig = {
|
||||
isNormalUser = true;
|
||||
home = "/home/mo";
|
||||
@ -50,7 +56,7 @@
|
||||
|
||||
steamdeck = {
|
||||
user = "deck";
|
||||
extraModules = [ ./hosts/steamdeck/system ];
|
||||
extraModules = [];
|
||||
userConfig = {
|
||||
isNormalUser = true;
|
||||
home = "/home/deck";
|
||||
@ -70,8 +76,6 @@
|
||||
|
||||
# Home Manager user imports
|
||||
{ home-manager.users.${hostConfig.user}.imports = [
|
||||
./hosts/${hostName}/user
|
||||
./global/user
|
||||
];
|
||||
}
|
||||
homeManagerConfig
|
||||
|
@ -0,0 +1,24 @@
|
||||
{ ... }:
|
||||
{
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
|
||||
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,22 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./pkg-customization.nix
|
||||
./pkg-desktop.nix
|
||||
./pkg-dev.nix
|
||||
./pkg-firefox.nix
|
||||
./pkg-gaming.nix
|
||||
./pkg-hardware.nix
|
||||
./pkg-media.nix
|
||||
./pkg-misc.nix
|
||||
./pkg-steam.nix
|
||||
./pkg-system.nix
|
||||
./set-boot.nix
|
||||
./set-controller.nix
|
||||
./set-desktop.nix
|
||||
./set-filesystems.nix
|
||||
./set-hardware.nix
|
||||
./set-steam.nix
|
||||
./set-systemd.nix
|
||||
];
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
kde-rounded-corners
|
||||
ibm-plex
|
||||
]);
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.displayManager.sddm.enable = true;
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
mangohud
|
||||
]);
|
||||
}
|
@ -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,6 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.xserver.enable = false;
|
||||
services.displayManager.autoLogin.enable = true;
|
||||
services.displayManager.autoLogin.user = "mo";
|
||||
}
|
@ -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,9 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./pkg-desktop.nix
|
||||
./set-customization.nix
|
||||
./set-desktop.nix
|
||||
./set-dotfiles.nix
|
||||
];
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
programs.plasma = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
home.file.".config/haruna/haruna.conf".source = ../dotfiles/haruna.conf;
|
||||
home.file.".local/share/color-schemes/BreezeDunkelFarbe.colors".source = ../dotfiles/BreezeDunkelFarbe.colors;
|
||||
home.file.".local/share/color-schemes/BreezeHellFarbe.colors".source = ../dotfiles/BreezeHellFarbe.colors;
|
||||
home.file.".config/kglobalshortcutsrc".source = ../dotfiles/kglobalshortcutsrc;
|
||||
home.file."Bilder/Hintergründe/wallpaper-nix.png".source = ../assets/wallpaper-nix.png;
|
||||
home.file.".config/kwinrc".source = ../dotfiles/kwinrc;
|
||||
home.file.".config/kwinoutputconfig.json".source = ../dotfiles/kwinoutputconfig.json;
|
||||
}
|
@ -2,9 +2,13 @@
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
ibm-plex
|
||||
mangohud
|
||||
pciutils
|
||||
aha
|
||||
lact
|
||||
kdePackages.isoimagewriter
|
||||
vesktop
|
||||
google-chrome
|
||||
teams-for-linux
|
||||
]);
|
||||
}
|
@ -2,7 +2,6 @@
|
||||
{
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
kdePackages.kate
|
||||
git
|
||||
nil
|
||||
yaml-language-server
|
10
modules/system/boot/default.nix
Normal file
10
modules/system/boot/default.nix
Normal file
@ -0,0 +1,10 @@
|
||||
{ ... }:
|
||||
{
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.plymouth.enable = true;
|
||||
boot.plymouth.theme = "bgrt";
|
||||
boot.consoleLogLevel = 0;
|
||||
boot.kernelParams = [ "quiet" "udev.log_level=0" ];
|
||||
boot.initrd.verbose = false;
|
||||
}
|
@ -1,18 +1,12 @@
|
||||
{ ... }:
|
||||
{
|
||||
jovian.steam = {
|
||||
enable = true;
|
||||
autoStart = false;
|
||||
user = "mo";
|
||||
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,5 +1,17 @@
|
||||
{ pkgs,... }:
|
||||
{
|
||||
# Install LACT Package
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
lact
|
||||
]);
|
||||
|
||||
# Enable Modprobe
|
||||
boot.extraModprobeConfig = ''
|
||||
options amdgpu ppfeaturemask=0xFFF7FFFF
|
||||
'';
|
||||
|
||||
# Enable Systemd Service
|
||||
systemd.services.lact = {
|
||||
enable = true;
|
||||
description = "AMDGPU Control Daemon";
|
18
modules/system/locale/default.nix
Normal file
18
modules/system/locale/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ ... }:
|
||||
{
|
||||
time.timeZone = "Europe/Berlin";
|
||||
i18n.defaultLocale = "de_DE.UTF-8";
|
||||
console.keyMap = "de";
|
||||
services.xserver.xkb.layout = "de";
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||
LC_MONETARY = "de_DE.UTF-8";
|
||||
LC_NAME = "de_DE.UTF-8";
|
||||
LC_NUMERIC = "de_DE.UTF-8";
|
||||
LC_PAPER = "de_DE.UTF-8";
|
||||
LC_TELEPHONE = "de_DE.UTF-8";
|
||||
LC_TIME = "de_DE.UTF-8";
|
||||
};
|
||||
}
|
6
modules/system/networking/default.nix
Normal file
6
modules/system/networking/default.nix
Normal file
@ -0,0 +1,6 @@
|
||||
{ lib, hostName, ... }:
|
||||
{
|
||||
networking.hostName = hostName;
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
networking.networkmanager.enable = true;
|
||||
}
|
7
modules/system/nixsettings/default.nix
Normal file
7
modules/system/nixsettings/default.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
}
|
30
modules/system/plasma/default.nix
Normal file
30
modules/system/plasma/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ user, pkgs, ... }:
|
||||
{
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.xserver.enable = false;
|
||||
services.displayManager.autoLogin.enable = true;
|
||||
services.displayManager.autoLogin.user = user;
|
||||
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
kde-rounded-corners
|
||||
kdePackages.kate
|
||||
kdePackages.isoimagewriter
|
||||
kdePackages.gwenview
|
||||
kdePackages.okular
|
||||
kdePackages.kdenlive
|
||||
kdePackages.elisa
|
||||
haruna
|
||||
krita
|
||||
kdePackages.kcolorchooser
|
||||
xwaylandvideobridge
|
||||
kdePackages.kfind
|
||||
kdePackages.kcalc
|
||||
kdePackages.filelight
|
||||
kdePackages.skanlite
|
||||
kdePackages.ksystemlog
|
||||
kdePackages.partitionmanager
|
||||
]);
|
||||
}
|
8
modules/system/shell/default.nix
Normal file
8
modules/system/shell/default.nix
Normal file
@ -0,0 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.zsh.enable = true;
|
||||
programs.zsh.enableCompletion = true;
|
||||
programs.zsh.ohMyZsh.enable = true;
|
||||
programs.zsh.ohMyZsh.theme = "agnoster";
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
}
|
9
modules/system/steam/default.nix
Normal file
9
modules/system/steam/default.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ ... }:
|
||||
{
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
};
|
||||
}
|
4
modules/system/systemversion/default.nix
Normal file
4
modules/system/systemversion/default.nix
Normal file
@ -0,0 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
system.stateVersion = "24.05";
|
||||
}
|
12
modules/system/upgrades/default.nix
Normal file
12
modules/system/upgrades/default.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ ... }:
|
||||
{
|
||||
system.autoUpgrade = {
|
||||
enable = true;
|
||||
dates = "04:00";
|
||||
flake = "github:Moe1369/nixos-config";
|
||||
flags = [
|
||||
"--update-input" "nixpkgs" "--commit-lock-file"
|
||||
];
|
||||
allowReboot = true;
|
||||
};
|
||||
}
|
11
modules/user/git/default.nix
Normal file
11
modules/user/git/default.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{ ... }:
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Mohamed C.";
|
||||
userEmail = "mohamed@chrayed.de";
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
};
|
||||
};
|
||||
}
|
4
modules/user/homeversion/default.nix
Normal file
4
modules/user/homeversion/default.nix
Normal file
@ -0,0 +1,4 @@
|
||||
{ ... }:
|
||||
{
|
||||
home.stateVersion = "24.05";
|
||||
}
|
@ -1,7 +1,17 @@
|
||||
{ ... }:
|
||||
{
|
||||
home.file.".config/haruna/haruna.conf".source = ../dotfiles/haruna.conf;
|
||||
home.file.".local/share/color-schemes/BreezeDunkelFarbe.colors".source = ../dotfiles/BreezeDunkelFarbe.colors;
|
||||
home.file.".local/share/color-schemes/BreezeHellFarbe.colors".source = ../dotfiles/BreezeHellFarbe.colors;
|
||||
home.file.".config/kglobalshortcutsrc".source = ../dotfiles/kglobalshortcutsrc;
|
||||
home.file."Bilder/Hintergründe/wallpaper-nix.png".source = ../assets/wallpaper-nix.png;
|
||||
home.file.".config/kwinrc".source = ../dotfiles/kwinrc;
|
||||
home.file.".config/kwinoutputconfig.json".source = ../dotfiles/kwinoutputconfig.json;
|
||||
|
||||
|
||||
programs.plasma = {
|
||||
|
||||
enable = true;
|
||||
workspace.wallpaper = "/home/mo/Bilder/Hintergründe/wallpaper-nix.png";
|
||||
kscreenlocker.appearance.wallpaper = "/home/mo/Bilder/Hintergründe/wallpaper-nix.png";
|
||||
|
Loading…
Reference in New Issue
Block a user