Skip to content

Commit

Permalink
Upgrade to 24.11 and switch from zram to swap file
Browse files Browse the repository at this point in the history
  • Loading branch information
stusmall committed Nov 30, 2024
1 parent f8f711e commit ca04aff
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 37 deletions.
13 changes: 4 additions & 9 deletions base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
services.printing.enable = true;

# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
Expand Down Expand Up @@ -92,11 +91,10 @@
operation = "boot";
};

# Limit the parallelism of nix rebuilds. When left on the default it uses all available resources which can make the
# system unusable.
nix.settings = {
cores = 2;
max-jobs = 2;
# Limit nix rebuilds priority. When left on the default is uses all available reouses which can make the system unusable
nix = {
daemonCPUSchedPolicy = "idle";
daemonIOSchedClass = "idle";
};

# Enable udev settings for yubikey personalization
Expand Down Expand Up @@ -124,9 +122,6 @@
# This is the service that lets you pick power profiles in the gnome UI. It conflicts with auto-cpufreq
services.power-profiles-daemon.enable = false;

# Enable zram
zramSwap.enable = true;

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
Expand Down
5 changes: 2 additions & 3 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ esac
done

echo "Setting up channels"
sudo nix-channel --add https://nixos.org/channels/nixos-24.05 nixos
sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
sudo nix-channel --add https://nixos.org/channels/nixos-24.11 nixos
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
sudo nix-channel --update

echo "Rebuilding the OS"
Expand Down
12 changes: 4 additions & 8 deletions dell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,16 @@
fsType = "vfat";
};

swapDevices = [ ];
swapDevices = [{
device = "/var/lib/swapfile";
size = 16 * 1024;
}];

networking.useDHCP = lib.mkDefault true;

nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

# Enable OpenGL
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
};

# Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = [ "nvidia" ];

Expand Down
6 changes: 3 additions & 3 deletions modules/firefox.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ let
install_url = "https://addons.mozilla.org/firefox/downloads/latest/facebook-container/latest.xpi";
installation_mode = "force_installed";
};
# Impluse Blocker
"{3a7ab27c-6a20-4d24-9fda-5e38f8992556}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/impulse-blocker/latest.xpi";
# LeechBlockNG
"[email protected]" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/leechblock-ng/latest.xpi";
installation_mode = "force_installed";
};
# ublock origin
Expand Down
18 changes: 4 additions & 14 deletions modules/gnome.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,19 @@


environment.gnome.excludePackages = (with pkgs; [
gnome-photos
gnome-tour
]) ++ (with pkgs.gnome; [
atomix
caribou
cheese
geary
epiphany
geary
gnome-calendar
gnome-characters
gnome-clocks
gnome-dictionary
gnome-font-viewer
gnome-keyring
gnome-maps
gnome-music
gnome-remote-desktop
gnome-photos
gnome-terminal
gnome-weather
hitori
iagno
tali
totem
gnome-tour
yelp
]);

Expand All @@ -51,7 +41,7 @@
type = "simple";
sensitive = false;
operand = "process.path";
data = "${lib.getBin pkgs.gnome.gnome-calculator}/bin/.gnome-calculator-wrapped";
data = "${lib.getBin pkgs.gnome-calculator}/bin/.gnome-calculator-wrapped";
}
{
type = "regexp";
Expand Down
4 changes: 4 additions & 0 deletions modules/steam.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
environment.systemPackages = with pkgs; [
steam
];

# We need 32bit versions of all the OpenGL etc libraries for steam to run
hardware.graphics.enable32Bit = true;

programs.steam = {
remotePlay.openFirewall = true;
};
Expand Down

0 comments on commit ca04aff

Please sign in to comment.