add devenv to blarog

README.md

@@ -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>
 ```
 

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775425411,
+        "lastModified": 1779506708,
-        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
+        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
+        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
         "type": "github"
       },
       "original": {
@@ -21,13 +21,28 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1777402031,
+        "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776734388,
+        "lastModified": 1779467186,
-        "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
+        "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
+        "rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
         "type": "github"
       },
       "original": {
@@ -39,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1776329215,
+        "lastModified": 1779694939,
-        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
+        "narHash": "sha256-Ly4j75O8ICaSQx3uxPnwk2x7PMF0XQvn5r0c3yBA7FI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "rev": "f9d8b65950353691ab56561e7c73d2e1063d810b",
         "type": "github"
       },
       "original": {
@@ -56,6 +71,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }

flake.nix

@@ -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.

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
       ];

systems/balrog/default.nix

@@ -0,0 +1,56 @@
+# 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
+    ];
+
+  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?
+}

systems/balrog/hardware-configuration.nix

@@ -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;
+}

systems/gandalf/default.nix

@@ -23,8 +23,11 @@
       ../modules/qbittorrent.nix
       ../modules/gimp.nix
       ../modules/openscad.nix
-      ../modules/flatpak.nix
+      ../modules/bambu-studio-flatpak.nix
+      ../modules/arduino-ide.nix
     ];
+  
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

systems/modules/arduino-ide.nix

@@ -1,7 +1,8 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
-    bambu-studio
+    arduino-ide
   ];
 }
+

systems/modules/bambu-studio-flatpak.nix

@@ -0,0 +1,8 @@
+{ pkgs, ...}:
+
+{
+  services.flatpak.enable = true;
+  services.flatpak.packages = [
+    "com.bambulab.BambuStudio"
+  ];
+}

systems/modules/devenv.nix

@@ -0,0 +1,10 @@
+
+{ config, pkgsUnstable, ... } :
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    devenv
+  ];
+
+  nix.settings.trusted-users = [ "root" "avravels" ];
+}

systems/modules/flatpak.nix

@@ -1,5 +0,0 @@
-{ pkgs, ...}: 
-
-{
-  services.flatpak.enable = true;
-}

systems/modules/home/programs/git.nix

@@ -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;

systems/modules/home/programs/tmux.nix

@@ -1,5 +1,8 @@
 { pkgs, ... }:
 
 {
-  programs.tmux.enable = true;
+  programs.tmux = { 
+    enable = true;
+    mouse = true;
+  };
 }

systems/modules/home/programs/vscode.nix

@@ -1,10 +1,10 @@
-{ pkgs, ... }:
+{ pkgs, pkgsUnstable, ... }:
 
 {
   programs.vscode = {
     enable = true;
 
-    package = pkgs.vscode.fhs;
+    package = pkgsUnstable.vscode.fhs;
     profiles.default.extensions = with pkgs.vscode-extensions; [
       ms-dotnettools.csharp
       ms-dotnettools.csdevkit

systems/modules/home/wm/hyprland.nix

@@ -27,7 +27,8 @@ in
       settings = {
         ### MONITOR
         monitor = [
-          "DP-3,1920x1080,auto,1"
+          "eDP-1,1920x1200,auto,1"
+          "DP-3,2440x1440,auto,1"
           ",preferred,auto,1"
         ];
 

systems/modules/ollama.nix

@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ pkgsUnstable, ... }:
 
 {
   services.ollama = {
     enable = true;
-    package = pkgs.ollama-cuda;
+    package = pkgsUnstable.ollama-cuda;
   };
 
   services.open-webui.enable = true;

systems/modules/users.nix

@@ -5,7 +5,7 @@
     initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
     packages = with pkgs; [
       home-manager
       legcord

systems/work/default.nix

@@ -24,6 +24,8 @@
       ../modules/enova.nix
     ];
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;