alisceon/nixos_config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

we are officially on stable

Browse source
This commit is contained in:
alisceon 2025-08-25 16:01:00 +02:00
parent c376b4db13
commit 16b6623f7f
7 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.lock generated
View file

@ -25,42 +25,43 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754613544, "lastModified": 1755928099,
"narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", "rev": "4a44fb9f7555da362af9d499817084f4288a957f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1754498491, "lastModified": 1755922037,
"narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1754498491, "lastModified": 1755615617,
"narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github" "type": "github"
}, },
"original": { "original": {

24
flake.nix
View file

@ -2,11 +2,14 @@
description = "NixOS configuration for all hosts"; description = "NixOS configuration for all hosts";
inputs = { 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"; 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 = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
@ -17,22 +20,25 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
flake.setFlakeRegistry = true;
}; };
pkgs-unstable = import nixpkgs-unstable { pkgs-unstable = import nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
flake.setFlakeRegistry = true;
};
sharedSpecialArgs = {
inherit pkgs-unstable;
}; };
sharedModules = [ sharedModules = [
./hosts/common/base.nix ./hosts/common/base.nix
{
nixpkgs.config.allowUnfree = true;
}
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
({ config, ...}: { ({ config, ...}: {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit (config.networking) hostName; inherit (config.networking) hostName;
inherit pkgs pkgs-unstable;
}; # end extraSpecialArgs }; # end extraSpecialArgs
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
}) # end home manager }) # end home manager
@ -42,6 +48,8 @@
nixosConfigurations = { nixosConfigurations = {
electra = nixpkgs.lib.nixosSystem { electra = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
inherit pkgs;
specialArgs = sharedSpecialArgs // {};
modules = sharedModules ++ [ modules = sharedModules ++ [
./hosts/common/workstation.nix ./hosts/common/workstation.nix
./hosts/electra/configuration.nix ./hosts/electra/configuration.nix
@ -58,6 +66,8 @@
}; # end electra }; # end electra
tower = nixpkgs.lib.nixosSystem { tower = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
inherit pkgs;
specialArgs = sharedSpecialArgs // {};
modules = sharedModules ++ [ modules = sharedModules ++ [
./hosts/common/workstation.nix ./hosts/common/workstation.nix
./hosts/tower/configuration.nix ./hosts/tower/configuration.nix
@ -74,6 +84,8 @@
}; # end tower }; # end tower
tesla-nixos = nixpkgs.lib.nixosSystem { tesla-nixos = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
inherit pkgs;
specialArgs = sharedSpecialArgs // {};
modules = sharedModules ++ [ modules = sharedModules ++ [
./hosts/common/server.nix ./hosts/common/server.nix
./hosts/tesla-nixos/configuration.nix ./hosts/tesla-nixos/configuration.nix

5
home/alisceon/workstation.nix
View file

@ -7,6 +7,9 @@
pkgs.firefoxpwa pkgs.firefoxpwa
]; ];
}; # end firefox }; # end firefox
chromium = {
enable = true;
}; # end chromium
direnv = { direnv = {
enable = true; enable = true;
silent = true; silent = true;
@ -14,7 +17,7 @@
}; # end programs }; # end programs
# obsidian special case # obsidian special case
programs.obsidian.enable = true; # programs.obsidian.enable = true;
# overide broken config # overide broken config
xdg.configFile."obsidian/obsidian.json".source = lib.mkForce ../conf/obsidian.json; xdg.configFile."obsidian/obsidian.json".source = lib.mkForce ../conf/obsidian.json;

1
hosts/common/base.nix
View file

@ -93,7 +93,6 @@
# Languages # Languages
python3 python3
# Virtualization # Virtualization
podman podman
]; # end systemPackages ]; # end systemPackages

5
hosts/common/wm/gnome.nix
View file

@ -4,11 +4,12 @@
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
services = { services = {
displayManager = { # Remove xserver. when the patch comes
xserver.displayManager = {
gdm.enable = true; gdm.enable = true;
gdm.wayland = true; gdm.wayland = true;
}; };
desktopManager.gnome.enable = true; xserver.desktopManager.gnome.enable = true;
gnome = { gnome = {
gnome-keyring.enable = true; gnome-keyring.enable = true;
gnome-initial-setup.enable = false; gnome-initial-setup.enable = false;

6
hosts/common/workstation.nix
View file

@ -13,11 +13,6 @@
jack.enable = true; jack.enable = true;
}; };
xserver.xkb.layout = "se"; xserver.xkb.layout = "se";
displayManager = {
gdm.enable = true;
gdm.wayland = true;
};
desktopManager.gnome.enable = true;
gnome = { gnome = {
gnome-keyring.enable = true; gnome-keyring.enable = true;
gnome-initial-setup.enable = false; gnome-initial-setup.enable = false;
@ -42,6 +37,7 @@
# Browser # Browser
firefox firefox
firefoxpwa firefoxpwa
chromium
# Development # Development
vscode vscode

9
hosts/tower/configuration.nix
View file

@ -28,6 +28,9 @@
}; # end boot }; # end boot
hardware = { hardware = {
graphics.enable = true; graphics.enable = true;
graphics.extraPackages = with pkgs; [
nvidia-vaapi-driver
]; # end graphics.extraPackages
nvidia = { nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = false;
@ -41,4 +44,10 @@
xserver.videoDrivers = [ "nvidia" ]; xserver.videoDrivers = [ "nvidia" ];
openssh.enable = true; openssh.enable = true;
}; # end services }; # end services
environment.variables = {
GBM_BACKEND = "nvidia-drm";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
MOZ_DISABLE_RDD_SANDBOX= "1" ;
LIBVA_DRIVER_NAME = "nvidia";
};
} # end file } # end file