flake.lock

@@ -113,30 +113,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1723362943,
-        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
         "intake": "intake",
         "intake-sources": "intake-sources",
         "nixpkgs-2311": "nixpkgs-2311",
-        "nixpkgs-2405": "nixpkgs-2405",
+        "nixpkgs-2405": "nixpkgs-2405"
-        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },

flake.nix

@@ -2,7 +2,6 @@
   inputs = {
     nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11";
     nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
@@ -22,25 +21,11 @@
     self,
     nixpkgs-2311,
     nixpkgs-2405,
-    nixpkgs-unstable,
     flake-compat,
     intake,
     intake-sources,
   }@inputs: {
-    nixosModules = {
+    nixosModules.beatific = import ./modules/beatific.nix;
-      beatific = import ./modules/beatific.nix;
-      tf2-gperftools = ({ ... }: {
-        environment.systemPackages = [ nixpkgs-2405.legacyPackages."i686-linux".gperftools ];
-      });
-      unstable-vscode = ({ ... }: let
-        pkgs = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
-      in {
-        environment.systemPackages = [
-          pkgs.vscode
-          pkgs.icu
-        ];
-      });
-    };
 
     nixosConfigurations = {
       backyard = nixpkgs-2405.lib.nixosSystem {
@@ -77,8 +62,9 @@
         system = "x86_64-linux";
         modules = [
           self.nixosModules.beatific
-          self.nixosModules.tf2-gperftools
+          ({ ... }: {
-          self.nixosModules.unstable-vscode
+            environment.systemPackages = [ nixpkgs-2405.legacyPackages."i686-linux".gperftools ];
+          })
           ./machine/imperium
         ];
       };

machine/imperium/default.nix

@@ -56,7 +56,7 @@
   };
 
   users.users.tvb = {
-    extraGroups = [ "networkmanager" "docker" ];
+    extraGroups = [ "networkmanager" ];
     packages = [
       (pkgs.writeShellScriptBin "yt-dlp" ''exec $HOME/.yt-dlp/bin/yt-dlp "$@"'')
     ];
@@ -71,11 +71,9 @@
 
   beatific.extraPrograms = true;
   environment.systemPackages = with pkgs; [
-    audacity
     bitwarden
     bitwarden-cli
     comic-mono
-    distrobox
     firefox
     gnome.gnome-terminal
     gthumb
@@ -83,10 +81,8 @@
     mpv
     obsidian
     unzip
+    vscodium
   ];
-  programs.nix-ld.enable = true;
-
-  virtualisation.docker.enable = true; # needed for distrobox
 
   networking.firewall = {
     enable = false;