Adapt adalbert to 24.11
This commit is contained in:
parent
67311435fc
commit
a4c37a779e
GPG key ID:
2C2C1C62A5388E82
5 changed files with 40 additions and 39 deletions
15
flake.lock
15
flake.lock
|
|
@ -612,16 +612,16 @@
|
|||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732369855,
|
||||
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
|
||||
"lastModified": 1713702291,
|
||||
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
|
||||
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "GNOME",
|
||||
"ref": "47.2",
|
||||
"ref": "46.1",
|
||||
"repo": "gnome-shell",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -1368,15 +1368,16 @@
|
|||
"tinted-tmux": "tinted-tmux"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733510476,
|
||||
"narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=",
|
||||
"lastModified": 1732993760,
|
||||
"narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "e309d64fe7f203274a7913e1d2b74307d15ba122",
|
||||
"rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"ref": "release-24.11",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
};
|
||||
|
||||
stylix = {
|
||||
url = "github:danth/stylix";
|
||||
url = "github:danth/stylix/release-24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,16 @@
|
|||
{
|
||||
inputs,
|
||||
outputs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
{inputs, ...}: let
|
||||
in {
|
||||
imports = [
|
||||
./global
|
||||
./features/desktop/awesome
|
||||
./features/desktop/hyprland
|
||||
./features/games
|
||||
./features/coding
|
||||
./features/desktop/common/3d-printing.nix
|
||||
# ./features/desktop/common/3d-printing.nix
|
||||
];
|
||||
|
||||
home.packages = [
|
||||
inputs.picokontroller.packages.x86_64-linux.default
|
||||
# pkgs.citrix_workspace
|
||||
];
|
||||
nixpkgs = {
|
||||
config = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
# This is your system's configuration file.
|
||||
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
|
||||
{
|
||||
inputs,
|
||||
outputs,
|
||||
pkgs,
|
||||
...
|
||||
{ inputs
|
||||
, outputs
|
||||
, pkgs
|
||||
, ...
|
||||
}: {
|
||||
# You can import other NixOS modules here
|
||||
imports = [
|
||||
|
|
@ -35,6 +34,8 @@
|
|||
../common/optional/gaming/steam.nix
|
||||
../common/optional/desktop/japanese.nix
|
||||
../common/optional/udisks.nix
|
||||
../common/optional/fhs-compat.nix
|
||||
../common/optional/stylix.nix
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
allowUnfree = true;
|
||||
firefox.enablePlasmaBrowserIntegration = true;
|
||||
segger-jlink.acceptLicense = true;
|
||||
permittedInsecurePackages = ["segger-jlink-qt4-796s"];
|
||||
permittedInsecurePackages = [ "segger-jlink-qt4-796s" "dotnet-runtime-6.0.36" "dotnet-sdk-wrapped-6.0.428" "dotnet-sdk-6.0.428" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -70,22 +71,8 @@
|
|||
services.udev.packages = [ inputs.heliox-cli.packages.x86_64-linux.default pkgs.segger-jlink ];
|
||||
environment.systemPackages = [ inputs.heliox-cli.packages.x86_64-linux.default ];
|
||||
|
||||
# Personalausweis reader
|
||||
programs.ausweisapp.enable = true;
|
||||
programs.ausweisapp.openFirewall = true; # also sets firewall entry
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
# services.xserver.displayManager.sddm.enable = true;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
|
||||
# Force disable Nvidia PRIME, needed by nix-hardware
|
||||
# hardware.nvidia.prime.offload.enable = false;
|
||||
|
||||
programs.coolercontrol = {
|
||||
enable = true;
|
||||
nvidiaSupport = true;
|
||||
};
|
||||
boot.binfmt.emulatedSystems = [
|
||||
"aarch64-linux"
|
||||
"riscv64-linux"
|
||||
|
|
@ -94,12 +81,30 @@
|
|||
programs = {
|
||||
adb.enable = true;
|
||||
dconf.enable = true;
|
||||
coolercontrol = {
|
||||
enable = true;
|
||||
nvidiaSupport = true;
|
||||
};
|
||||
# Personalausweis reader
|
||||
ausweisapp = {
|
||||
enable = true;
|
||||
openFirewall = true; # also sets firewall entry
|
||||
};
|
||||
};
|
||||
|
||||
hardware = {
|
||||
opengl.enable = true;
|
||||
opentabletdriver.enable = true;
|
||||
nvidia = {
|
||||
open = false;
|
||||
powerManagement.enable = true;
|
||||
# modesetting.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# boot.extraModprobeConfig = ''
|
||||
# options nvidia NVreg_PreserveVideoMemoryAllocations=1
|
||||
# '';
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "23.11";
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ local function set_wallpaper(s)
|
|||
if s.index == screen.primary.index then
|
||||
gears.wallpaper.centered(wallpaper, s, gears.color.parse_color("#00ff00ff"), 0.43)
|
||||
else
|
||||
gears.wallpaper.centered(wallpaper, s, gears.color.parse_color("#00ff00ff"), 0.31)
|
||||
gears.wallpaper.centered(wallpaper, s, gears.color.parse_color("#00ff00ff"), 0.36)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue