Compare commits
24 Commits
feature/ba
...
feature/26
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c2c5fbecf | ||
| 6593978a74 | |||
|
|
93d29bbdb3 | ||
| e01ac689f2 | |||
|
|
5ff41ad33b | ||
| c20adcd820 | |||
| 71dd48ff08 | |||
|
|
45fef55476 | ||
|
|
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>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
28
flake.lock
generated
28
flake.lock
generated
@@ -7,27 +7,27 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775425411,
|
"lastModified": 1781184346,
|
||||||
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
|
"narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
|
"rev": "ea6d221d7aa85652d014b6f719dddf036037515b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.11",
|
"ref": "release-26.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-flatpak": {
|
"nix-flatpak": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776625032,
|
"lastModified": 1780908363,
|
||||||
"narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=",
|
"narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
|
||||||
"owner": "gmodena",
|
"owner": "gmodena",
|
||||||
"repo": "nix-flatpak",
|
"repo": "nix-flatpak",
|
||||||
"rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc",
|
"rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -38,27 +38,27 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776734388,
|
"lastModified": 1780902259,
|
||||||
"narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
|
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
|
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776949667,
|
"lastModified": 1781141223,
|
||||||
"narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
|
"narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
|
"rev": "b503dde361500433ca25a32e8f4d218bf58fb659",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
url = "github:nixos/nixpkgs/nixos-25.11";
|
url = "github:nixos/nixpkgs/nixos-26.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs-unstable = {
|
nixpkgs-unstable = {
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.11";
|
url = "github:nix-community/home-manager/release-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
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 = {
|
||||||
|
|||||||
57
systems/balrog/default.nix
Normal file
57
systems/balrog/default.nix
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
# 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
|
||||||
|
../modules/devenv.nix
|
||||||
|
../modules/bitwarden.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,11 @@
|
|||||||
../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
|
||||||
|
../modules/bitwarden.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;
|
||||||
@@ -32,6 +36,7 @@
|
|||||||
networking.hostName = "gandalf";
|
networking.hostName = "gandalf";
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
|
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
|
||||||
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
home-manager.users.avravels.home.hyprland.execOnce = [
|
home-manager.users.avravels.home.hyprland.execOnce = [
|
||||||
"waybar"
|
"waybar"
|
||||||
|
|||||||
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
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
12
systems/modules/bitwarden.nix
Normal file
12
systems/modules/bitwarden.nix
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"electron-39.8.10"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
bitwarden-desktop
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
10
systems/modules/devenv.nix
Normal file
10
systems/modules/devenv.nix
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
|
||||||
|
{ config, pkgsUnstable, ... } :
|
||||||
|
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgsUnstable; [
|
||||||
|
devenv
|
||||||
|
];
|
||||||
|
|
||||||
|
nix.settings.trusted-users = [ "root" "avravels" ];
|
||||||
|
}
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./other/fonts.nix
|
./other/fonts.nix
|
||||||
./programs/bitwarden.nix
|
# ./programs/bitwarden.nix
|
||||||
./programs/kitty.nix
|
./programs/kitty.nix
|
||||||
./programs/zsh.nix
|
./programs/zsh.nix
|
||||||
./programs/direnv.nix
|
./programs/direnv.nix
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.tmux.enable = true;
|
programs.tmux = {
|
||||||
|
enable = true;
|
||||||
|
mouse = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,24 @@
|
|||||||
{ 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
|
||||||
ms-dotnettools.vscode-dotnet-runtime
|
ms-dotnettools.vscode-dotnet-runtime
|
||||||
mkhl.direnv # Direnv integration for VSCode
|
mkhl.direnv # Direnv integration for VSCode
|
||||||
catppuccin.catppuccin-vsc
|
catppuccin.catppuccin-vsc
|
||||||
vscodevim.vim
|
bmewburn.vscode-intelephense-client
|
||||||
|
continue.continue
|
||||||
];
|
];
|
||||||
|
|
||||||
profiles.default.userSettings = {
|
profiles.default.userSettings = {
|
||||||
"editor.lineNumbers" = "relative";
|
"editor.lineNumbers" = "relative";
|
||||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||||
|
"workbench.editor.enablePreview" = false;
|
||||||
"direnv.restart.automatic" = true;
|
"direnv.restart.automatic" = true;
|
||||||
"terminal.integrated.defaultProfile.linux" = "zsh";
|
"terminal.integrated.defaultProfile.linux" = "zsh";
|
||||||
"terminal.integrated.profiles.linux" = {
|
"terminal.integrated.profiles.linux" = {
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ in
|
|||||||
settings = {
|
settings = {
|
||||||
### MONITOR
|
### MONITOR
|
||||||
monitor = [
|
monitor = [
|
||||||
|
"eDP-1,1920x1200,auto,1"
|
||||||
"DP-3,2440x1440,auto,1"
|
"DP-3,2440x1440,auto,1"
|
||||||
",preferred,auto,1"
|
",preferred,auto,1"
|
||||||
];
|
];
|
||||||
@@ -68,7 +69,7 @@ in
|
|||||||
shadow = {
|
shadow = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
color = "rgba(00000055)";
|
color = "rgba(00000055)";
|
||||||
ignore_window = true;
|
#ignore_window = true;
|
||||||
offset = "0 15";
|
offset = "0 15";
|
||||||
range = 100;
|
range = 100;
|
||||||
render_power = 2;
|
render_power = 2;
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgsUnstable, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.ollama-cuda;
|
package = pkgsUnstable.ollama-cuda;
|
||||||
};
|
};
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -22,8 +22,12 @@
|
|||||||
../modules/gimp.nix
|
../modules/gimp.nix
|
||||||
../modules/jq.nix
|
../modules/jq.nix
|
||||||
../modules/enova.nix
|
../modules/enova.nix
|
||||||
|
../modules/devenv.nix
|
||||||
|
../modules/bitwarden.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;
|
||||||
|
|
||||||
@@ -32,7 +36,6 @@
|
|||||||
boot.initrd.systemd.enable = true;
|
boot.initrd.systemd.enable = true;
|
||||||
|
|
||||||
programs.nix-ld.enable = true;
|
programs.nix-ld.enable = true;
|
||||||
|
|
||||||
networking.hostName = "laptop-armel";
|
networking.hostName = "laptop-armel";
|
||||||
|
|
||||||
home-manager.users.avravels.home.hyprland.execOnce = [
|
home-manager.users.avravels.home.hyprland.execOnce = [
|
||||||
|
|||||||
Reference in New Issue
Block a user