merge
This commit is contained in:
commit
7dbb5b33f0
4 changed files with 18 additions and 10 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -22,16 +22,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751274312,
|
"lastModified": 1758346548,
|
||||||
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
|
"narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
|
"rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
description = "system config";
|
description = "system config";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11";
|
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-25.05";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
icomidal = {
|
icomidal = {
|
||||||
url = "git+https://deemz.org/git/joeri/icomidal";
|
url = "git+https://deemz.org/git/joeri/icomidal";
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
#time.timeZone = "America/Barbados";
|
#time.timeZone = "America/Barbados";
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_US.utf8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
i18n.extraLocaleSettings = {
|
i18n.extraLocaleSettings = {
|
||||||
LC_ADDRESS = "nl_BE.utf8";
|
LC_ADDRESS = "nl_BE.utf8";
|
||||||
LC_IDENTIFICATION = "nl_BE.utf8";
|
LC_IDENTIFICATION = "nl_BE.utf8";
|
||||||
|
|
@ -86,12 +86,13 @@
|
||||||
# sensitivity = 90; # default: 128
|
# sensitivity = 90; # default: 128
|
||||||
speed = 110; # default: 97
|
speed = 110; # default: 97
|
||||||
};
|
};
|
||||||
|
hardware.logitech.wireless.enable = true;
|
||||||
|
|
||||||
# Huion tablet:
|
# Huion tablet:
|
||||||
hardware.opentabletdriver.enable = true;
|
hardware.opentabletdriver.enable = true;
|
||||||
|
|
||||||
# Sound...
|
# Sound...
|
||||||
hardware.pulseaudio.enable = false;
|
services.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -99,7 +100,7 @@
|
||||||
alsa.support32Bit = true;
|
alsa.support32Bit = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
jack.enable = true;
|
jack.enable = true;
|
||||||
extraConfig = import ./pipewire-extra-config.nix;
|
# extraConfig = import ./pipewire-extra-config.nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Graphics...
|
# Graphics...
|
||||||
|
|
@ -200,6 +201,10 @@
|
||||||
GTK_OVERLAY_SCROLLING = 0;
|
GTK_OVERLAY_SCROLLING = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTR{power/wakeup}="disabled"
|
||||||
|
'';
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ in [
|
||||||
fuse3 # User space filesystems - need this to run AppImages with steam-run
|
fuse3 # User space filesystems - need this to run AppImages with steam-run
|
||||||
gnupg
|
gnupg
|
||||||
bottles # Wrapper around wine
|
bottles # Wrapper around wine
|
||||||
filelight # Disk space analysis
|
kdePackages.filelight # Disk space analysis
|
||||||
dconf-editor
|
dconf-editor
|
||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-disk-utility
|
gnome-disk-utility
|
||||||
|
|
@ -47,7 +47,7 @@ in [
|
||||||
|
|
||||||
# Programming
|
# Programming
|
||||||
git
|
git
|
||||||
kate
|
kdePackages.kate
|
||||||
vim
|
vim
|
||||||
vimPlugins.vim-nix
|
vimPlugins.vim-nix
|
||||||
graphviz
|
graphviz
|
||||||
|
|
@ -104,6 +104,7 @@ in [
|
||||||
cheese
|
cheese
|
||||||
playerctl # command line media control (play/pause)
|
playerctl # command line media control (play/pause)
|
||||||
finamp
|
finamp
|
||||||
|
easyeffects
|
||||||
|
|
||||||
# Belgian eID software and hardware drivers
|
# Belgian eID software and hardware drivers
|
||||||
eid-mw
|
eid-mw
|
||||||
|
|
@ -114,4 +115,6 @@ in [
|
||||||
libacr38u
|
libacr38u
|
||||||
scmccid
|
scmccid
|
||||||
qdigidoc
|
qdigidoc
|
||||||
|
|
||||||
|
solaar # extra options for logitech mouse
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue