Handle unstable packages better, remove spotify, etc

stusmall · May 21, 2024 · 083c15d · 083c15d
1 parent 41c28f5
commit 083c15d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/base.nix b/base.nix
@@ -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;
@@ -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";

diff --git a/modules/jetbrains.nix b/modules/jetbrains.nix
@@ -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; [

diff --git a/modules/spotify.nix b/modules/spotify.nix
diff --git a/unstable_url.nix b/unstable_url.nix