Compare commits
3 commits
dafb3dbb1c
...
f38abd1320
Author | SHA1 | Date | |
---|---|---|---|
|
f38abd1320 | ||
|
d8a5045f61 | ||
|
06d2aa59d1 |
11 changed files with 42 additions and 138 deletions
|
@ -48,7 +48,6 @@
|
|||
{ name = "nixos-test"; system = "x86_64-linux"; }
|
||||
{ name = "perso-laptop"; system = "x86_64-linux"; }
|
||||
{ name = "perso-desktop"; system = "x86_64-linux"; }
|
||||
{ name = "pro-laptop"; system = "x86_64-linux"; }
|
||||
];
|
||||
in {
|
||||
nixosConfigurations = nixpkgs.lib.foldl (c: s:
|
||||
|
|
|
@ -36,23 +36,31 @@
|
|||
};
|
||||
|
||||
modules.system = {
|
||||
desktop = {
|
||||
plasma.enable = true;
|
||||
};
|
||||
|
||||
server = {
|
||||
docker.enable = true;
|
||||
openssh.enable = true;
|
||||
};
|
||||
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
gamingKernel.enable = true;
|
||||
keymaps.layout = "us";
|
||||
pipewire.enable = true;
|
||||
plymouth.enable = true;
|
||||
printing.enable = true;
|
||||
waydroid.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Run containers
|
||||
virtualisation.oci-containers.containers."hello" = {
|
||||
image = "docker.io/nginxdemos/hello:latest";
|
||||
|
||||
ports = [
|
||||
"9000:80/tcp"
|
||||
];
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts."hello.local" = {
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:9000";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
modules.system = {
|
||||
apps = {
|
||||
flatpak.enable = true;
|
||||
steam.enable = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -33,6 +33,10 @@
|
|||
};
|
||||
|
||||
modules.system = {
|
||||
apps = {
|
||||
flatpak.enable = true;
|
||||
};
|
||||
|
||||
desktop = {
|
||||
plasma.enable = true;
|
||||
};
|
||||
|
|
|
@ -1,55 +0,0 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
../../modules/system
|
||||
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.hostName = "nixos-laptop-pro"; # Define your hostname.
|
||||
|
||||
# hardware.nvidia.prime = {
|
||||
# offload = {
|
||||
# enable = true;
|
||||
# enableOffloadCmd = true;
|
||||
# };
|
||||
#
|
||||
# # Make sure to use the correct Bus ID values for your system!
|
||||
# # information bus: pci@0000:00:02.0
|
||||
# intelBusId = "PCI:0:2:0";
|
||||
# # information bus: pci@0000:01:00.0
|
||||
# nvidiaBusId = "PCI:1:0:0";
|
||||
# };
|
||||
|
||||
modules.system = {
|
||||
desktop = {
|
||||
plasma.enable = true;
|
||||
};
|
||||
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
gamingKernel.enable = true;
|
||||
keymaps.layout = "fr";
|
||||
nvidia.enable = true;
|
||||
pipewire.enable = true;
|
||||
plymouth.enable = true;
|
||||
printing.enable = true;
|
||||
waydroid.enable = true;
|
||||
};
|
||||
|
||||
server = {
|
||||
distrobox.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/98137863-d1f5-4286-9385-42abf74b44a6";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/51DB-A393";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/7b49cd63-3b19-43bb-acc9-0d27d92152b9"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
|
@ -1,30 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/home
|
||||
];
|
||||
|
||||
modules.home = {
|
||||
apps = {
|
||||
chromium.enable = true;
|
||||
firefox.enable = true;
|
||||
flatpak.enable = true;
|
||||
jetbrainsToolbox.enable = true;
|
||||
kitty.enable = true;
|
||||
};
|
||||
|
||||
editors = {
|
||||
emacs.enable = true;
|
||||
vscode.enable = true;
|
||||
};
|
||||
|
||||
shell = {
|
||||
zsh.enable = true;
|
||||
atuin.enable = true;
|
||||
direnv.enable = true;
|
||||
git.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
./flatpak
|
||||
./steam
|
||||
];
|
||||
}
|
||||
|
|
17
modules/system/apps/flatpak/default.nix
Normal file
17
modules/system/apps/flatpak/default.nix
Normal file
|
@ -0,0 +1,17 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.system.apps.flatpak;
|
||||
in
|
||||
{
|
||||
options.modules.system.apps.flatpak = {
|
||||
enable = mkEnableOption ''
|
||||
Enable flatpak
|
||||
'';
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.flatpak.enable = true; # Important can't be enabled from home-manager
|
||||
};
|
||||
}
|
|
@ -65,8 +65,6 @@
|
|||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
};
|
||||
|
||||
services.flatpak.enable = true; # Important can't be enabled from home-manager
|
||||
|
||||
# Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed.
|
||||
# Require https://github.com/symphorien/nixseparatedebuginfod?tab=readme-ov-file#gdb
|
||||
services.nixseparatedebuginfod.enable = true;
|
||||
|
|
|
@ -14,6 +14,7 @@ in
|
|||
virtualisation.docker = {
|
||||
enable = true;
|
||||
};
|
||||
virtualisation.oci-containers.backend = "docker";
|
||||
|
||||
users.users.florian.extraGroups = [ "docker" ];
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue