alarsyo/nixos-config
alarsyo/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: alarsyo:d83be853fcb12372d64ad87db4d44302ee1d0181
Branches Tags
alarsyo:main
alarsyo:framework
alarsyo:matrix-synapse-auto-compress
alarsyo:tmux-thumbs
...
compare: alarsyo:3225652d575492a2019aeac7e36e49bfef3a8dc1
Branches Tags
alarsyo:main
alarsyo:framework
alarsyo:matrix-synapse-auto-compress
alarsyo:tmux-thumbs

4 commits
d83be853fc ... 3225652d57

Author SHA1 Message Date
Antoine Martin 3225652d57 adapt xserver options 2024-05-30 01:56:11 +02:00
Antoine Martin 0438a91039 adapt displayManager options 2024-05-30 01:56:11 +02:00
Antoine Martin 8bfdb62a52 base: update pinentry option 2024-05-30 01:56:11 +02:00
Antoine Martin db03c81eeb flake: bump NixOS to 24.05 2024-05-30 01:56:02 +02:00
5 changed files with 24 additions and 21 deletions
Show stats Expand all files Collapse all files

19
base/gui-programs.nix
View file

@ -23,7 +23,7 @@ in {
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
pinentryFlavor = "qt"; pinentryPackage = pkgs.pinentry-qt;
}; };
services = { services = {
@ -34,13 +34,16 @@ in {
if config.my.gui.isNvidia if config.my.gui.isNvidia
then ["nvidia"] then ["nvidia"]
else options.services.xserver.videoDrivers.default; else options.services.xserver.videoDrivers.default;
layout = "fr"; xkb = {
xkbVariant = "us"; layout = "fr";
libinput = { variant = "us";
enable = true; };
touchpad = { };
naturalScrolling = true;
}; libinput = {
enable = true;
touchpad = {
naturalScrolling = true;
}; };
}; };

16
flake.lock
View file

@ -109,16 +109,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715381426, "lastModified": 1716736833,
"narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -189,16 +189,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1716361217, "lastModified": 1716966868,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -5,7 +5,7 @@
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "nixos-23.11"; ref = "nixos-24.05";
}; };
nixpkgs-unstable-small = { nixpkgs-unstable-small = {
@ -25,7 +25,7 @@
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
repo = "home-manager"; repo = "home-manager";
ref = "release-23.11"; ref = "release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

4
hosts/talos/default.nix
View file

@ -148,11 +148,11 @@
services.xserver.enable = true; services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm = { services.displayManager.sddm = {
enable = true; enable = true;
wayland.enable = true; wayland.enable = true;
}; };
services.xserver.displayManager.defaultSession = "plasmawayland"; services.displayManager.defaultSession = "plasmawayland";
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;

2
modules/sddm.nix
View file

@ -15,7 +15,7 @@ in {
options.my.displayManager.sddm.enable = mkEnableOption "SDDM setup"; options.my.displayManager.sddm.enable = mkEnableOption "SDDM setup";
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.xserver.displayManager.sddm = { services.displayManager.sddm = {
enable = true; enable = true;
theme = "sugar-candy"; theme = "sugar-candy";
}; };