diff --git a/flake.lock b/flake.lock index 5e10b6b..ed6f6df 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674556204, - "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=", + "lastModified": 1675935446, + "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6", + "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { diff --git a/hosts/apps.nix b/hosts/apps.nix new file mode 100644 index 0000000..aab3b57 --- /dev/null +++ b/hosts/apps.nix @@ -0,0 +1,45 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Command line utilities + wget + neofetch + pfetch + fortune + killall + trash-cli # aliased to rm in .bashrc + unzip + pipes + wine + pandoc + texlive.combined.scheme-full + + # Programming languages + jdk + + # Tray applications + networkmanagerapplet # nm-applet + nextcloud-client + + # System GUI applications + gnome.nautilus + gnome.file-roller + gnome.gnome-calculator + gnome.gnome-disk-utility + + # Applications + discord + gimp + krita + inkscape + obs-studio + qbittorrent + pureref + libreoffice + gnome.ghex + + # Games + prismlauncher + ]; +} diff --git a/hosts/desktop/apps.nix b/hosts/desktop/apps.nix new file mode 100644 index 0000000..d749c51 --- /dev/null +++ b/hosts/desktop/apps.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + # Command line utilities + wine + + # Programming languages + jdk + + # Games + prismlauncher + ]; +} diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index b46d0b9..e1b3a36 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -1,5 +1,8 @@ { ... }: { - imports = [ (import ./i3) ]; + imports = [ + (import ./apps.nix) + (import ./i3) + ]; } diff --git a/hosts/home.nix b/hosts/home.nix index 304dc84..3f4e7de 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -5,6 +5,7 @@ let in { imports = [ + ./apps.nix ../modules/emacs ../modules/fcitx5 ../modules/firefox @@ -78,48 +79,6 @@ in homeDirectory = "/home/${user}"; stateVersion = "22.05"; - - packages = with pkgs; [ - # Command line utilities - wget - neofetch - pfetch - fortune - killall - trash-cli # aliased to rm in .bashrc - unzip - pipes - wine - pandoc - texlive.combined.scheme-full - - # Programming languages - jdk - - # Tray applications - networkmanagerapplet # nm-applet - nextcloud-client - - # System GUI applications - gnome.nautilus - gnome.file-roller - gnome.gnome-calculator - gnome.gnome-disk-utility - - # Applications - discord - gimp - krita - inkscape - obs-studio - qbittorrent - pureref - libreoffice - gnome.ghex - - # Games - prismlauncher - ]; }; programs.bash = {