Compare commits
17 Commits
feature/ba
...
98c35e268b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
98c35e268b | ||
|
|
65784f1228 | ||
| 5878b54ff3 | |||
| 8e552b7c4d | |||
| 6dd46c0844 | |||
| f8bec207a9 | |||
| 2b54d7907f | |||
|
|
170cd1ece9 | ||
| 2ba7c69389 | |||
| a705cac5de | |||
| 2f0c7750de | |||
| 8afeda2e9a | |||
| 93431732c5 | |||
| affe3c9b79 | |||
| 0a46b57485 | |||
| e8ec456ffd | |||
| f20066a0af |
@@ -10,6 +10,7 @@ Each system has its own dedicated configuration module.
|
|||||||
| **gandalf** | Personal system configuration for `gandalf`. |
|
| **gandalf** | Personal system configuration for `gandalf`. |
|
||||||
| **frodo** | Personal system configuration for `frodo`. |
|
| **frodo** | Personal system configuration for `frodo`. |
|
||||||
| **legolas** | Personal system configuration for `legolas`. |
|
| **legolas** | Personal system configuration for `legolas`. |
|
||||||
|
| **balrog** | Personal system configuration for `balrog`. |
|
||||||
| **work** | Work-oriented system configuration for `work`. |
|
| **work** | Work-oriented system configuration for `work`. |
|
||||||
|
|
||||||
|
|
||||||
@@ -18,7 +19,7 @@ Each system has its own dedicated configuration module.
|
|||||||
To rebuild and switch to a specific system:
|
To rebuild and switch to a specific system:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Replace <system> with gandalf, frodo, legolas, or work
|
# Replace <system> with gandalf, frodo, legolas, balrog or work
|
||||||
sudo nixos-rebuild switch --flake .#<system>
|
sudo nixos-rebuild switch --flake .#<system>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
24
flake.lock
generated
24
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775425411,
|
"lastModified": 1777851538,
|
||||||
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
|
"narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
|
"rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -23,11 +23,11 @@
|
|||||||
},
|
},
|
||||||
"nix-flatpak": {
|
"nix-flatpak": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776625032,
|
"lastModified": 1777402031,
|
||||||
"narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=",
|
"narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=",
|
||||||
"owner": "gmodena",
|
"owner": "gmodena",
|
||||||
"repo": "nix-flatpak",
|
"repo": "nix-flatpak",
|
||||||
"rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc",
|
"rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -38,11 +38,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776734388,
|
"lastModified": 1778003029,
|
||||||
"narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
|
"narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
|
"rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -54,11 +54,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776949667,
|
"lastModified": 1778274207,
|
||||||
"narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
|
"narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
|
"rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
12
outputs.nix
12
outputs.nix
@@ -45,6 +45,18 @@ in
|
|||||||
./systems/legolas
|
./systems/legolas
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
"balrog" = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
pkgsUnstable = mkPkgsUnstable "x86_64-linux";
|
||||||
|
nixFlatpak = nix-flatpak;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
nix-flatpak.nixosModules.nix-flatpak
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
./systems/balrog
|
||||||
|
];
|
||||||
|
};
|
||||||
"work" = nixpkgs.lib.nixosSystem {
|
"work" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
|
|||||||
55
systems/balrog/default.nix
Normal file
55
systems/balrog/default.nix
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
# Edit this configuration file to define what should be installed on
|
||||||
|
# your system. Help is available in the configuration.nix(5) man page, on
|
||||||
|
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||||
|
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ # Include the results of the hardware scan.
|
||||||
|
./hardware-configuration.nix
|
||||||
|
../modules/home-manager.nix
|
||||||
|
../modules/common.nix
|
||||||
|
../modules/users.nix
|
||||||
|
../modules/locales.nix
|
||||||
|
../modules/services.nix
|
||||||
|
../modules/programs.nix
|
||||||
|
../modules/docker.nix
|
||||||
|
../modules/printing.nix
|
||||||
|
../modules/bambu-studio-flatpak.nix
|
||||||
|
../modules/arduino-ide.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
|
boot.loader.systemd-boot.enable = false;
|
||||||
|
boot.loader = {
|
||||||
|
efi = {
|
||||||
|
canTouchEfiVariables = true;
|
||||||
|
efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
|
||||||
|
};
|
||||||
|
grub = {
|
||||||
|
efiSupport = true;
|
||||||
|
device = "nodev";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.hostName = "balrog";
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
|
||||||
|
|
||||||
|
hardware.enableAllFirmware = true;
|
||||||
|
|
||||||
|
boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
|
||||||
|
|
||||||
|
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||||
|
broadcom_sta
|
||||||
|
];
|
||||||
|
|
||||||
|
nixpkgs.config = {
|
||||||
|
allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"];
|
||||||
|
};
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
services.blueman.enable = true;
|
||||||
|
system.stateVersion = "25.11"; # Did you read the comment?
|
||||||
|
}
|
||||||
31
systems/balrog/hardware-configuration.nix
Normal file
31
systems/balrog/hardware-configuration.nix
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
# 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" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/A202-E19C";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
@@ -24,7 +24,10 @@
|
|||||||
../modules/gimp.nix
|
../modules/gimp.nix
|
||||||
../modules/openscad.nix
|
../modules/openscad.nix
|
||||||
../modules/bambu-studio-flatpak.nix
|
../modules/bambu-studio-flatpak.nix
|
||||||
|
../modules/arduino-ide.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|||||||
8
systems/modules/arduino-ide.nix
Normal file
8
systems/modules/arduino-ide.nix
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
arduino-ide
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.tmux.enable = true;
|
programs.tmux = {
|
||||||
|
enable = true;
|
||||||
|
mouse = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, pkgsUnstable, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
package = pkgs.vscode.fhs;
|
package = pkgsUnstable.vscode.fhs;
|
||||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||||
ms-dotnettools.csharp
|
ms-dotnettools.csharp
|
||||||
ms-dotnettools.csdevkit
|
ms-dotnettools.csdevkit
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ in
|
|||||||
settings = {
|
settings = {
|
||||||
### MONITOR
|
### MONITOR
|
||||||
monitor = [
|
monitor = [
|
||||||
"DP-3,2440x1440,auto,1"
|
"eDP-1,1920x1200,auto,1"
|
||||||
|
"DP-3,1920x1080,auto,1"
|
||||||
",preferred,auto,1"
|
",preferred,auto,1"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgsUnstable, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.ollama-cuda;
|
package = pkgsUnstable.ollama-cuda;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.open-webui.enable = true;
|
services.open-webui.enable = true;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
initialPassword = "welcome";
|
initialPassword = "welcome";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Armel van Ravels";
|
description = "Armel van Ravels";
|
||||||
extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
|
extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
home-manager
|
home-manager
|
||||||
legcord
|
legcord
|
||||||
|
|||||||
@@ -24,6 +24,8 @@
|
|||||||
../modules/enova.nix
|
../modules/enova.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user