diff --git a/flake.nix b/flake.nix index b438d9f..0930e54 100644 --- a/flake.nix +++ b/flake.nix @@ -10,13 +10,9 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; }; outputs = { self, nixpkgs, home-manager, supercolor, i3layouts-rofi, kaokao - , mozilla, nixpkgs-unstable, fenix }@inputs: + , mozilla, nixpkgs-unstable, }@inputs: let system = "x86_64-linux"; overlay-unstable = final: prev: { @@ -26,13 +22,12 @@ }; }; in { - packages.x86_64-linux.default = - fenix.packages.x86_64-linux.minimal.toolchain; nixosConfigurations.bat = nixpkgs.lib.nixosSystem { inherit system; modules = [ ({ config, pkgs, ... }: { - nixpkgs.overlays = [ fenix.overlays.default overlay-unstable ]; + nixpkgs.overlays = + [ overlay-unstable ]; }) ./configuration.nix ]; diff --git a/packages.nix b/packages.nix index e692d71..9320b6a 100644 --- a/packages.nix +++ b/packages.nix @@ -2,15 +2,6 @@ environment.systemPackages = with pkgs; [ clamav ]; - programs.thunar = { - enable = true; - plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman - thunar-media-tags-plugin - ]; - }; - fonts.fonts = with pkgs; [ atkinson-hyperlegible noto-fonts diff --git a/user.nix b/user.nix index 0db990f..5c8dfa0 100644 --- a/user.nix +++ b/user.nix @@ -76,6 +76,7 @@ in { xournalpp # games + mgba steam pcsx2 dolphin-emu @@ -152,14 +153,7 @@ in { nodePackages_latest.svelte-language-server nodePackages_latest.svelte-check ## rust - (fenix.stable.withComponents [ - "cargo" - "clippy" - "rust-src" - "rustc" - "rustfmt" - ]) - rust-analyzer-nightly + rustup cargo-watch llvmPackages_rocm.clang llvmPackages_rocm.llvm