Drop bambu-studio and add flatpak

Reviewed-on: #15

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774875830,
+        "lastModified": 1775425411,
-        "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=",
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7afd8cebb99e25a64a745765920e663478eb8830",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774799055,
+        "lastModified": 1776734388,
-        "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
+        "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
+        "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
         "type": "github"
       },
       "original": {
@@ -37,10 +37,27 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1776329215,
+        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },

flake.nix

@@ -6,6 +6,10 @@
       url = "github:nixos/nixpkgs/nixos-25.11";
     };
 
+    nixpkgs-unstable = {
+      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    };
+
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";

outputs.nix

@@ -1,9 +1,19 @@
-{ nixpkgs, home-manager, ... }:
+{ nixpkgs, nixpkgs-unstable, home-manager, ... }:
+
+let
+  mkPkgsUnstable = system: import nixpkgs-unstable {
+    inherit system;
+    config.allowUnfree = true;
+  };
+in
 
 {
   nixosConfigurations = {
     "gandalf" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+      };
       modules = [
         home-manager.nixosModules.home-manager
         ./systems/gandalf
@@ -11,6 +21,9 @@
     };
     "frodo" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+      };
       modules = [
         home-manager.nixosModules.home-manager
         ./systems/frodo
@@ -18,6 +31,9 @@
     };
     "legolas" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+      };
       modules = [
         home-manager.nixosModules.home-manager
         ./systems/legolas
@@ -25,6 +41,9 @@
     };
     "work" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = {
+        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+      };
       modules = [
         home-manager.nixosModules.home-manager
         ./systems/work

systems/gandalf/default.nix

@@ -22,6 +22,8 @@
       ../modules/wireguard.nix
       ../modules/qbittorrent.nix
       ../modules/gimp.nix
+      ../modules/openscad.nix
+      ../modules/flatpak.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -33,7 +35,7 @@
 
   home-manager.users.avravels.home.hyprland.execOnce = [
     "waybar"
-    "[workspace 1 silent] kitty tmux"
+    "[workspace 1 silent] kitty"
     "[workspace 1 silent] spotify"
     "[workspace 2 silent] firefox"
   ];

systems/modules/bambu-studio.nix

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

systems/modules/common.nix

@@ -10,9 +10,9 @@
   environment.systemPackages = with pkgs; [
     chromium
     gnumake
-    git
     jetbrains-toolbox
     fastfetch
+    jq
   ];
 
   security.rtkit.enable = true;

systems/modules/enova.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  services.dnsmasq = {
+    enable = true;
+    
+    settings = {
+      server = [ "1.1.1.1" "8.8.8.8" ];
+      address = [ "/.enova.local/127.0.0.1" ];
+    };
+  };
+}

systems/modules/flatpak.nix

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

systems/modules/home-manager.nix

@@ -1,9 +1,12 @@
-{ pkgs, ... }:
+{ pkgs, pkgsUnstable, ... }:
 
 {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
+    extraSpecialArgs = {
+      inherit pkgsUnstable;
+    };
 
     users.avravels = import home/home.nix;
   };

systems/modules/home/wm/hyprland.nix

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

systems/modules/home/wm/hyprpaper.nix

@@ -3,6 +3,7 @@
 let
   wallpaper = builtins.toString ../backgrounds/monkey.jpg;
   wallpaper2 = builtins.toString ../backgrounds/bird.jpg;
+  wallpaper3 = builtins.toString ../backgrounds/nix.png;
 in
 {
   services.hyprpaper = {
@@ -12,10 +13,10 @@ in
       preload = [
         wallpaper
         wallpaper2
+        wallpaper3
       ];
       wallpaper = [
-        "DP-2,${wallpaper2}"
+        ",${wallpaper3}"
-        ",${wallpaper}"
       ];
     };
   };

systems/modules/jq.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... } :
+
+{
+  environment.systemPackages = with pkgs; [
+    jq
+  ];
+}

systems/modules/openscad.nix

@@ -0,0 +1,8 @@
+
+{ config, pkgs, ... } :
+
+{
+  environment.systemPackages = with pkgs; [
+    openscad
+  ];
+}

systems/modules/users.nix

@@ -2,6 +2,7 @@
 
 {
   users.users.avravels = {
+    initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
     extraGroups = [ "networkmanager" "wheel" "libvirtd" ];

systems/work/default.nix

@@ -20,6 +20,8 @@
       ../modules/remmina.nix
       ../modules/postman.nix
       ../modules/gimp.nix
+      ../modules/jq.nix
+      ../modules/enova.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -33,13 +35,19 @@
 
   networking.hostName = "laptop-armel";
 
-  home-manager.users.avravels.home.hyprland.execOnce = [ "waybar" ];
+  home-manager.users.avravels.home.hyprland.execOnce = [
+    "waybar"
+    "[workspace 1 silent] kitty"
+    "[workspace 2 silent] firefox"
+    "[workspace 2 silent] teams-for-linux"
+    "[workspace 3 silent] spotify"
+  ];
 
   home-manager.users.avravels.home.git.userName = "Armel van Ravels";
   home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl";
 
   networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.nameservers = [ "127.0.0.1" "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
   networking.firewall.enable = false;
 
   hardware.graphics.enable = true;