From d8370843617c746b24b1a745a7f363ac1a03edd3 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Mon, 23 Sep 2024 00:23:24 +0300 Subject: [PATCH] feat: replace packages to home-manager --- flake.nix | 1 + home-manager/users/sweetbread/home.nix | 43 +++++++++++++++++++++++-- nixos/packages.nix | 44 -------------------------- 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/flake.nix b/flake.nix index 8496d3b..bbf731e 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,7 @@ homeConfigurations = { sweetbread = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; + extraSpecialArgs = { inherit inputs; }; modules = [ ./home-manager/users/sweetbread/home.nix inputs.sops-nix.homeManagerModules.sops diff --git a/home-manager/users/sweetbread/home.nix b/home-manager/users/sweetbread/home.nix index 33417d1..b48758a 100644 --- a/home-manager/users/sweetbread/home.nix +++ b/home-manager/users/sweetbread/home.nix @@ -1,13 +1,52 @@ -{ - +{ pkgs, inputs, ... }: { imports = [ ./zsh.nix ./modules/bundle.nix ]; + nixpkgs.config.allowUnfree = true; + home = { username = "sweetbread"; homeDirectory = "/home/sweetbread"; stateVersion = "23.11"; + + packages = with pkgs; [ + # Desktop apps + google-chrome + # inputs.ayugram-desktop.packages.${pkgs.system}.default + telegram-desktop + vesktop + obs-studio + mpv + obsidian + vscode + jetbrains.pycharm-community + jetbrains.idea-community + android-studio + thunderbird + + # Coding stuff + cmake + gnumake + nodejs + (python3.withPackages (ps: with ps; [ requests bpython ])) + python311Packages.pip + rocmPackages.llvm.clang-tools-extra + rocmPackages.llvm.clang + ncurses + + # CLI utils + scrot + ffmpeg + yt-dlp + bat + + # GUI utils + feh + imv + gromit-mpx + notify-desktop + ]; }; } diff --git a/nixos/packages.nix b/nixos/packages.nix index 137fa44..6b570ae 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -5,32 +5,6 @@ }; environment.systemPackages = with pkgs; [ - # Desktop apps - google-chrome - inputs.ayugram-desktop.packages.${pkgs.system}.default - vesktop - obs-studio - mpv - kdenlive # Video editor - gparted # Needs in autj agent - obsidian - vscode - jetbrains.pycharm-community - jetbrains.idea-community - android-studio - thunderbird - - # Coding stuff - gnumake - gcc - nodejs - python - (python3.withPackages (ps: with ps; [ requests bpython ])) - python311Packages.pip - rocmPackages.llvm.clang-tools-extra - rocmPackages.llvm.clang - ncurses - # CLI utils file tree @@ -39,15 +13,10 @@ btop nix-index unzip - scrot - ffmpeg - light yazi zram-generator zip ntfs3g - yt-dlp - brightnessctl openssl lazygit bluez @@ -57,7 +26,6 @@ hexyl jq tldr - bat xdg-utils helix playerctl @@ -70,11 +38,6 @@ gromit-mpx notify-desktop - # Xorg stuff - #xterm - #xclip - #xorg.xbacklight - # Wayland stuff xwayland wl-clipboard @@ -99,13 +62,6 @@ rocm-opencl-icd glaxnimate - # Screenshotting - grim - grimblast - slurp - flameshot - swappy - # Other home-manager spice-vdagent