From 5f50001b90770e04782c8bf0a357b66e0b4e8172 Mon Sep 17 00:00:00 2001 From: Quentin Boyer Date: Sun, 26 Mar 2023 17:49:23 +0200 Subject: [PATCH] Cleanup configuration --- flake.nix | 1 - graphical.nix | 9 -------- home.nix | 46 ----------------------------------------- nixos/configuration.nix | 11 +--------- nixos/home.nix | 7 ------- nixos/pkg.nix | 20 ------------------ 6 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 graphical.nix delete mode 100644 nixos/home.nix delete mode 100644 nixos/pkg.nix diff --git a/flake.nix b/flake.nix index e23d365..13a156f 100644 --- a/flake.nix +++ b/flake.nix @@ -146,7 +146,6 @@ self.hmModules.personal-gui self.hmModules.gaming ./home.nix - ./graphical.nix ./extra_info.nix ./localinfo.nix ./rustdev.nix diff --git a/graphical.nix b/graphical.nix deleted file mode 100644 index 13d16c3..0000000 --- a/graphical.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - ]; - - /* - environment.pathsToLink = [ "/share/hunspell" "/share/myspell" "/share/hyphen" ]; - environment.variables.DICPATH = "/run/current-system/sw/share/hunspell:/run/current-system/sw/share/hyphen"; - */ -} diff --git a/home.nix b/home.nix index f1985e3..2215e82 100644 --- a/home.nix +++ b/home.nix @@ -1,50 +1,4 @@ { - config, - pkgs, - lib, - flake, - ... -}: let - rustVersion = (pkgs.rustChannelOf {channel = "stable";}).rust; - rsPlatform = pkgs.makeRustPlatform { - cargo = rustVersion; - rustc = rustVersion; - }; -in { - home.packages = with pkgs; [ - nodePackages.vscode-json-languageserver - exa - python3 - topgrade - niv - bintools - httpie - sqlx-cli - codespell - cargo-flamegraph - linuxPackages.perf - gcc11 - bc - ]; - - programs = { - starship = { - enable = true; - }; - - ssh = { - enable = true; - matchBlocks = { - }; - }; - }; - - programs.zsh = { - shellAliases = { - new-direnv = "nix flake new -t github:nix-community/nix-direnv"; - }; - }; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c99228f..c24a328 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,16 +1,10 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./pkg.nix - #./home.nix ./localcfg.nix ./cachix.nix ]; @@ -30,9 +24,6 @@ programs.nix-ld.enable = true; boot.kernelPackages = pkgs.linuxPackages; - /* - nixpkgs.config.allowBroken = true; - */ virtualisation = { waydroid.enable = true; diff --git a/nixos/home.nix b/nixos/home.nix deleted file mode 100644 index 7061e42..0000000 --- a/nixos/home.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - imports = [ - - ]; - home-manager.useGlobalPkgs = true; - home-manager.users.traxys = import /etc/nixos/traxys/home.nix; -} diff --git a/nixos/pkg.nix b/nixos/pkg.nix deleted file mode 100644 index fb6b7c7..0000000 --- a/nixos/pkg.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - ashmem = config.boot.kernelPackages.callPackage ./anbox.nix {name = "ashmem";}; - binder = config.boot.kernelPackages.callPackage ./anbox.nix {name = "binder";}; -in { - # boot.extraModulePackages = [ ashmem binder ]; - # boot.kernelModules = [ "ashmem_linux" "binder_linux" ]; - - /* - nixpkgs.config.packageOverrides = pkgs: { - steam = pkgs.steam.override { - nativeOnly = true; - }; - }; - */ -}