aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

General: upgrade to NixOS 24.11

Browse source
This commit is contained in:
Aires 2024-11-18 11:10:20 -05:00
parent 602d8475b1
commit 107cfa93fb
12 changed files with 26 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -157,16 +157,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1731880681,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -331,16 +331,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1731797254, "lastModified": 1731755305,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -7,7 +7,7 @@
# Import the desired Nix channel. Defaults to unstable, which uses a fully tested rolling release model. # Import the desired Nix channel. Defaults to unstable, which uses a fully tested rolling release model.
# You can find a list of channels at https://wiki.nixos.org/wiki/Channel_branches # You can find a list of channels at https://wiki.nixos.org/wiki/Channel_branches
# To follow a different channel, replace `nixos-unstable` with the channel name, e.g. `nixos-24.05`. # To follow a different channel, replace `nixos-unstable` with the channel name, e.g. `nixos-24.05`.
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Repository for Gnome triple buffering patch # Repository for Gnome triple buffering patch
@ -19,7 +19,7 @@
# Home-manager support # Home-manager support
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

3
hosts/Hevana/default.nix
View file

@ -35,9 +35,6 @@ in
networking.hostName = hostName; networking.hostName = hostName;
###*** Configure your system below this line. ***### ###*** Configure your system below this line. ***###
# Set your time zone.
# To see all available timezones, run `timedatectl list-timezones`.
time.timeZone = "America/New_York";
# Enable dynamic DNS with Porkbun # Enable dynamic DNS with Porkbun
services.ddclient = { services.ddclient = {

5
hosts/Khanda/default.nix
View file

@ -59,10 +59,7 @@ in
}; };
ui = { ui = {
desktops.gnome = { desktops.gnome.enable = true;
enable = true;
experimental.enable = false;
};
flatpak = { flatpak = {
# Enable Flatpak support. # Enable Flatpak support.
enable = true; enable = true;

2
hosts/Pihole/default.nix
View file

@ -34,7 +34,7 @@ in
]; ];
services.ssh = { services.ssh = {
enable = true; enable = true;
ports = [ config.secrets.hosts.dimaga.ssh.port ]; ports = [ config.secrets.hosts.hevana.ssh.port ];
}; };
users.aires.enable = true; users.aires.enable = true;
}; };

5
hosts/Shura/default.nix
View file

@ -97,10 +97,7 @@ in
useBindFS = true; useBindFS = true;
}; };
desktops.gnome = { desktops.gnome.enable = true;
enable = true;
experimental.enable = true;
};
}; };
users = { users = {
aires = { aires = {

1
modules/apps/development.nix
View file

@ -20,7 +20,6 @@ in
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
aux.system = { aux.system = {
packages = with pkgs; [ packages = with pkgs; [
nixd
nix-prefetch-scripts nix-prefetch-scripts
]; ];
ui.flatpak = { ui.flatpak = {

9
modules/system/bluetooth.nix
View file

@ -8,9 +8,6 @@
let let
cfg = config.aux.system.bluetooth; cfg = config.aux.system.bluetooth;
# Copy bluetooth device configs
shure-aonic-bluetooth = pkgs.writeText "info" (builtins.readFile ./bluetooth/shure-aonic-tw2);
in in
{ {
@ -42,11 +39,5 @@ in
# Add Bluetooth LE audio support # Add Bluetooth LE audio support
environment.systemPackages = with pkgs; [ liblc3 ]; environment.systemPackages = with pkgs; [ liblc3 ];
# Install Bluetooth device profiles
systemd.tmpfiles.rules = lib.mkIf (cfg.adapter != "") [
"d /var/lib/bluetooth/${cfg.adapter}/ 0700 root root" # First, make sure the directory exists
"L+ /var/lib/bluetooth/${cfg.adapter}/00:0E:DD:72:2F:0C/info - - - - ${shure-aonic-bluetooth}"
];
}; };
} }

19
modules/system/bluetooth/shure-aonic-tw2
View file

@ -1,19 +0,0 @@
[General]
Name=Shure AONIC TW2
Class=0x2c0404
SupportedTechnologies=BR/EDR;LE;
Trusted=true
Blocked=false
Services=00001101-0000-1000-8000-00805f9b34fb;00001108-0000-1000-8000-00805f9b34fb;0000110a-0000-1000-8000-00805f9b34fb;0000110b-0000-1000-8000-00805f9b34fb;0000110c-0000-1000-8000-00805f9b34fb;0000110d-0000-1000-8000-00805f9b34fb;0000110e-0000-1000-8000-00805f9b34fb;0000111e-0000-1000-8000-00805f9b34fb;0000eb03-d102-11e1-9b23-00025b00a5a5;0000eb04-d102-11e1-9b23-00025b00a5a5;0000eb05-d102-11e1-9b23-00025b00a5a5;
AddressType=public
[LinkKey]
Key=DFC42899B038D6C6B1296CF98DB0508A
Type=4
PINLength=0
[ConnectionParameters]
MinInterval=24
MaxInterval=40
Latency=0
Timeout=400

7
modules/system/gpu/amd.nix
View file

@ -17,11 +17,10 @@ in
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
hardware.opengl = { hardware.graphics = {
extraPackages = [ pkgs.amdvlk ]; enable = true;
# 32-bit application compatibility # 32-bit application compatibility
driSupport32Bit = true; enable32Bit = true;
extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
}; };
}; };
} }

2
modules/ui/desktops/common.nix
View file

@ -58,7 +58,7 @@ in
# Install extra fonts # Install extra fonts
packages = with pkgs; [ packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
liberation_ttf liberation_ttf
fira-code fira-code

38
modules/ui/desktops/gnome.nix
View file

@ -15,7 +15,6 @@ in
options = { options = {
aux.system.ui.desktops.gnome = { aux.system.ui.desktops.gnome = {
enable = lib.mkEnableOption "Enables the Gnome Desktop Environment."; enable = lib.mkEnableOption "Enables the Gnome Desktop Environment.";
experimental.enable = lib.mkEnableOption "Enables fractional scaling, dynamic triple buffering, and variable refresh rate (VRR).";
}; };
}; };
@ -31,13 +30,10 @@ in
# Enable Gnome # Enable Gnome
desktopManager.gnome = { desktopManager.gnome = {
enable = true; enable = true;
extraGSettingsOverrides = ''
# Enable experimental features
extraGSettingsOverrides = lib.mkIf cfg.experimental.enable ''
[org.gnome.mutter] [org.gnome.mutter]
experimental-features = [ 'scale-monitor-framebuffer','variable-refresh-rate' ] experimental-features = [ 'variable-refresh-rate' ]
''; '';
extraGSettingsOverridePackages = lib.mkIf cfg.experimental.enable [ pkgs.gnome.mutter ];
}; };
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
}; };
@ -67,14 +63,13 @@ in
environment = { environment = {
# Remove default Gnome packages that came with the install, then install the ones I actually use # Remove default Gnome packages that came with the install, then install the ones I actually use
gnome.excludePackages = gnome.excludePackages = (
(with pkgs; [ with pkgs;
[
gnome-photos gnome-photos
gnome-tour gnome-tour
gnomeExtensions.extension-list gnomeExtensions.extension-list
gedit # text editor gedit # text editor
])
++ (with pkgs.gnome; [
gnome-music gnome-music
gnome-calendar gnome-calendar
epiphany # web browser epiphany # web browser
@ -87,18 +82,15 @@ in
iagno # go game iagno # go game
hitori # sudoku game hitori # sudoku game
atomix # puzzle game atomix # puzzle game
]); ]
);
# Install additional packages # Install additional packages
systemPackages = with pkgs; [ systemPackages = with pkgs; [
# Gnome tweak tools # Gnome tweak tools
gnome.gnome-tweaks gnome-tweaks
# Gnome extensions
gnomeExtensions.alphabetical-app-grid
gnomeExtensions.appindicator
gnomeExtensions.dash-to-panel
# Themeing # Themeing
gnome.gnome-themes-extra gnome-themes-extra
papirus-icon-theme papirus-icon-theme
qogir-icon-theme qogir-icon-theme
]; ];
@ -110,17 +102,5 @@ in
platformTheme = "gnome"; platformTheme = "gnome";
style = "adwaita-dark"; style = "adwaita-dark";
}; };
nixpkgs.overlays = lib.mkIf cfg.experimental.enable [
(final: prev: {
gnome = prev.gnome.overrideScope (
gnomeFinal: gnomePrev: {
mutter = gnomePrev.mutter.overrideAttrs (old: {
src = inputs.gnome-triplebuffering;
});
}
);
})
];
}; };
} }