Compare commits
8 Commits
bd857c77dd
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f0c7750de | |||
| 8afeda2e9a | |||
| 93431732c5 | |||
| affe3c9b79 | |||
| 0a46b57485 | |||
| e8ec456ffd | |||
|
|
1b75b1bc9a | ||
| f20066a0af |
@@ -10,6 +10,7 @@ Each system has its own dedicated configuration module.
|
||||
| **gandalf** | Personal system configuration for `gandalf`. |
|
||||
| **frodo** | Personal system configuration for `frodo`. |
|
||||
| **legolas** | Personal system configuration for `legolas`. |
|
||||
| **balrog** | Personal system configuration for `balrog`. |
|
||||
| **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:
|
||||
|
||||
```bash
|
||||
# Replace <system> with gandalf, frodo, legolas, or work
|
||||
# Replace <system> with gandalf, frodo, legolas, balrog or work
|
||||
sudo nixos-rebuild switch --flake .#<system>
|
||||
```
|
||||
|
||||
|
||||
28
flake.lock
generated
28
flake.lock
generated
@@ -21,13 +21,28 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1777229239,
|
||||
"narHash": "sha256-OwSaWqlBdKn8QIa7BrPtJmlrr46U7AuwMc/toDKuMZw=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "3f1d78b63b6af353c0685b8a7411c04d980426e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1776734388,
|
||||
"narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
|
||||
"lastModified": 1777077449,
|
||||
"narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
|
||||
"rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -39,11 +54,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1776329215,
|
||||
"narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
|
||||
"lastModified": 1776949667,
|
||||
"narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b86751bc4085f48661017fa226dee99fab6c651b",
|
||||
"rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -56,6 +71,7 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
}
|
||||
|
||||
@@ -14,6 +14,11 @@
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nix-flatpak = {
|
||||
url = "github:gmodena/nix-flatpak";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
# This strange syntax is a workaround for the intentional limitations of `flake.nix` files.
|
||||
|
||||
22
outputs.nix
22
outputs.nix
@@ -1,4 +1,4 @@
|
||||
{ nixpkgs, nixpkgs-unstable, home-manager, ... }:
|
||||
{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
|
||||
|
||||
let
|
||||
mkPkgsUnstable = system: import nixpkgs-unstable {
|
||||
@@ -13,8 +13,10 @@ in
|
||||
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/gandalf
|
||||
];
|
||||
@@ -23,8 +25,10 @@ in
|
||||
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/frodo
|
||||
];
|
||||
@@ -33,18 +37,34 @@ in
|
||||
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/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 {
|
||||
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/work
|
||||
];
|
||||
|
||||
52
systems/balrog/default.nix
Normal file
52
systems/balrog/default.nix
Normal file
@@ -0,0 +1,52 @@
|
||||
# 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
|
||||
];
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -23,7 +23,7 @@
|
||||
../modules/qbittorrent.nix
|
||||
../modules/gimp.nix
|
||||
../modules/openscad.nix
|
||||
../modules/flatpak.nix
|
||||
../modules/bambu-studio-flatpak.nix
|
||||
];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
8
systems/modules/bambu-studio-flatpak.nix
Normal file
8
systems/modules/bambu-studio-flatpak.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{ pkgs, ...}:
|
||||
|
||||
{
|
||||
services.flatpak.enable = true;
|
||||
services.flatpak.packages = [
|
||||
"com.bambulab.BambuStudio"
|
||||
];
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
{ config, pkgs, ... } :
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
bambu-studio
|
||||
];
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{ pkgs, ...}:
|
||||
|
||||
{
|
||||
services.flatpak.enable = true;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, pkgs, config, ... }:
|
||||
{ lib, pkgsUnstable, config, ... }:
|
||||
|
||||
{
|
||||
options.home.git = {
|
||||
@@ -18,6 +18,7 @@
|
||||
config = {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
package = pkgsUnstable.git;
|
||||
settings.user = {
|
||||
name = config.home.git.userName;
|
||||
email = config.home.git.userEmail;
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.tmux.enable = true;
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
mouse = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgsUnstable, ... }:
|
||||
|
||||
{
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
package = pkgs.ollama-cuda;
|
||||
package = pkgsUnstable.ollama-cuda;
|
||||
};
|
||||
|
||||
services.open-webui.enable = true;
|
||||
|
||||
Reference in New Issue
Block a user