Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle unstable packages better, remove spotify, etc #5

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
./modules/opensnitch.nix
./modules/rust.nix
./modules/signal.nix
./modules/spotify.nix
./modules/wireshark.nix
];

# Set a limit on the number of generations to include in boot
boot.loader.systemd-boot.configurationLimit = 20;

boot.tmp.cleanOnBoot = true;


# Enable networking
networking.networkmanager.enable = true;
Expand All @@ -44,6 +45,8 @@
# Enable the X11 windowing system.
services.xserver.enable = true;

services.pcscd.enable = true;

# Configure keymap in X11
services.xserver.xkb = {
layout = "us";
Expand Down
7 changes: 2 additions & 5 deletions modules/jetbrains.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{ config, pkgs, lib, ... }:
{ pkgs, lib, ... }:
let
url = import ../unstable_url.nix;
unstable = import
(builtins.fetchTarball url)
{ config = config.nixpkgs.config; };
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
in
{
environment.systemPackages = with pkgs.jetbrains; [
Expand Down
24 changes: 0 additions & 24 deletions modules/spotify.nix

This file was deleted.

1 change: 0 additions & 1 deletion unstable_url.nix

This file was deleted.