From 16b6623f7f673feb72db6e34c631bf096a967cd4 Mon Sep 17 00:00:00 2001 From: alisceon Date: Mon, 25 Aug 2025 16:01:00 +0200 Subject: [PATCH] we are officially on stable --- flake.lock | 21 +++++++++++---------- flake.nix | 26 +++++++++++++++++++------- home/alisceon/workstation.nix | 5 ++++- hosts/common/base.nix | 1 - hosts/common/wm/gnome.nix | 5 +++-- hosts/common/workstation.nix | 6 +----- hosts/tower/configuration.nix | 9 +++++++++ 7 files changed, 47 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index c5c495d..e90c236 100644 --- a/flake.lock +++ b/flake.lock @@ -25,42 +25,43 @@ ] }, "locked": { - "lastModified": 1754613544, - "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8576b4f..1e87405 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,14 @@ description = "NixOS configuration for all hosts"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; #"github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -17,22 +20,25 @@ pkgs = import nixpkgs { inherit system; config.allowUnfree = true; + flake.setFlakeRegistry = true; }; pkgs-unstable = import nixpkgs-unstable { inherit system; config.allowUnfree = true; + flake.setFlakeRegistry = true; + }; + sharedSpecialArgs = { + inherit pkgs-unstable; }; sharedModules = [ ./hosts/common/base.nix - { - nixpkgs.config.allowUnfree = true; - } home-manager.nixosModules.home-manager ({ config, ...}: { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit (config.networking) hostName; + inherit (config.networking) hostName; + inherit pkgs pkgs-unstable; }; # end extraSpecialArgs home-manager.backupFileExtension = "backup"; }) # end home manager @@ -42,6 +48,8 @@ nixosConfigurations = { electra = nixpkgs.lib.nixosSystem { inherit system; + inherit pkgs; + specialArgs = sharedSpecialArgs // {}; modules = sharedModules ++ [ ./hosts/common/workstation.nix ./hosts/electra/configuration.nix @@ -58,6 +66,8 @@ }; # end electra tower = nixpkgs.lib.nixosSystem { inherit system; + inherit pkgs; + specialArgs = sharedSpecialArgs // {}; modules = sharedModules ++ [ ./hosts/common/workstation.nix ./hosts/tower/configuration.nix @@ -74,6 +84,8 @@ }; # end tower tesla-nixos = nixpkgs.lib.nixosSystem { inherit system; + inherit pkgs; + specialArgs = sharedSpecialArgs // {}; modules = sharedModules ++ [ ./hosts/common/server.nix ./hosts/tesla-nixos/configuration.nix diff --git a/home/alisceon/workstation.nix b/home/alisceon/workstation.nix index 9689f81..d9d7d06 100644 --- a/home/alisceon/workstation.nix +++ b/home/alisceon/workstation.nix @@ -7,6 +7,9 @@ pkgs.firefoxpwa ]; }; # end firefox + chromium = { + enable = true; + }; # end chromium direnv = { enable = true; silent = true; @@ -14,7 +17,7 @@ }; # end programs # obsidian special case - programs.obsidian.enable = true; + # programs.obsidian.enable = true; # overide broken config xdg.configFile."obsidian/obsidian.json".source = lib.mkForce ../conf/obsidian.json; diff --git a/hosts/common/base.nix b/hosts/common/base.nix index 251197b..15d6fd7 100644 --- a/hosts/common/base.nix +++ b/hosts/common/base.nix @@ -93,7 +93,6 @@ # Languages python3 - # Virtualization podman ]; # end systemPackages diff --git a/hosts/common/wm/gnome.nix b/hosts/common/wm/gnome.nix index 727df47..e1f5639 100644 --- a/hosts/common/wm/gnome.nix +++ b/hosts/common/wm/gnome.nix @@ -4,11 +4,12 @@ security.sudo.wheelNeedsPassword = false; services = { - displayManager = { + # Remove xserver. when the patch comes + xserver.displayManager = { gdm.enable = true; gdm.wayland = true; }; - desktopManager.gnome.enable = true; + xserver.desktopManager.gnome.enable = true; gnome = { gnome-keyring.enable = true; gnome-initial-setup.enable = false; diff --git a/hosts/common/workstation.nix b/hosts/common/workstation.nix index d4e7890..b8ad8e8 100644 --- a/hosts/common/workstation.nix +++ b/hosts/common/workstation.nix @@ -13,11 +13,6 @@ jack.enable = true; }; xserver.xkb.layout = "se"; - displayManager = { - gdm.enable = true; - gdm.wayland = true; - }; - desktopManager.gnome.enable = true; gnome = { gnome-keyring.enable = true; gnome-initial-setup.enable = false; @@ -42,6 +37,7 @@ # Browser firefox firefoxpwa + chromium # Development vscode diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix index a1f5c99..5d6d63a 100644 --- a/hosts/tower/configuration.nix +++ b/hosts/tower/configuration.nix @@ -28,6 +28,9 @@ }; # end boot hardware = { graphics.enable = true; + graphics.extraPackages = with pkgs; [ + nvidia-vaapi-driver + ]; # end graphics.extraPackages nvidia = { modesetting.enable = true; powerManagement.enable = false; @@ -41,4 +44,10 @@ xserver.videoDrivers = [ "nvidia" ]; openssh.enable = true; }; # end services + environment.variables = { + GBM_BACKEND = "nvidia-drm"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + MOZ_DISABLE_RDD_SANDBOX= "1" ; + LIBVA_DRIVER_NAME = "nvidia"; + }; } # end file