diff --git a/flake.lock b/flake.lock index ed6f6df..5e10b6b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675935446, - "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", + "lastModified": 1674556204, + "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", + "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676300157, - "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", + "lastModified": 1674459583, + "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", + "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", "type": "github" }, "original": { diff --git a/hosts/apps.nix b/hosts/apps.nix deleted file mode 100644 index aab3b57..0000000 --- a/hosts/apps.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ 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 deleted file mode 100644 index d749c51..0000000 --- a/hosts/desktop/apps.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ 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 e1b3a36..b46d0b9 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -1,8 +1,5 @@ { ... }: { - imports = [ - (import ./apps.nix) - (import ./i3) - ]; + imports = [ (import ./i3) ]; } diff --git a/hosts/home.nix b/hosts/home.nix index 3f4e7de..304dc84 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -5,7 +5,6 @@ let in { imports = [ - ./apps.nix ../modules/emacs ../modules/fcitx5 ../modules/firefox @@ -79,6 +78,48 @@ 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 = {