From 54ce4b0c9473630677f8f3746e0c31924210a93a Mon Sep 17 00:00:00 2001 From: sajenim Date: Sun, 23 Jul 2023 08:25:17 +0800 Subject: [PATCH] setup custom xmonad package --- .../common/desktop/xmonad/default.nix | 0 .../desktop/xmonad/xmonad-config/flake.lock | 80 ------------------- .../desktop/xmonad/xmonad-config/flake.nix | 46 ----------- pkgs/xmonad-config/default.nix | 5 ++ .../xmonad-config/src/xmonad.hs | 0 .../xmonad-config/xmonad-config.cabal | 0 6 files changed, 5 insertions(+), 126 deletions(-) delete mode 100644 home-manager/common/desktop/xmonad/default.nix delete mode 100644 home-manager/common/desktop/xmonad/xmonad-config/flake.lock delete mode 100644 home-manager/common/desktop/xmonad/xmonad-config/flake.nix create mode 100644 pkgs/xmonad-config/default.nix rename {home-manager/common/desktop/xmonad => pkgs}/xmonad-config/src/xmonad.hs (100%) rename {home-manager/common/desktop/xmonad => pkgs}/xmonad-config/xmonad-config.cabal (100%) diff --git a/home-manager/common/desktop/xmonad/default.nix b/home-manager/common/desktop/xmonad/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/home-manager/common/desktop/xmonad/xmonad-config/flake.lock b/home-manager/common/desktop/xmonad/xmonad-config/flake.lock deleted file mode 100644 index e9476dc..0000000 --- a/home-manager/common/desktop/xmonad/xmonad-config/flake.lock +++ /dev/null @@ -1,80 +0,0 @@ -{ - "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1683560683, - "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "006c75898cf814ef9497252b022e91c946ba8e17", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "haskell-flake": { - "locked": { - "lastModified": 1684069239, - "narHash": "sha256-1nPdY5KasmGwwtuKv7OKCLCZC3wlAE+hJWwKZRBAluo=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "b8ccbf305e720e3483d7b983aeda61326169226a", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "haskell-flake", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1684120848, - "narHash": "sha256-gIwJ5ac1FwZEkCRwjY+gLwgD4G1Bw3Xtr2jr2XihMPo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0cb867999eec4085e1c9ca61c09b72261fa63bb4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1682879489, - "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-parts": "flake-parts", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home-manager/common/desktop/xmonad/xmonad-config/flake.nix b/home-manager/common/desktop/xmonad/xmonad-config/flake.nix deleted file mode 100644 index 982fedc..0000000 --- a/home-manager/common/desktop/xmonad/xmonad-config/flake.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - haskell-flake.url = "github:srid/haskell-flake"; - }; - outputs = inputs@{ self, nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { - systems = nixpkgs.lib.systems.flakeExposed; - imports = [ inputs.haskell-flake.flakeModule ]; - - perSystem = { self', pkgs, ... }: { - - # Typically, you just want a single project named "default". But - # multiple projects are also possible, each using different GHC version. - haskellProjects.default = { - # If you have a .cabal file in the root, this option is determined - # automatically. Otherwise, specify all your local packages here. - packages.xmonad-config.root = ./.; - - # The base package set representing a specific GHC version. - # By default, this is pkgs.haskellPackages. - # You may also create your own. See https://haskell.flake.page/package-set - # basePackages = pkgs.haskellPackages; - - # Dependency overrides go here. See https://haskell.flake.page/dependency - # source-overrides = { }; - # overrides = self: super: { }; - - # devShell = { - # # Enabled by default - # enable = true; - # - # # Programs you want to make available in the shell. - # # Default programs can be disabled by setting to 'null' - # tools = hp: { fourmolu = hp.fourmolu; ghcid = null; }; - # - # hlsCheck.enable = true; - # }; - }; - - # haskell-flake doesn't set the default package, but you can do it here. - packages.default = self'.packages.xmonad-config; - }; - }; -} diff --git a/pkgs/xmonad-config/default.nix b/pkgs/xmonad-config/default.nix new file mode 100644 index 0000000..a6dd3cf --- /dev/null +++ b/pkgs/xmonad-config/default.nix @@ -0,0 +1,5 @@ +{ pkgs }: + +pkgs.haskellPackages.developPackage { + root = ./.; +} diff --git a/home-manager/common/desktop/xmonad/xmonad-config/src/xmonad.hs b/pkgs/xmonad-config/src/xmonad.hs similarity index 100% rename from home-manager/common/desktop/xmonad/xmonad-config/src/xmonad.hs rename to pkgs/xmonad-config/src/xmonad.hs diff --git a/home-manager/common/desktop/xmonad/xmonad-config/xmonad-config.cabal b/pkgs/xmonad-config/xmonad-config.cabal similarity index 100% rename from home-manager/common/desktop/xmonad/xmonad-config/xmonad-config.cabal rename to pkgs/xmonad-config/xmonad-config.cabal